diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 9893d233e1..8f061cab88 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,16 +7,16 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+## Describe the bug
 A clear and concise description of what the bug is.  Include the version(s) of DSpace where you've seen this problem. Link to examples if they are public.
 
-**To Reproduce**
+## To Reproduce
 Steps to reproduce the behavior:
 1. Do this
 2. Then this...
 
-**Expected behavior**
+## Expected behavior
 A clear and concise description of what you expected to happen.
 
-**Related work**
+## Related work
 Link to any related tickets or PRs here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 34cc2c9e4f..9eaa4d9f3f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Is your feature request related to a problem? Please describe.
+A clear and concise description of what the problem or use case is. For example, I'm always frustrated when [...]
 
-**Describe the solution you'd like**
+## Describe the solution you'd like
 A clear and concise description of what you want to happen.
 
-**Describe alternatives or workarounds you've considered**
+## Describe alternatives or workarounds you've considered
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Additional context**
-Add any other context or screenshots about the feature request here.
+## Additional information
+Add any other information, related tickets or screenshots about the feature request here.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000000..b6412b25b6
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,118 @@
+#-------------------
+# DSpace's dependabot rules. Enables maven updates for all dependencies on a weekly basis
+# for main and any maintenance branches. Security updates only apply to main.
+#-------------------
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    # Allow up to 10 open PRs for dependencies
+    open-pull-requests-limit: 10
+    # Group together some upgrades in a single PR
+    groups:
+      # Group together all Build Tools in a single PR
+      build-tools:
+        applies-to: version-updates
+        patterns:
+        - "org.apache.maven.plugins:*"
+        - "*:*-maven-plugin"
+        - "*:maven-*-plugin"
+        - "com.github.spotbugs:spotbugs"
+        - "com.google.code.findbugs:*"
+        - "com.google.errorprone:*"
+        - "com.puppycrawl.tools:checkstyle"
+        - "org.sonatype.plugins:*"
+        exclude-patterns:
+        # Exclude anything from Spring, as that is in a separate group
+        - "org.springframework.*:*"
+        update-types:
+        - "minor"
+        - "patch"
+      test-tools:
+        applies-to: version-updates
+        patterns:
+        - "junit:*"
+        - "com.github.stefanbirker:system-rules"
+        - "com.h2database:*"
+        - "io.findify:s3mock*"
+        - "io.netty:*"
+        - "org.hamcrest:*"
+        - "org.mock-server:*"
+        - "org.mockito:*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all Apache Commons deps in a single PR
+      apache-commons:
+        applies-to: version-updates
+        patterns:
+        - "org.apache.commons:*"
+        - "commons-*:commons-*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all fasterxml deps in a single PR
+      fasterxml:
+        applies-to: version-updates
+        patterns:
+        - "com.fasterxml:*"
+        - "com.fasterxml.*:*"
+        update-types:
+        - "minor"
+        - "patch"
+       # Group together all Hibernate deps in a single PR
+      hibernate:
+        applies-to: version-updates
+        patterns:
+        - "org.hibernate.*:*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all Jakarta deps in a single PR
+      jakarta:
+        applies-to: version-updates
+        patterns:
+        - "jakarta.*:*"
+        - "org.eclipse.angus:jakarta.mail"
+        - "org.glassfish.jaxb:jaxb-runtime"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all Google deps in a single PR
+      google-apis:
+        applies-to: version-updates
+        patterns:
+        - "com.google.apis:*"
+        - "com.google.api-client:*"
+        - "com.google.http-client:*"
+        - "com.google.oauth-client:*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all Spring deps in a single PR
+      spring:
+        applies-to: version-updates
+        patterns:
+        - "org.springframework:*"
+        - "org.springframework.*:*"
+        update-types:
+        - "minor"
+        - "patch"
+      # Group together all WebJARs deps in a single PR
+      webjars:
+        applies-to: version-updates
+        patterns:
+        - "org.webjars:*"
+        - "org.webjars.*:*"
+        update-types:
+        - "minor"
+        - "patch"
+    ignore:
+      # Don't try to auto-update any DSpace dependencies
+      - dependency-name: "org.dspace:*"
+      - dependency-name: "org.dspace.*:*"
+      # Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major"]
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 5b3f4336e6..4da35876d2 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 ## References
 _Add references/links to any related issues or PRs. These may include:_
-* Fixes #`issue-number` (if this fixes an issue ticket)
-* Related to DSpace/RestContract#`pr-number`  (if a corresponding REST Contract PR exists)
+* Fixes #issue-number (if this fixes an issue ticket)
+* Related to DSpace/RestContract#pr-number  (if a corresponding REST Contract PR exists)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -16,12 +16,15 @@ List of changes in this PR:
 **Include guidance for how to test or review your PR.** This may include: steps to reproduce a bug, screenshots or description of a new feature, or reasons behind specific changes. 
 
 ## Checklist
-_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
+_This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome).
+However, reviewers may request that you complete any actions in this list if you have not done so. If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
 
-- [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & integration tests). Exceptions may be made if previously agreed upon.
-- [ ] My PR passes Checkstyle validation based on the [Code Style Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Style+Guide).
-- [ ] My PR includes Javadoc for _all new (or modified) public methods and classes_. It also includes Javadoc for large or complex private methods.
-- [ ] My PR passes all tests and includes new/updated Unit or Integration Tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] My PR is **created against the `main` branch** of code (unless it is a backport or is fixing an issue specific to an older branch).
+- [ ] My PR is **small in size** (e.g. less than 1,000 lines of code, not including comments & integration tests). Exceptions may be made if previously agreed upon.
+- [ ] My PR **passes Checkstyle** validation based on the [Code Style Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Style+Guide).
+- [ ] My PR **includes Javadoc** for _all new (or modified) public methods and classes_. It also includes Javadoc for large or complex private methods.
+- [ ] My PR **passes all tests and includes new/updated Unit or Integration Tests** based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] My PR **includes details on how to test it**. I've provided clear instructions to reviewers on how to successfully test this fix or feature.
 - [ ] If my PR includes new libraries/dependencies (in any `pom.xml`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
 - [ ] If my PR modifies REST API endpoints, I've opened a separate [REST Contract](https://github.com/DSpace/RestContract/blob/main/README.md) PR related to this change.
 - [ ] If my PR includes new configurations, I've provided basic technical documentation in the PR itself.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8b3cb1d017..39a6f41429 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,11 @@ jobs:
       # Also specify version of Java to use (this can allow us to optionally run tests on multiple JDKs in future)
       matrix:
         include:
-          # NOTE: Unit Tests include deprecated REST API v6 (as it has unit tests)
+          # NOTE: Unit Tests include a retry for occasionally failing tests
           #  - surefire.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
           - type: "Unit Tests"
-            java: 11
-            mvnflags: "-DskipUnitTests=false -Pdspace-rest -Dsurefire.rerunFailingTestsCount=2"
+            java: 17
+            mvnflags: "-DskipUnitTests=false -Dsurefire.rerunFailingTestsCount=2"
             resultsdir: "**/target/surefire-reports/**"
           # NOTE: ITs skip all code validation checks, as they are already done by Unit Test job.
           #  - enforcer.skip     => Skip maven-enforcer-plugin rules
@@ -34,7 +34,7 @@ jobs:
           #  - xml.skip          => Skip all XML/XSLT validation by xml-maven-plugin
           #  - failsafe.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
           - type: "Integration Tests"
-            java: 11
+            java: 17
             mvnflags: "-DskipIntegrationTests=false -Denforcer.skip=true -Dcheckstyle.skip=true -Dlicense.skip=true -Dxml.skip=true -Dfailsafe.rerunFailingTestsCount=2"
             resultsdir: "**/target/failsafe-reports/**"
       # Do NOT exit immediately if one matrix job fails
diff --git a/.github/workflows/codescan.yml b/.github/workflows/codescan.yml
index 1e3d835e27..3a563c6fa3 100644
--- a/.github/workflows/codescan.yml
+++ b/.github/workflows/codescan.yml
@@ -41,7 +41,7 @@ jobs:
       - name: Install JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'temurin'
 
       # Initializes the CodeQL tools for scanning.
diff --git a/.github/workflows/reusable-docker-build.yml b/.github/workflows/reusable-docker-build.yml
index 687474caed..7a8de661fa 100644
--- a/.github/workflows/reusable-docker-build.yml
+++ b/.github/workflows/reusable-docker-build.yml
@@ -68,9 +68,9 @@ env:
   # See "Redeploy" steps below for more details.
   REDEPLOY_SANDBOX_URL: ${{ secrets.REDEPLOY_SANDBOX_URL }}
   REDEPLOY_DEMO_URL: ${{ secrets.REDEPLOY_DEMO_URL }}
-  # Current DSpace maintenance branch (and architecture) which is deployed to demo.dspace.org / sandbox.dspace.org
-  # (NOTE: No deployment branch specified for sandbox.dspace.org as it uses the default_branch)
-  DEPLOY_DEMO_BRANCH: 'dspace-7_x'
+  # Current DSpace branches (and architecture) which are deployed to demo.dspace.org & sandbox.dspace.org respectively
+  DEPLOY_DEMO_BRANCH: 'dspace-8_x'
+  DEPLOY_SANDBOX_BRANCH: 'main'
   DEPLOY_ARCH: 'linux/amd64'
 
 jobs:
@@ -174,7 +174,7 @@ jobs:
           !matrix.isPR &&
           env.REDEPLOY_SANDBOX_URL != '' &&
           matrix.arch == env.DEPLOY_ARCH &&
-          github.ref_name == github.event.repository.default_branch
+          github.ref_name == env.DEPLOY_SANDBOX_BRANCH
         run: |
           curl -X POST $REDEPLOY_SANDBOX_URL
 
diff --git a/.gitignore b/.gitignore
index 2fcb46b993..529351edc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ tags
 .project
 .classpath
 .checkstyle
+.factorypath
 
 ## Ignore project files created by IntelliJ IDEA
 *.iml
diff --git a/.lgtm.yml b/.lgtm.yml
deleted file mode 100644
index 132de8a6de..0000000000
--- a/.lgtm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# LGTM Settings (https://lgtm.com/)
-# For reference, see https://lgtm.com/help/lgtm/lgtm.yml-configuration-file
-# or template at https://lgtm.com/static/downloads/lgtm.template.yml
-
-extraction:
-  java:
-    index:
-      # Specify the Java version required to build the project
-      java_version: 11
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 45a6af9ce5..657e11eee7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,13 +10,14 @@ DSpace is a community built and supported project. We do not have a centralized
 ## Contribute new code via a Pull Request
 
 We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
-Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC8x/Release+Notes).
 
 Code Contribution Checklist
 - [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
 - [ ] PRs **must** pass Checkstyle validation based on our [Code Style Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Style+Guide).
 - [ ] PRs **must** include Javadoc for _all new/modified public methods and classes_. Larger private methods should also have Javadoc
 - [ ] PRs **must** pass all automated tests and include new/updated Unit or Integration tests based on our [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] Details on how to test the PR **must** be provided. Reviewers must be aware of any steps they need to take to successfully test your fix or feature.
 - [ ] If a PR includes new libraries/dependencies (in any `pom.xml`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
 - [ ] Basic technical documentation _should_ be provided for any new features or changes to the REST API. REST API changes should be documented in our [Rest Contract](https://github.com/DSpace/RestContract).
 - [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
@@ -25,7 +26,7 @@ Additional details on the code contribution process can be found in our [Code Co
 
 ## Contribute documentation
 
-DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x 
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC 
 
 If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
 Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
@@ -33,7 +34,7 @@ Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyra
 ## Help others on mailing lists or Slack
 
 DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
-Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
+Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via Lyrasis).
 
 ## Join a working or interest group
 
@@ -41,5 +42,5 @@ Most of the work in building/improving DSpace comes via [Working Groups](https:/
 
 All working/interest groups are open to anyone to join and participate.  A few key groups to be aware of include:
 
-* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
-* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
\ No newline at end of file
+* [DSpace Developer Team](https://wiki.lyrasis.org/display/DSPACE/Developer+Meetings) - This is the primary, volunteer development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs. This is also were discussions of the next release or major issues occur. Anyone is welcome to attend.
+* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers. Anyone is welcome to attend.
diff --git a/Dockerfile b/Dockerfile
index ee48dec508..7581798037 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,15 @@
 # This image will be published as dspace/dspace
 # See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
 #
-# - note: default tag for branch: dspace/dspace: dspace/dspace:dspace-7_x
+# - note: default tag for branch: dspace/dspace: dspace/dspace:latest
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
+ARG DSPACE_VERSION=latest
 
 # Step 1 - Run Maven Build
-FROM dspace/dspace-dependencies:dspace-7_x as build
+FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install
@@ -18,7 +19,7 @@ RUN mkdir /install \
 USER dspace
 # Copy the DSpace source code (from local machine) into the workdir (excluding .dockerignore contents)
 ADD --chown=dspace . /app/
-# Build DSpace (note: this build doesn't include the optional, deprecated "dspace-rest" webapp)
+# Build DSpace
 # Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
 # Maven flags here ensure that we skip building test environment and skip all code verification checks.
 # These flags speed up this compilation as much as reasonably possible.
@@ -26,9 +27,11 @@ ENV MAVEN_FLAGS="-P-test-environment -Denforcer.skip=true -Dcheckstyle.skip=true
 RUN mvn --no-transfer-progress package ${MAVEN_FLAGS} && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
+# Remove the server webapp to keep image small.
+RUN rm -rf /install/webapps/server/
 
 # Step 2 - Run Ant Deploy
-FROM eclipse-temurin:${JDK_VERSION} as ant_build
+FROM eclipse-temurin:${JDK_VERSION} AS ant_build
 ARG TARGET_DIR=dspace-installer
 # COPY the /install directory from 'build' container to /dspace-src in this container
 COPY --from=build /install /dspace-src
@@ -48,23 +51,16 @@ RUN mkdir $ANT_HOME && \
 # Run necessary 'ant' deploy scripts
 RUN ant init_installation update_configs update_code update_webapps
 
-# Step 3 - Run tomcat
-# Create a new tomcat image that does not retain the the build directory contents
-FROM tomcat:9-jdk${JDK_VERSION}
+# Step 3 - Start up DSpace via Runnable JAR
+FROM eclipse-temurin:${JDK_VERSION}
 # NOTE: DSPACE_INSTALL must align with the "dspace.dir" default configuration.
 ENV DSPACE_INSTALL=/dspace
 # Copy the /dspace directory from 'ant_build' container to /dspace in this container
 COPY --from=ant_build /dspace $DSPACE_INSTALL
-# Expose Tomcat port and AJP port
-EXPOSE 8080 8009
+WORKDIR $DSPACE_INSTALL
+# Expose Tomcat port
+EXPOSE 8080
 # Give java extra memory (2GB)
 ENV JAVA_OPTS=-Xmx2000m
-
-# Link the DSpace 'server' webapp into Tomcat's webapps directory.
-# This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
-RUN ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/server
-# If you wish to run "server" webapp off the ROOT path, then comment out the above RUN, and uncomment the below RUN.
-# You also MUST update the 'dspace.server.url' configuration to match.
-# Please note that server webapp should only run on one path at a time.
-#RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
-#    ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/ROOT
+# On startup, run DSpace Runnable JAR
+ENTRYPOINT ["java", "-jar", "webapps/server-boot.jar", "--dspace.dir=$DSPACE_INSTALL"]
diff --git a/Dockerfile.cli b/Dockerfile.cli
index 53040a2fad..5254d1eb4d 100644
--- a/Dockerfile.cli
+++ b/Dockerfile.cli
@@ -1,14 +1,15 @@
 # This image will be published as dspace/dspace-cli
 # See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
 #
-# - note: default tag for branch: dspace/dspace-cli: dspace/dspace-cli:dspace-7_x
+# - note: default tag for branch: dspace/dspace-cli: dspace/dspace-cli:latest
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
+ARG DSPACE_VERSION=latest
 
 # Step 1 - Run Maven Build
-FROM dspace/dspace-dependencies:dspace-7_x as build
+FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install
@@ -24,7 +25,7 @@ RUN mvn --no-transfer-progress package && \
   mvn clean
 
 # Step 2 - Run Ant Deploy
-FROM eclipse-temurin:${JDK_VERSION} as ant_build
+FROM eclipse-temurin:${JDK_VERSION} AS ant_build
 ARG TARGET_DIR=dspace-installer
 # COPY the /install directory from 'build' container to /dspace-src in this container
 COPY --from=build /install /dspace-src
diff --git a/Dockerfile.dependencies b/Dockerfile.dependencies
index 1400b356d4..f3bf1f8332 100644
--- a/Dockerfile.dependencies
+++ b/Dockerfile.dependencies
@@ -2,12 +2,12 @@
 # The purpose of this image is to make the build for dspace/dspace run faster
 #
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
 
 # Step 1 - Run Maven Build
-FROM maven:3-eclipse-temurin-${JDK_VERSION} as build
+FROM maven:3-eclipse-temurin-${JDK_VERSION} AS build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # Create the 'dspace' user account & home directory
diff --git a/Dockerfile.test b/Dockerfile.test
index f6f8c1a290..f3acef00e8 100644
--- a/Dockerfile.test
+++ b/Dockerfile.test
@@ -1,16 +1,17 @@
 # This image will be published as dspace/dspace
 # See https://github.com/DSpace/DSpace/tree/main/dspace/src/main/docker for usage details
 #
-# - note: default tag for branch: dspace/dspace: dspace/dspace:dspace-7_x-test
+# - note: default tag for branch: dspace/dspace: dspace/dspace:latest-test
 #
 # This image is meant for TESTING/DEVELOPMENT ONLY as it deploys the old v6 REST API under HTTP (not HTTPS)
 
-# This Dockerfile uses JDK11 by default, but has also been tested with JDK17.
-# To build with JDK17, use "--build-arg JDK_VERSION=17"
-ARG JDK_VERSION=11
+# This Dockerfile uses JDK17 by default.
+# To build with other versions, use "--build-arg JDK_VERSION=[value]"
+ARG JDK_VERSION=17
+ARG DSPACE_VERSION=latest
 
 # Step 1 - Run Maven Build
-FROM dspace/dspace-dependencies:dspace-7_x as build
+FROM dspace/dspace-dependencies:${DSPACE_VERSION} AS build
 ARG TARGET_DIR=dspace-installer
 WORKDIR /app
 # The dspace-installer directory will be written to /install
@@ -20,14 +21,16 @@ RUN mkdir /install \
 USER dspace
 # Copy the DSpace source code (from local machine) into the workdir (excluding .dockerignore contents)
 ADD --chown=dspace . /app/
-# Build DSpace (INCLUDING the optional, deprecated "dspace-rest" webapp)
+# Build DSpace
 # Copy the dspace-installer directory to /install.  Clean up the build to keep the docker image small
-RUN mvn --no-transfer-progress package -Pdspace-rest && \
+RUN mvn --no-transfer-progress package && \
   mv /app/dspace/target/${TARGET_DIR}/* /install && \
   mvn clean
+# Remove the server webapp to keep image small. Rename runnable JAR to server-boot.jar.
+RUN rm -rf /install/webapps/server/
 
 # Step 2 - Run Ant Deploy
-FROM eclipse-temurin:${JDK_VERSION} as ant_build
+FROM eclipse-temurin:${JDK_VERSION} AS ant_build
 ARG TARGET_DIR=dspace-installer
 # COPY the /install directory from 'build' container to /dspace-src in this container
 COPY --from=build /install /dspace-src
@@ -47,36 +50,18 @@ RUN mkdir $ANT_HOME && \
 # Run necessary 'ant' deploy scripts
 RUN ant init_installation update_configs update_code update_webapps
 
-# Step 3 - Run tomcat
-# Create a new tomcat image that does not retain the the build directory contents
-FROM tomcat:9-jdk${JDK_VERSION}
+# Step 3 - Start up DSpace via Runnable JAR
+FROM eclipse-temurin:${JDK_VERSION}
+# NOTE: DSPACE_INSTALL must align with the "dspace.dir" default configuration.
 ENV DSPACE_INSTALL=/dspace
-ENV TOMCAT_INSTALL=/usr/local/tomcat
-# Copy the /dspace directory from 'ant_build' containger to /dspace in this container
+# Copy the /dspace directory from 'ant_build' container to /dspace in this container
 COPY --from=ant_build /dspace $DSPACE_INSTALL
-# Enable the AJP connector in Tomcat's server.xml
-# NOTE: secretRequired="false" should only be used when AJP is NOT accessible from an external network. But, secretRequired="true" isn't supported by mod_proxy_ajp until Apache 2.5
-RUN sed -i '/Service name="Catalina".*/a \\n    <Connector protocol="AJP/1.3" port="8009" address="0.0.0.0" redirectPort="8443" URIEncoding="UTF-8" secretRequired="false" />' $TOMCAT_INSTALL/conf/server.xml
-# Expose Tomcat port and AJP port
-EXPOSE 8080 8009 8000
+WORKDIR $DSPACE_INSTALL
+# Expose Tomcat port and debugging port
+EXPOSE 8080 8000
 # Give java extra memory (2GB)
 ENV JAVA_OPTS=-Xmx2000m
 # Set up debugging
 ENV CATALINA_OPTS=-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:8000
-
-# Link the DSpace 'server' webapp into Tomcat's webapps directory.
-# This ensures that when we start Tomcat, it runs from /server path (e.g. http://localhost:8080/server/)
-# Also link the v6.x (deprecated) REST API off the "/rest" path
-RUN ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/server   && \
-    ln -s $DSPACE_INSTALL/webapps/rest          /usr/local/tomcat/webapps/rest
-# If you wish to run "server" webapp off the ROOT path, then comment out the above RUN, and uncomment the below RUN.
-# You also MUST update the 'dspace.server.url' configuration to match.
-# Please note that server webapp should only run on one path at a time.
-#RUN mv /usr/local/tomcat/webapps/ROOT /usr/local/tomcat/webapps/ROOT.bk && \
-#    ln -s $DSPACE_INSTALL/webapps/server   /usr/local/tomcat/webapps/ROOT && \
-#    ln -s $DSPACE_INSTALL/webapps/rest          /usr/local/tomcat/webapps/rest
-
-# Overwrite the v6.x (deprecated) REST API's web.xml, so that we can run it on HTTP (defaults to requiring HTTPS)
-# WARNING: THIS IS OBVIOUSLY INSECURE. NEVER DO THIS IN PRODUCTION.
-COPY dspace/src/main/docker/test/rest_web.xml $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml
-RUN sed -i -e "s|\${dspace.dir}|$DSPACE_INSTALL|" $DSPACE_INSTALL/webapps/rest/WEB-INF/web.xml
+# On startup, run DSpace Runnable JAR
+ENTRYPOINT ["java", "-jar", "webapps/server-boot.jar", "--dspace.dir=$DSPACE_INSTALL"]
diff --git a/LICENSES_THIRD_PARTY b/LICENSES_THIRD_PARTY
index e494c80c5d..d7e928147c 100644
--- a/LICENSES_THIRD_PARTY
+++ b/LICENSES_THIRD_PARTY
@@ -25,25 +25,29 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * AWS Java SDK for AWS KMS (com.amazonaws:aws-java-sdk-kms:1.12.261 - https://aws.amazon.com/sdkforjava)
         * AWS Java SDK for Amazon S3 (com.amazonaws:aws-java-sdk-s3:1.12.261 - https://aws.amazon.com/sdkforjava)
         * JMES Path Query library (com.amazonaws:jmespath-java:1.12.261 - https://aws.amazon.com/sdkforjava)
+        * Titanium JSON-LD 1.1 (JRE11) (com.apicatalog:titanium-json-ld:1.3.2 - https://github.com/filip26/titanium-json-ld)
         * HPPC Collections (com.carrotsearch:hppc:0.8.1 - http://labs.carrotsearch.com/hppc.html/hppc)
-        * com.drewnoakes:metadata-extractor (com.drewnoakes:metadata-extractor:2.18.0 - https://drewnoakes.com/code/exif/)
+        * com.drewnoakes:metadata-extractor (com.drewnoakes:metadata-extractor:2.19.0 - https://drewnoakes.com/code/exif/)
         * parso (com.epam:parso:2.0.14 - https://github.com/epam/parso)
-        * Esri Geometry API for Java (com.esri.geometry:esri-geometry-api:2.2.0 - https://github.com/Esri/geometry-api-java)
-        * ClassMate (com.fasterxml:classmate:1.3.0 - http://github.com/cowtowncoder/java-classmate)
-        * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.13.4 - http://github.com/FasterXML/jackson)
-        * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.13.4 - https://github.com/FasterXML/jackson-core)
-        * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.13.4.2 - http://github.com/FasterXML/jackson)
+        * ClassMate (com.fasterxml:classmate:1.6.0 - https://github.com/FasterXML/java-classmate)
+        * Jackson-annotations (com.fasterxml.jackson.core:jackson-annotations:2.16.0 - https://github.com/FasterXML/jackson)
+        * Jackson-core (com.fasterxml.jackson.core:jackson-core:2.16.0 - https://github.com/FasterXML/jackson-core)
+        * jackson-databind (com.fasterxml.jackson.core:jackson-databind:2.16.0 - https://github.com/FasterXML/jackson)
         * Jackson dataformat: CBOR (com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6 - http://github.com/FasterXML/jackson-dataformats-binary)
-        * Jackson dataformat: Smile (com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.3 - http://github.com/FasterXML/jackson-dataformats-binary)
-        * Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.1 - https://github.com/FasterXML/jackson-dataformats-text)
-        * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8)
-        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.1 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
-        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
-        * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names)
+        * Jackson dataformat: Smile (com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.15.2 - https://github.com/FasterXML/jackson-dataformats-binary)
+        * Jackson-dataformat-TOML (com.fasterxml.jackson.dataformat:jackson-dataformat-toml:2.15.2 - https://github.com/FasterXML/jackson-dataformats-text)
+        * Jackson-dataformat-YAML (com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.16.2 - https://github.com/FasterXML/jackson-dataformats-text)
+        * Jackson datatype: jdk8 (com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jdk8)
+        * Jackson datatype: JSR310 (com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.16.0 - https://github.com/FasterXML/jackson-modules-java8/jackson-datatype-jsr310)
+        * Jackson Jakarta-RS: base (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.16.2 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-base)
+        * Jackson Jakarta-RS: JSON (com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.16.2 - https://github.com/FasterXML/jackson-jakarta-rs-providers/jackson-jakarta-rs-json-provider)
+        * Jackson module: Jakarta XML Bind Annotations (jakarta.xml.bind) (com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.16.2 - https://github.com/FasterXML/jackson-modules-base)
+        * Jackson-module-parameter-names (com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.4 - https://github.com/FasterXML/jackson-modules-java8/jackson-module-parameter-names)
         * Java UUID Generator (com.fasterxml.uuid:java-uuid-generator:4.0.1 - https://github.com/cowtowncoder/java-uuid-generator)
-        * Woodstox (com.fasterxml.woodstox:woodstox-core:6.2.4 - https://github.com/FasterXML/woodstox)
-        * zjsonpatch (com.flipkart.zjsonpatch:zjsonpatch:0.4.6 - https://github.com/flipkart-incubator/zjsonpatch/)
-        * Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.9.2 - https://github.com/ben-manes/caffeine)
+        * Woodstox (com.fasterxml.woodstox:woodstox-core:6.5.1 - https://github.com/FasterXML/woodstox)
+        * zjsonpatch (com.flipkart.zjsonpatch:zjsonpatch:0.4.16 - https://github.com/flipkart-incubator/zjsonpatch/)
+        * Caffeine cache (com.github.ben-manes.caffeine:caffeine:2.9.3 - https://github.com/ben-manes/caffeine)
+        * Caffeine cache (com.github.ben-manes.caffeine:caffeine:3.1.6 - https://github.com/ben-manes/caffeine)
         * btf (com.github.java-json-tools:btf:1.3 - https://github.com/java-json-tools/btf)
         * jackson-coreutils (com.github.java-json-tools:jackson-coreutils:2.0 - https://github.com/java-json-tools/jackson-coreutils)
         * jackson-coreutils-equivalence (com.github.java-json-tools:jackson-coreutils-equivalence:1.0 - https://github.com/java-json-tools/jackson-coreutils)
@@ -54,9 +58,9 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * JCIP Annotations under Apache License (com.github.stephenc.jcip:jcip-annotations:1.0-1 - http://stephenc.github.com/jcip-annotations)
         * Google APIs Client Library for Java (com.google.api-client:google-api-client:1.23.0 - https://github.com/google/google-api-java-client/google-api-client)
         * Google Analytics API v3-rev145-1.23.0 (com.google.apis:google-api-services-analytics:v3-rev145-1.23.0 - http://nexus.sonatype.org/oss-repository-hosting.html/google-api-services-analytics)
-        * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.1 - http://findbugs.sourceforge.net/)
-        * Gson (com.google.code.gson:gson:2.9.0 - https://github.com/google/gson/gson)
-        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.18.0 - https://errorprone.info/error_prone_annotations)
+        * FindBugs-jsr305 (com.google.code.findbugs:jsr305:3.0.2 - http://findbugs.sourceforge.net/)
+        * Gson (com.google.code.gson:gson:2.10.1 - https://github.com/google/gson/gson)
+        * error-prone annotations (com.google.errorprone:error_prone_annotations:2.10.0 - https://errorprone.info/error_prone_annotations)
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
         * Guava: Google Core Libraries for Java (com.google.guava:guava:32.0.0-jre - https://github.com/google/guava)
         * Guava: Google Core Libraries for Java (JDK5 Backport) (com.google.guava:guava-jdk5:17.0 - http://code.google.com/p/guava-libraries/guava-jdk5)
@@ -64,25 +68,24 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * Google HTTP Client Library for Java (com.google.http-client:google-http-client:1.23.0 - https://github.com/google/google-http-java-client/google-http-client)
         * GSON extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-gson:1.41.7 - https://github.com/googleapis/google-http-java-client/google-http-client-gson)
         * Jackson 2 extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-jackson2:1.23.0 - https://github.com/google/google-http-java-client/google-http-client-jackson2)
+        * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
         * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:2.8 - https://github.com/google/j2objc/)
         * Google OAuth Client Library for Java (com.google.oauth-client:google-oauth-client:1.33.3 - https://github.com/googleapis/google-oauth-java-client/google-oauth-client)
         * ConcurrentLinkedHashMap (com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2 - http://code.google.com/p/concurrentlinkedhashmap)
         * libphonenumber (com.googlecode.libphonenumber:libphonenumber:8.11.1 - https://github.com/google/libphonenumber/)
-        * Jackcess (com.healthmarketscience.jackcess:jackcess:4.0.2 - https://jackcess.sourceforge.io)
-        * Jackcess Encrypt (com.healthmarketscience.jackcess:jackcess-encrypt:4.0.1 - http://jackcessencrypt.sf.net)
-        * project ':json-path' (com.jayway.jsonpath:json-path:2.6.0 - https://github.com/jayway/JsonPath)
-        * project ':json-path-assert' (com.jayway.jsonpath:json-path-assert:2.6.0 - https://github.com/jayway/JsonPath)
+        * Jackcess (com.healthmarketscience.jackcess:jackcess:4.0.5 - https://jackcess.sourceforge.io)
+        * Jackcess Encrypt (com.healthmarketscience.jackcess:jackcess-encrypt:4.0.2 - http://jackcessencrypt.sf.net)
+        * json-path (com.jayway.jsonpath:json-path:2.9.0 - https://github.com/jayway/JsonPath)
+        * json-path-assert (com.jayway.jsonpath:json-path-assert:2.9.0 - https://github.com/jayway/JsonPath)
         * Disruptor Framework (com.lmax:disruptor:3.4.2 - http://lmax-exchange.github.com/disruptor)
-        * builder-commons (com.lyncode:builder-commons:1.0.2 - http://nexus.sonatype.org/oss-repository-hosting.html/builder-commons)
-        * MaxMind DB Reader (com.maxmind.db:maxmind-db:1.2.2 - http://dev.maxmind.com/)
-        * MaxMind GeoIP2 API (com.maxmind.geoip2:geoip2:2.11.0 - http://dev.maxmind.com/geoip/geoip2/web-services)
-        * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:7.9 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
-        * opencsv (com.opencsv:opencsv:5.6 - http://opencsv.sf.net)
+        * MaxMind DB Reader (com.maxmind.db:maxmind-db:2.1.0 - http://dev.maxmind.com/)
+        * MaxMind GeoIP2 API (com.maxmind.geoip2:geoip2:2.17.0 - https://dev.maxmind.com/geoip?lang=en)
+        * Nimbus JOSE+JWT (com.nimbusds:nimbus-jose-jwt:9.37.3 - https://bitbucket.org/connect2id/nimbus-jose-jwt)
+        * opencsv (com.opencsv:opencsv:5.9 - http://opencsv.sf.net)
         * java-libpst (com.pff:java-libpst:0.9.3 - https://github.com/rjohnsondev/java-libpst)
         * rome (com.rometools:rome:1.19.0 - http://rometools.com/rome)
         * rome-modules (com.rometools:rome-modules:1.19.0 - http://rometools.com/rome-modules)
         * rome-utils (com.rometools:rome-utils:1.19.0 - http://rometools.com/rome-utils)
-        * fastinfoset (com.sun.xml.fastinfoset:FastInfoset:1.2.15 - http://fi.java.net)
         * T-Digest (com.tdunning:t-digest:3.1 - https://github.com/tdunning/t-digest)
         * config (com.typesafe:config:1.3.3 - https://github.com/lightbend/config)
         * ssl-config-core (com.typesafe:ssl-config-core_2.13:0.3.8 - https://github.com/lightbend/ssl-config)
@@ -94,240 +97,282 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * akka-stream (com.typesafe.akka:akka-stream_2.13:2.5.31 - https://akka.io/)
         * scala-logging (com.typesafe.scala-logging:scala-logging_2.13:3.9.2 - https://github.com/lightbend/scala-logging)
         * JSON library from Android SDK (com.vaadin.external.google:android-json:0.0.20131108.vaadin1 - http://developer.android.com/sdk)
-        * SparseBitSet (com.zaxxer:SparseBitSet:1.2 - https://github.com/brettwooldridge/SparseBitSet)
+        * SparseBitSet (com.zaxxer:SparseBitSet:1.3 - https://github.com/brettwooldridge/SparseBitSet)
         * Apache Commons BeanUtils (commons-beanutils:commons-beanutils:1.9.4 - https://commons.apache.org/proper/commons-beanutils/)
-        * Apache Commons CLI (commons-cli:commons-cli:1.4 - http://commons.apache.org/proper/commons-cli/)
-        * Apache Commons Codec (commons-codec:commons-codec:1.10 - http://commons.apache.org/proper/commons-codec/)
+        * Apache Commons CLI (commons-cli:commons-cli:1.6.0 - https://commons.apache.org/proper/commons-cli/)
+        * Apache Commons Codec (commons-codec:commons-codec:1.16.0 - https://commons.apache.org/proper/commons-codec/)
         * Apache Commons Collections (commons-collections:commons-collections:3.2.2 - http://commons.apache.org/collections/)
-        * Commons Digester (commons-digester:commons-digester:1.8.1 - http://commons.apache.org/digester/)
-        * Apache Commons FileUpload (commons-fileupload:commons-fileupload:1.5 - https://commons.apache.org/proper/commons-fileupload/)
-        * Apache Commons IO (commons-io:commons-io:2.7 - https://commons.apache.org/proper/commons-io/)
+        * Commons Digester (commons-digester:commons-digester:2.1 - http://commons.apache.org/digester/)
+        * Apache Commons IO (commons-io:commons-io:2.15.1 - https://commons.apache.org/proper/commons-io/)
         * Commons Lang (commons-lang:commons-lang:2.6 - http://commons.apache.org/lang/)
-        * Apache Commons Logging (commons-logging:commons-logging:1.2 - http://commons.apache.org/proper/commons-logging/)
-        * Apache Commons Validator (commons-validator:commons-validator:1.5.0 - http://commons.apache.org/proper/commons-validator/)
+        * Apache Commons Logging (commons-logging:commons-logging:1.3.0 - https://commons.apache.org/proper/commons-logging/)
+        * Apache Commons Validator (commons-validator:commons-validator:1.7 - http://commons.apache.org/proper/commons-validator/)
         * GeoJson POJOs for Jackson (de.grundid.opendatalab:geojson-jackson:1.14 - https://github.com/opendatalab-de/geojson-jackson)
+        * broker-client (eu.openaire:broker-client:1.1.2 - http://api.openaire.eu/broker/broker-client)
         * OpenAIRE Funders Model (eu.openaire:funders-model:2.0.0 - https://api.openaire.eu)
         * Metrics Core (io.dropwizard.metrics:metrics-core:4.1.5 - https://metrics.dropwizard.io/metrics-core)
         * Graphite Integration for Metrics (io.dropwizard.metrics:metrics-graphite:4.1.5 - https://metrics.dropwizard.io/metrics-graphite)
         * Metrics Integration for Jetty 9.3 and higher (io.dropwizard.metrics:metrics-jetty9:4.1.5 - https://metrics.dropwizard.io/metrics-jetty9)
         * Metrics Integration with JMX (io.dropwizard.metrics:metrics-jmx:4.1.5 - https://metrics.dropwizard.io/metrics-jmx)
         * JVM Integration for Metrics (io.dropwizard.metrics:metrics-jvm:4.1.5 - https://metrics.dropwizard.io/metrics-jvm)
-        * micrometer-core (io.micrometer:micrometer-core:1.9.11 - https://github.com/micrometer-metrics/micrometer)
-        * Netty/Buffer (io.netty:netty-buffer:4.1.68.Final - https://netty.io/netty-buffer/)
-        * Netty/Codec (io.netty:netty-codec:4.1.68.Final - https://netty.io/netty-codec/)
+        * SWORD v2 Common Server Library (forked) (io.gdcc:sword2-server:2.0.0 - https://github.com/gdcc/sword2-server)
+        * micrometer-commons (io.micrometer:micrometer-commons:1.12.6 - https://github.com/micrometer-metrics/micrometer)
+        * micrometer-core (io.micrometer:micrometer-core:1.12.6 - https://github.com/micrometer-metrics/micrometer)
+        * micrometer-jakarta9 (io.micrometer:micrometer-jakarta9:1.12.6 - https://github.com/micrometer-metrics/micrometer)
+        * micrometer-observation (io.micrometer:micrometer-observation:1.12.6 - https://github.com/micrometer-metrics/micrometer)
+        * Netty/Buffer (io.netty:netty-buffer:4.1.106.Final - https://netty.io/netty-buffer/)
+        * Netty/Buffer (io.netty:netty-buffer:4.1.99.Final - https://netty.io/netty-buffer/)
+        * Netty/Codec (io.netty:netty-codec:4.1.106.Final - https://netty.io/netty-codec/)
+        * Netty/Codec (io.netty:netty-codec:4.1.99.Final - https://netty.io/netty-codec/)
         * Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.53.Final - https://netty.io/netty-codec-http/)
         * Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.53.Final - https://netty.io/netty-codec-socks/)
-        * Netty/Common (io.netty:netty-common:4.1.68.Final - https://netty.io/netty-common/)
-        * Netty/Handler (io.netty:netty-handler:4.1.68.Final - https://netty.io/netty-handler/)
+        * Netty/Common (io.netty:netty-common:4.1.106.Final - https://netty.io/netty-common/)
+        * Netty/Common (io.netty:netty-common:4.1.99.Final - https://netty.io/netty-common/)
+        * Netty/Handler (io.netty:netty-handler:4.1.106.Final - https://netty.io/netty-handler/)
+        * Netty/Handler (io.netty:netty-handler:4.1.99.Final - https://netty.io/netty-handler/)
         * Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.53.Final - https://netty.io/netty-handler-proxy/)
-        * Netty/Resolver (io.netty:netty-resolver:4.1.68.Final - https://netty.io/netty-resolver/)
-        * Netty/Transport (io.netty:netty-transport:4.1.68.Final - https://netty.io/netty-transport/)
-        * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.68.Final - https://netty.io/netty-transport-native-epoll/)
-        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.68.Final - https://netty.io/netty-transport-native-unix-common/)
+        * Netty/Resolver (io.netty:netty-resolver:4.1.99.Final - https://netty.io/netty-resolver/)
+        * Netty/Transport (io.netty:netty-transport:4.1.106.Final - https://netty.io/netty-transport/)
+        * Netty/Transport (io.netty:netty-transport:4.1.99.Final - https://netty.io/netty-transport/)
+        * Netty/Transport/Native/Epoll (io.netty:netty-transport-native-epoll:4.1.99.Final - https://netty.io/netty-transport-native-epoll/)
+        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.106.Final - https://netty.io/netty-transport-native-unix-common/)
+        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.99.Final - https://netty.io/netty-transport-native-unix-common/)
         * OpenTracing API (io.opentracing:opentracing-api:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-api)
         * OpenTracing-noop (io.opentracing:opentracing-noop:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-noop)
         * OpenTracing-util (io.opentracing:opentracing-util:0.33.0 - https://github.com/opentracing/opentracing-java/opentracing-util)
         * Google S2 geometry library (io.sgr:s2-geometry-library-java:1.0.0 - https://github.com/sgr-io/s2-geometry-library-java)
+        * Jandex: Core (io.smallrye:jandex:3.1.2 - https://smallrye.io)
         * swagger-annotations (io.swagger:swagger-annotations:1.6.2 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
         * swagger-compat-spec-parser (io.swagger:swagger-compat-spec-parser:1.0.52 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-compat-spec-parser)
         * swagger-core (io.swagger:swagger-core:1.6.2 - https://github.com/swagger-api/swagger-core/modules/swagger-core)
         * swagger-models (io.swagger:swagger-models:1.6.2 - https://github.com/swagger-api/swagger-core/modules/swagger-models)
         * swagger-parser (io.swagger:swagger-parser:1.0.52 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser)
         * swagger-annotations (io.swagger.core.v3:swagger-annotations:2.1.5 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations)
+        * swagger-annotations-jakarta (io.swagger.core.v3:swagger-annotations-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-annotations-jakarta)
         * swagger-core (io.swagger.core.v3:swagger-core:2.1.5 - https://github.com/swagger-api/swagger-core/modules/swagger-core)
+        * swagger-core-jakarta (io.swagger.core.v3:swagger-core-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-core-jakarta)
+        * swagger-integration-jakarta (io.swagger.core.v3:swagger-integration-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-integration-jakarta)
+        * swagger-jaxrs2-jakarta (io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-jaxrs2-jakarta)
         * swagger-models (io.swagger.core.v3:swagger-models:2.1.5 - https://github.com/swagger-api/swagger-core/modules/swagger-models)
+        * swagger-models-jakarta (io.swagger.core.v3:swagger-models-jakarta:2.2.21 - https://github.com/swagger-api/swagger-core/modules/swagger-models-jakarta)
         * swagger-parser (io.swagger.parser.v3:swagger-parser:2.0.23 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser)
         * swagger-parser (io.swagger.parser.v3:swagger-parser-core:2.0.23 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser-core)
         * swagger-parser-v2-converter (io.swagger.parser.v3:swagger-parser-v2-converter:2.0.23 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser-v2-converter)
         * swagger-parser-v3 (io.swagger.parser.v3:swagger-parser-v3:2.0.23 - http://nexus.sonatype.org/oss-repository-hosting.html/swagger-parser-project/modules/swagger-parser-v3)
-        * Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:2.0.2 - https://beanvalidation.org)
-        * JSR107 API and SPI (javax.cache:cache-api:1.1.0 - https://github.com/jsr107/jsr107spec)
+        * Jakarta Dependency Injection (jakarta.inject:jakarta.inject-api:2.0.1 - https://github.com/eclipse-ee4j/injection-api)
+        * Jakarta Bean Validation API (jakarta.validation:jakarta.validation-api:3.0.2 - https://beanvalidation.org)
+        * JSR107 API and SPI (javax.cache:cache-api:1.1.1 - https://github.com/jsr107/jsr107spec)
         * javax.inject (javax.inject:javax.inject:1 - http://code.google.com/p/atinject/)
-        * Bean Validation API (javax.validation:validation-api:2.0.1.Final - http://beanvalidation.org)
+        * Bean Validation API (javax.validation:validation-api:1.1.0.Final - http://beanvalidation.org)
         * jdbm (jdbm:jdbm:1.0 - no url defined)
-        * Joda-Time (joda-time:joda-time:2.9.2 - http://www.joda.org/joda-time/)
+        * Joda-Time (joda-time:joda-time:2.12.5 - https://www.joda.org/joda-time/)
         * Byte Buddy (without dependencies) (net.bytebuddy:byte-buddy:1.11.13 - https://bytebuddy.net/byte-buddy)
         * Byte Buddy agent (net.bytebuddy:byte-buddy-agent:1.11.13 - https://bytebuddy.net/byte-buddy-agent)
         * eigenbase-properties (net.hydromatic:eigenbase-properties:1.1.5 - http://github.com/julianhyde/eigenbase-properties)
         * json-unit-core (net.javacrumbs.json-unit:json-unit-core:2.19.0 - https://github.com/lukas-krecan/JsonUnit/json-unit-core)
         * "Java Concurrency in Practice" book annotations (net.jcip:jcip-annotations:1.0 - http://jcip.net/)
-        * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:1.2 - http://www.minidev.net/)
-        * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:2.4.7 - https://urielch.github.io/)
-        * JSON Small and Fast Parser (net.minidev:json-smart:2.3 - http://www.minidev.net/)
-        * JSON Small and Fast Parser (net.minidev:json-smart:2.4.7 - https://urielch.github.io/)
+        * ASM based accessors helper used by json-smart (net.minidev:accessors-smart:2.5.0 - https://urielch.github.io/)
+        * JSON Small and Fast Parser (net.minidev:json-smart:2.5.0 - https://urielch.github.io/)
         * Abdera Core (org.apache.abdera:abdera-core:1.1.3 - http://abdera.apache.org/abdera-core)
         * I18N Libraries (org.apache.abdera:abdera-i18n:1.1.3 - http://abdera.apache.org)
-        * Apache Ant Core (org.apache.ant:ant:1.10.11 - https://ant.apache.org/)
-        * Apache Ant Launcher (org.apache.ant:ant-launcher:1.10.11 - https://ant.apache.org/)
-        * Apache Commons BCEL (org.apache.bcel:bcel:6.6.0 - https://commons.apache.org/proper/commons-bcel)
-        * Calcite Core (org.apache.calcite:calcite-core:1.27.0 - https://calcite.apache.org)
-        * Calcite Linq4j (org.apache.calcite:calcite-linq4j:1.27.0 - https://calcite.apache.org)
-        * Apache Calcite Avatica (org.apache.calcite.avatica:avatica-core:1.18.0 - https://calcite.apache.org/avatica)
-        * Apache Commons Collections (org.apache.commons:commons-collections4:4.1 - http://commons.apache.org/proper/commons-collections/)
-        * Apache Commons Compress (org.apache.commons:commons-compress:1.21 - https://commons.apache.org/proper/commons-compress/)
-        * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.8.0 - https://commons.apache.org/proper/commons-configuration/)
-        * Apache Commons CSV (org.apache.commons:commons-csv:1.9.0 - https://commons.apache.org/proper/commons-csv/)
-        * Apache Commons DBCP (org.apache.commons:commons-dbcp2:2.9.0 - https://commons.apache.org/dbcp/)
+        * Abdera Parser (org.apache.abdera:abdera-parser:1.1.3 - http://abdera.apache.org/abdera-parser)
+        * Apache Ant Core (org.apache.ant:ant:1.10.14 - https://ant.apache.org/)
+        * Apache Ant Launcher (org.apache.ant:ant-launcher:1.10.14 - https://ant.apache.org/)
+        * Apache Commons BCEL (org.apache.bcel:bcel:6.7.0 - https://commons.apache.org/proper/commons-bcel)
+        * Calcite Core (org.apache.calcite:calcite-core:1.35.0 - https://calcite.apache.org)
+        * Calcite Linq4j (org.apache.calcite:calcite-linq4j:1.35.0 - https://calcite.apache.org)
+        * Apache Calcite Avatica (org.apache.calcite.avatica:avatica-core:1.23.0 - https://calcite.apache.org/avatica)
+        * Apache Calcite Avatica Metrics (org.apache.calcite.avatica:avatica-metrics:1.23.0 - https://calcite.apache.org/avatica)
+        * Apache Commons Collections (org.apache.commons:commons-collections4:4.4 - https://commons.apache.org/proper/commons-collections/)
+        * Apache Commons Compress (org.apache.commons:commons-compress:1.26.0 - https://commons.apache.org/proper/commons-compress/)
+        * Apache Commons Configuration (org.apache.commons:commons-configuration2:2.10.1 - https://commons.apache.org/proper/commons-configuration/)
+        * Apache Commons CSV (org.apache.commons:commons-csv:1.10.0 - https://commons.apache.org/proper/commons-csv/)
+        * Apache Commons DBCP (org.apache.commons:commons-dbcp2:2.11.0 - https://commons.apache.org/dbcp/)
         * Apache Commons Exec (org.apache.commons:commons-exec:1.3 - http://commons.apache.org/proper/commons-exec/)
-        * Apache Commons Lang (org.apache.commons:commons-lang3:3.12.0 - https://commons.apache.org/proper/commons-lang/)
+        * Apache Commons Exec (org.apache.commons:commons-exec:1.4.0 - https://commons.apache.org/proper/commons-exec/)
+        * Apache Commons Lang (org.apache.commons:commons-lang3:3.14.0 - https://commons.apache.org/proper/commons-lang/)
         * Apache Commons Math (org.apache.commons:commons-math3:3.6.1 - http://commons.apache.org/proper/commons-math/)
-        * Apache Commons Pool (org.apache.commons:commons-pool2:2.11.1 - https://commons.apache.org/proper/commons-pool/)
+        * Apache Commons Pool (org.apache.commons:commons-pool2:2.12.0 - https://commons.apache.org/proper/commons-pool/)
         * Apache Commons Text (org.apache.commons:commons-text:1.10.0 - https://commons.apache.org/proper/commons-text)
         * Curator Client (org.apache.curator:curator-client:2.13.0 - http://curator.apache.org/curator-client)
         * Curator Framework (org.apache.curator:curator-framework:2.13.0 - http://curator.apache.org/curator-framework)
         * Curator Recipes (org.apache.curator:curator-recipes:2.13.0 - http://curator.apache.org/curator-recipes)
-        * Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:3.2.2 - no url defined)
-        * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:3.2.2 - no url defined)
-        * Apache Hadoop Common (org.apache.hadoop:hadoop-common:3.2.2 - no url defined)
-        * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.2.2 - no url defined)
+        * Apache Hadoop Annotations (org.apache.hadoop:hadoop-annotations:3.2.4 - no url defined)
+        * Apache Hadoop Auth (org.apache.hadoop:hadoop-auth:3.2.4 - no url defined)
+        * Apache Hadoop Common (org.apache.hadoop:hadoop-common:3.2.4 - no url defined)
+        * Apache Hadoop HDFS Client (org.apache.hadoop:hadoop-hdfs-client:3.2.4 - no url defined)
         * htrace-core4 (org.apache.htrace:htrace-core4:4.1.0-incubating - http://incubator.apache.org/projects/htrace.html)
-        * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.13 - http://hc.apache.org/httpcomponents-client)
-        * Apache HttpClient Cache (org.apache.httpcomponents:httpclient-cache:4.2.6 - http://hc.apache.org/httpcomponents-client)
-        * Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.15 - http://hc.apache.org/httpcomponents-core-ga)
-        * Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.13 - http://hc.apache.org/httpcomponents-client)
-        * Apache James :: Mime4j :: Core (org.apache.james:apache-mime4j-core:0.8.4 - http://james.apache.org/mime4j/apache-mime4j-core)
-        * Apache James :: Mime4j :: DOM (org.apache.james:apache-mime4j-dom:0.8.4 - http://james.apache.org/mime4j/apache-mime4j-dom)
-        * Apache Jena - Libraries POM (org.apache.jena:apache-jena-libs:2.13.0 - http://jena.apache.org/apache-jena-libs/)
-        * Apache Jena - ARQ (SPARQL 1.1 Query Engine) (org.apache.jena:jena-arq:2.13.0 - http://jena.apache.org/jena-arq/)
-        * Apache Jena - Core (org.apache.jena:jena-core:2.13.0 - http://jena.apache.org/jena-core/)
-        * Apache Jena - IRI (org.apache.jena:jena-iri:1.1.2 - http://jena.apache.org/jena-iri/)
-        * Apache Jena - TDB (Native Triple Store) (org.apache.jena:jena-tdb:1.1.2 - http://jena.apache.org/jena-tdb/)
+        * Apache HttpClient (org.apache.httpcomponents:httpclient:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
+        * Apache HttpClient Cache (org.apache.httpcomponents:httpclient-cache:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
+        * Apache HttpCore (org.apache.httpcomponents:httpcore:4.4.16 - http://hc.apache.org/httpcomponents-core-ga)
+        * Apache HttpClient Mime (org.apache.httpcomponents:httpmime:4.5.14 - http://hc.apache.org/httpcomponents-client-ga)
+        * Apache HttpClient (org.apache.httpcomponents.client5:httpclient5:5.1.3 - https://hc.apache.org/httpcomponents-client-5.0.x/5.1.3/httpclient5/)
+        * Apache HttpClient (org.apache.httpcomponents.client5:httpclient5:5.3.1 - https://hc.apache.org/httpcomponents-client-5.0.x/5.3.1/httpclient5/)
+        * Apache HttpComponents Core HTTP/1.1 (org.apache.httpcomponents.core5:httpcore5:5.1.3 - https://hc.apache.org/httpcomponents-core-5.1.x/5.1.3/httpcore5/)
+        * Apache HttpComponents Core HTTP/1.1 (org.apache.httpcomponents.core5:httpcore5:5.2.4 - https://hc.apache.org/httpcomponents-core-5.2.x/5.2.4/httpcore5/)
+        * Apache HttpComponents Core HTTP/2 (org.apache.httpcomponents.core5:httpcore5-h2:5.1.3 - https://hc.apache.org/httpcomponents-core-5.1.x/5.1.3/httpcore5-h2/)
+        * Apache HttpComponents Core HTTP/2 (org.apache.httpcomponents.core5:httpcore5-h2:5.2.4 - https://hc.apache.org/httpcomponents-core-5.2.x/5.2.4/httpcore5-h2/)
+        * Apache James :: Mime4j :: Core (org.apache.james:apache-mime4j-core:0.8.10 - http://james.apache.org/mime4j/apache-mime4j-core)
+        * Apache James :: Mime4j :: DOM (org.apache.james:apache-mime4j-dom:0.8.11 - http://james.apache.org/mime4j/apache-mime4j-dom)
+        * Apache Jena - Libraries POM (org.apache.jena:apache-jena-libs:4.9.0 - https://jena.apache.org/apache-jena-libs/)
+        * Apache Jena - ARQ (org.apache.jena:jena-arq:4.9.0 - https://jena.apache.org/jena-arq/)
+        * Apache Jena - Base (org.apache.jena:jena-base:4.9.0 - https://jena.apache.org/jena-base/)
+        * Apache Jena - Core (org.apache.jena:jena-core:4.9.0 - https://jena.apache.org/jena-core/)
+        * Apache Jena - DBOE Base (org.apache.jena:jena-dboe-base:4.9.0 - https://jena.apache.org/jena-dboe-base/)
+        * Apache Jena - DBOE Indexes (org.apache.jena:jena-dboe-index:4.9.0 - https://jena.apache.org/jena-dboe-index/)
+        * Apache Jena - DBOE Storage (org.apache.jena:jena-dboe-storage:4.9.0 - https://jena.apache.org/jena-dboe-storage/)
+        * Apache Jena - DBOE Transactional Datastructures (org.apache.jena:jena-dboe-trans-data:4.9.0 - https://jena.apache.org/jena-dboe-trans-data/)
+        * Apache Jena - DBOE Transactions (org.apache.jena:jena-dboe-transaction:4.9.0 - https://jena.apache.org/jena-dboe-transaction/)
+        * Apache Jena - IRI (org.apache.jena:jena-iri:4.9.0 - https://jena.apache.org/jena-iri/)
+        * Apache Jena - RDF Connection (org.apache.jena:jena-rdfconnection:4.9.0 - https://jena.apache.org/jena-rdfconnection/)
+        * Apache Jena - RDF Patch (org.apache.jena:jena-rdfpatch:4.9.0 - https://jena.apache.org/jena-rdfpatch/)
+        * Apache Jena - SHACL (org.apache.jena:jena-shacl:4.9.0 - https://jena.apache.org/jena-shacl/)
+        * Apache Jena - ShEx (org.apache.jena:jena-shex:4.9.0 - https://jena.apache.org/jena-shex/)
+        * Apache Jena - TDB1 (Native Triple Store) (org.apache.jena:jena-tdb:4.9.0 - https://jena.apache.org/jena-tdb/)
+        * Apache Jena - TDB2 (Native Triple Store) (org.apache.jena:jena-tdb2:4.9.0 - https://jena.apache.org/jena-tdb2/)
         * Kerby-kerb core (org.apache.kerby:kerb-core:1.0.1 - http://directory.apache.org/kerby/kerby-kerb/kerb-core)
         * Kerby-kerb Util (org.apache.kerby:kerb-util:1.0.1 - http://directory.apache.org/kerby/kerby-kerb/kerb-util)
         * Kerby ASN1 Project (org.apache.kerby:kerby-asn1:1.0.1 - http://directory.apache.org/kerby/kerby-common/kerby-asn1)
         * Kerby PKIX Project (org.apache.kerby:kerby-pkix:1.0.1 - http://directory.apache.org/kerby/kerby-pkix)
-        * Apache Log4j 1.x Compatibility API (org.apache.logging.log4j:log4j-1.2-api:2.20.0 - https://logging.apache.org/log4j/2.x/log4j-1.2-api/)
-        * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.20.0 - https://logging.apache.org/log4j/2.x/log4j-api/)
-        * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.20.0 - https://logging.apache.org/log4j/2.x/log4j-core/)
-        * Apache Log4j JUL Adapter (org.apache.logging.log4j:log4j-jul:2.20.0 - https://logging.apache.org/log4j/2.x/log4j-jul/)
-        * Apache Log4j Layout for JSON template (org.apache.logging.log4j:log4j-layout-template-json:2.17.1 - https://logging.apache.org/log4j/2.x/log4j-layout-template-json/)
-        * Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.20.0 - https://logging.apache.org/log4j/2.x/log4j-slf4j-impl/)
-        * Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.20.0 - https://logging.apache.org/log4j/2.x/log4j-web/)
-        * Lucene Common Analyzers (org.apache.lucene:lucene-analyzers-common:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-common)
-        * Lucene ICU Analysis Components (org.apache.lucene:lucene-analyzers-icu:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-icu)
-        * Lucene Kuromoji Japanese Morphological Analyzer (org.apache.lucene:lucene-analyzers-kuromoji:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-kuromoji)
-        * Lucene Nori Korean Morphological Analyzer (org.apache.lucene:lucene-analyzers-nori:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-nori)
-        * Lucene Phonetic Filters (org.apache.lucene:lucene-analyzers-phonetic:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-phonetic)
-        * Lucene Smart Chinese Analyzer (org.apache.lucene:lucene-analyzers-smartcn:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-smartcn)
-        * Lucene Stempel Analyzer (org.apache.lucene:lucene-analyzers-stempel:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-analyzers-stempel)
-        * Lucene Memory (org.apache.lucene:lucene-backward-codecs:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-backward-codecs)
-        * Lucene Classification (org.apache.lucene:lucene-classification:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-classification)
-        * Lucene codecs (org.apache.lucene:lucene-codecs:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-codecs)
-        * Lucene Core (org.apache.lucene:lucene-core:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-core)
-        * Lucene Expressions (org.apache.lucene:lucene-expressions:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-expressions)
-        * Lucene Grouping (org.apache.lucene:lucene-grouping:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-grouping)
-        * Lucene Highlighter (org.apache.lucene:lucene-highlighter:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-highlighter)
-        * Lucene Join (org.apache.lucene:lucene-join:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-join)
-        * Lucene Memory (org.apache.lucene:lucene-memory:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-memory)
-        * Lucene Miscellaneous (org.apache.lucene:lucene-misc:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-misc)
-        * Lucene Queries (org.apache.lucene:lucene-queries:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-queries)
-        * Lucene QueryParsers (org.apache.lucene:lucene-queryparser:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-queryparser)
-        * Lucene Sandbox (org.apache.lucene:lucene-sandbox:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-sandbox)
-        * Lucene Spatial Extras (org.apache.lucene:lucene-spatial-extras:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-spatial-extras)
-        * Lucene Spatial 3D (org.apache.lucene:lucene-spatial3d:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-spatial3d)
-        * Lucene Suggest (org.apache.lucene:lucene-suggest:8.11.2 - https://lucene.apache.org/lucene-parent/lucene-suggest)
-        * Apache FontBox (org.apache.pdfbox:fontbox:2.0.28 - http://pdfbox.apache.org/)
+        * Apache Log4j 1.x Compatibility API (org.apache.logging.log4j:log4j-1.2-api:2.23.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-1.2-api/)
+        * Apache Log4j API (org.apache.logging.log4j:log4j-api:2.23.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-api/)
+        * Apache Log4j Core (org.apache.logging.log4j:log4j-core:2.23.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-core/)
+        * Apache Log4j JUL Adapter (org.apache.logging.log4j:log4j-jul:2.23.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-jul/)
+        * Apache Log4j Layout for JSON template (org.apache.logging.log4j:log4j-layout-template-json:2.17.2 - https://logging.apache.org/log4j/2.x/log4j-layout-template-json/)
+        * Apache Log4j SLF4J Binding (org.apache.logging.log4j:log4j-slf4j-impl:2.23.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j-impl/)
+        * Apache Log4j SLF4J 2.0 Binding (org.apache.logging.log4j:log4j-slf4j2-impl:2.21.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-slf4j2-impl/)
+        * Apache Log4j Web (org.apache.logging.log4j:log4j-web:2.23.1 - https://logging.apache.org/log4j/2.x/log4j/log4j-web/)
+        * Lucene Common Analyzers (org.apache.lucene:lucene-analyzers-common:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-common)
+        * Lucene ICU Analysis Components (org.apache.lucene:lucene-analyzers-icu:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-icu)
+        * Lucene Kuromoji Japanese Morphological Analyzer (org.apache.lucene:lucene-analyzers-kuromoji:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-kuromoji)
+        * Lucene Nori Korean Morphological Analyzer (org.apache.lucene:lucene-analyzers-nori:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-nori)
+        * Lucene Phonetic Filters (org.apache.lucene:lucene-analyzers-phonetic:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-phonetic)
+        * Lucene Smart Chinese Analyzer (org.apache.lucene:lucene-analyzers-smartcn:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-smartcn)
+        * Lucene Stempel Analyzer (org.apache.lucene:lucene-analyzers-stempel:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-analyzers-stempel)
+        * Lucene Memory (org.apache.lucene:lucene-backward-codecs:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-backward-codecs)
+        * Lucene Classification (org.apache.lucene:lucene-classification:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-classification)
+        * Lucene codecs (org.apache.lucene:lucene-codecs:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-codecs)
+        * Lucene Core (org.apache.lucene:lucene-core:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-core)
+        * Lucene Expressions (org.apache.lucene:lucene-expressions:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-expressions)
+        * Lucene Grouping (org.apache.lucene:lucene-grouping:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-grouping)
+        * Lucene Highlighter (org.apache.lucene:lucene-highlighter:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-highlighter)
+        * Lucene Join (org.apache.lucene:lucene-join:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-join)
+        * Lucene Memory (org.apache.lucene:lucene-memory:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-memory)
+        * Lucene Miscellaneous (org.apache.lucene:lucene-misc:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-misc)
+        * Lucene Queries (org.apache.lucene:lucene-queries:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-queries)
+        * Lucene QueryParsers (org.apache.lucene:lucene-queryparser:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-queryparser)
+        * Lucene Sandbox (org.apache.lucene:lucene-sandbox:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-sandbox)
+        * Lucene Spatial Extras (org.apache.lucene:lucene-spatial-extras:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-spatial-extras)
+        * Lucene Spatial 3D (org.apache.lucene:lucene-spatial3d:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-spatial3d)
+        * Lucene Suggest (org.apache.lucene:lucene-suggest:8.11.3 - https://lucene.apache.org/lucene-parent/lucene-suggest)
+        * Apache FontBox (org.apache.pdfbox:fontbox:2.0.31 - http://pdfbox.apache.org/)
         * PDFBox JBIG2 ImageIO plugin (org.apache.pdfbox:jbig2-imageio:3.0.4 - https://www.apache.org/jbig2-imageio/)
         * Apache JempBox (org.apache.pdfbox:jempbox:1.8.17 - http://www.apache.org/pdfbox-parent/jempbox/)
-        * Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.28 - https://www.apache.org/pdfbox-parent/pdfbox/)
-        * Apache PDFBox tools (org.apache.pdfbox:pdfbox-tools:2.0.27 - https://www.apache.org/pdfbox-parent/pdfbox-tools/)
-        * Apache XmpBox (org.apache.pdfbox:xmpbox:2.0.27 - https://www.apache.org/pdfbox-parent/xmpbox/)
-        * Apache POI - Common (org.apache.poi:poi:5.2.3 - https://poi.apache.org/)
-        * Apache POI - API based on OPC and OOXML schemas (org.apache.poi:poi-ooxml:5.2.3 - https://poi.apache.org/)
-        * Apache POI (org.apache.poi:poi-ooxml-lite:5.2.3 - https://poi.apache.org/)
-        * Apache POI (org.apache.poi:poi-scratchpad:5.2.3 - https://poi.apache.org/)
-        * Apache Solr Core (org.apache.solr:solr-core:8.11.2 - https://lucene.apache.org/solr-parent/solr-core)
-        * Apache Solr Solrj (org.apache.solr:solr-solrj:8.11.2 - https://lucene.apache.org/solr-parent/solr-solrj)
+        * Apache PDFBox (org.apache.pdfbox:pdfbox:2.0.31 - https://www.apache.org/pdfbox-parent/pdfbox/)
+        * Apache PDFBox tools (org.apache.pdfbox:pdfbox-tools:2.0.31 - https://www.apache.org/pdfbox-parent/pdfbox-tools/)
+        * Apache XmpBox (org.apache.pdfbox:xmpbox:2.0.31 - https://www.apache.org/pdfbox-parent/xmpbox/)
+        * Apache POI - Common (org.apache.poi:poi:5.2.5 - https://poi.apache.org/)
+        * Apache POI - API based on OPC and OOXML schemas (org.apache.poi:poi-ooxml:5.2.5 - https://poi.apache.org/)
+        * Apache POI (org.apache.poi:poi-ooxml-lite:5.2.5 - https://poi.apache.org/)
+        * Apache POI (org.apache.poi:poi-scratchpad:5.2.5 - https://poi.apache.org/)
+        * Apache Solr Core (org.apache.solr:solr-core:8.11.3 - https://lucene.apache.org/solr-parent/solr-core)
+        * Apache Solr Solrj (org.apache.solr:solr-solrj:8.11.3 - https://lucene.apache.org/solr-parent/solr-solrj)
         * Apache Standard Taglib Implementation (org.apache.taglibs:taglibs-standard-impl:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-impl)
         * Apache Standard Taglib Specification API (org.apache.taglibs:taglibs-standard-spec:1.2.5 - http://tomcat.apache.org/taglibs/standard-1.2.5/taglibs-standard-spec)
-        * Apache Thrift (org.apache.thrift:libthrift:0.9.2 - http://thrift.apache.org)
-        * Apache Tika core (org.apache.tika:tika-core:2.5.0 - https://tika.apache.org/)
-        * Apache Tika Apple parser module (org.apache.tika:tika-parser-apple-module:2.5.0 - https://tika.apache.org/tika-parser-apple-module/)
-        * Apache Tika audiovideo parser module (org.apache.tika:tika-parser-audiovideo-module:2.5.0 - https://tika.apache.org/tika-parser-audiovideo-module/)
-        * Apache Tika cad parser module (org.apache.tika:tika-parser-cad-module:2.5.0 - https://tika.apache.org/tika-parser-cad-module/)
-        * Apache Tika code parser module (org.apache.tika:tika-parser-code-module:2.5.0 - https://tika.apache.org/tika-parser-code-module/)
-        * Apache Tika crypto parser module (org.apache.tika:tika-parser-crypto-module:2.5.0 - https://tika.apache.org/tika-parser-crypto-module/)
-        * Apache Tika digest commons (org.apache.tika:tika-parser-digest-commons:2.5.0 - https://tika.apache.org/tika-parser-digest-commons/)
-        * Apache Tika font parser module (org.apache.tika:tika-parser-font-module:2.5.0 - https://tika.apache.org/tika-parser-font-module/)
-        * Apache Tika html parser module (org.apache.tika:tika-parser-html-module:2.5.0 - https://tika.apache.org/tika-parser-html-module/)
-        * Apache Tika image parser module (org.apache.tika:tika-parser-image-module:2.5.0 - https://tika.apache.org/tika-parser-image-module/)
-        * Apache Tika mail commons (org.apache.tika:tika-parser-mail-commons:2.5.0 - https://tika.apache.org/tika-parser-mail-commons/)
-        * Apache Tika mail parser module (org.apache.tika:tika-parser-mail-module:2.5.0 - https://tika.apache.org/tika-parser-mail-module/)
-        * Apache Tika Microsoft parser module (org.apache.tika:tika-parser-microsoft-module:2.5.0 - https://tika.apache.org/tika-parser-microsoft-module/)
-        * Apache Tika miscellaneous office format parser module (org.apache.tika:tika-parser-miscoffice-module:2.5.0 - https://tika.apache.org/tika-parser-miscoffice-module/)
-        * Apache Tika news parser module (org.apache.tika:tika-parser-news-module:2.5.0 - https://tika.apache.org/tika-parser-news-module/)
-        * Apache Tika OCR parser module (org.apache.tika:tika-parser-ocr-module:2.5.0 - https://tika.apache.org/tika-parser-ocr-module/)
-        * Apache Tika PDF parser module (org.apache.tika:tika-parser-pdf-module:2.5.0 - https://tika.apache.org/tika-parser-pdf-module/)
-        * Apache Tika package parser module (org.apache.tika:tika-parser-pkg-module:2.5.0 - https://tika.apache.org/tika-parser-pkg-module/)
-        * Apache Tika text parser module (org.apache.tika:tika-parser-text-module:2.5.0 - https://tika.apache.org/tika-parser-text-module/)
-        * Apache Tika WARC parser module (org.apache.tika:tika-parser-webarchive-module:2.5.0 - https://tika.apache.org/tika-parser-webarchive-module/)
-        * Apache Tika XML parser module (org.apache.tika:tika-parser-xml-module:2.5.0 - https://tika.apache.org/tika-parser-xml-module/)
-        * Apache Tika XMP commons (org.apache.tika:tika-parser-xmp-commons:2.5.0 - https://tika.apache.org/tika-parser-xmp-commons/)
-        * Apache Tika ZIP commons (org.apache.tika:tika-parser-zip-commons:2.5.0 - https://tika.apache.org/tika-parser-zip-commons/)
-        * Apache Tika standard parser package (org.apache.tika:tika-parsers-standard-package:2.5.0 - https://tika.apache.org/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/)
-        * tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:9.0.75 - https://tomcat.apache.org/)
-        * tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:9.0.75 - https://tomcat.apache.org/)
-        * tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:9.0.75 - https://tomcat.apache.org/)
+        * Apache Thrift (org.apache.thrift:libthrift:0.18.1 - http://thrift.apache.org)
+        * Apache Tika core (org.apache.tika:tika-core:2.9.2 - https://tika.apache.org/)
+        * Apache Tika Apple parser module (org.apache.tika:tika-parser-apple-module:2.9.2 - https://tika.apache.org/tika-parser-apple-module/)
+        * Apache Tika audiovideo parser module (org.apache.tika:tika-parser-audiovideo-module:2.9.2 - https://tika.apache.org/tika-parser-audiovideo-module/)
+        * Apache Tika cad parser module (org.apache.tika:tika-parser-cad-module:2.9.2 - https://tika.apache.org/tika-parser-cad-module/)
+        * Apache Tika code parser module (org.apache.tika:tika-parser-code-module:2.9.2 - https://tika.apache.org/tika-parser-code-module/)
+        * Apache Tika crypto parser module (org.apache.tika:tika-parser-crypto-module:2.9.2 - https://tika.apache.org/tika-parser-crypto-module/)
+        * Apache Tika digest commons (org.apache.tika:tika-parser-digest-commons:2.9.2 - https://tika.apache.org/tika-parser-digest-commons/)
+        * Apache Tika font parser module (org.apache.tika:tika-parser-font-module:2.9.2 - https://tika.apache.org/tika-parser-font-module/)
+        * Apache Tika html parser module (org.apache.tika:tika-parser-html-module:2.9.2 - https://tika.apache.org/tika-parser-html-module/)
+        * Apache Tika image parser module (org.apache.tika:tika-parser-image-module:2.9.2 - https://tika.apache.org/tika-parser-image-module/)
+        * Apache Tika mail commons (org.apache.tika:tika-parser-mail-commons:2.9.2 - https://tika.apache.org/tika-parser-mail-commons/)
+        * Apache Tika mail parser module (org.apache.tika:tika-parser-mail-module:2.9.2 - https://tika.apache.org/tika-parser-mail-module/)
+        * Apache Tika Microsoft parser module (org.apache.tika:tika-parser-microsoft-module:2.9.2 - https://tika.apache.org/tika-parser-microsoft-module/)
+        * Apache Tika miscellaneous office format parser module (org.apache.tika:tika-parser-miscoffice-module:2.9.2 - https://tika.apache.org/tika-parser-miscoffice-module/)
+        * Apache Tika news parser module (org.apache.tika:tika-parser-news-module:2.9.2 - https://tika.apache.org/tika-parser-news-module/)
+        * Apache Tika OCR parser module (org.apache.tika:tika-parser-ocr-module:2.9.2 - https://tika.apache.org/tika-parser-ocr-module/)
+        * Apache Tika PDF parser module (org.apache.tika:tika-parser-pdf-module:2.9.2 - https://tika.apache.org/tika-parser-pdf-module/)
+        * Apache Tika package parser module (org.apache.tika:tika-parser-pkg-module:2.9.2 - https://tika.apache.org/tika-parser-pkg-module/)
+        * Apache Tika text parser module (org.apache.tika:tika-parser-text-module:2.9.2 - https://tika.apache.org/tika-parser-text-module/)
+        * Apache Tika WARC parser module (org.apache.tika:tika-parser-webarchive-module:2.9.2 - https://tika.apache.org/tika-parser-webarchive-module/)
+        * Apache Tika XML parser module (org.apache.tika:tika-parser-xml-module:2.9.2 - https://tika.apache.org/tika-parser-xml-module/)
+        * Apache Tika XMP commons (org.apache.tika:tika-parser-xmp-commons:2.9.2 - https://tika.apache.org/tika-parser-xmp-commons/)
+        * Apache Tika ZIP commons (org.apache.tika:tika-parser-zip-commons:2.9.2 - https://tika.apache.org/tika-parser-zip-commons/)
+        * Apache Tika standard parser package (org.apache.tika:tika-parsers-standard-package:2.9.2 - https://tika.apache.org/tika-parsers/tika-parsers-standard/tika-parsers-standard-package/)
+        * tomcat-embed-core (org.apache.tomcat.embed:tomcat-embed-core:10.1.24 - https://tomcat.apache.org/)
+        * tomcat-embed-el (org.apache.tomcat.embed:tomcat-embed-el:10.1.24 - https://tomcat.apache.org/)
+        * tomcat-embed-websocket (org.apache.tomcat.embed:tomcat-embed-websocket:10.1.24 - https://tomcat.apache.org/)
         * Apache Velocity - Engine (org.apache.velocity:velocity-engine-core:2.3 - http://velocity.apache.org/engine/devel/velocity-engine-core/)
         * Apache Velocity - JSR 223 Scripting (org.apache.velocity:velocity-engine-scripting:2.2 - http://velocity.apache.org/engine/devel/velocity-engine-scripting/)
-        * Axiom API (org.apache.ws.commons.axiom:axiom-api:1.2.22 - http://ws.apache.org/axiom/)
-        * Abdera Model (FOM) Implementation (org.apache.ws.commons.axiom:fom-impl:1.2.22 - http://ws.apache.org/axiom/implementations/fom-impl/)
-        * XmlBeans (org.apache.xmlbeans:xmlbeans:5.1.1 - https://xmlbeans.apache.org/)
+        * Axiom API (org.apache.ws.commons.axiom:axiom-api:1.2.14 - http://ws.apache.org/axiom/)
+        * Axiom Impl (org.apache.ws.commons.axiom:axiom-impl:1.2.14 - http://ws.apache.org/axiom/)
+        * XmlBeans (org.apache.xmlbeans:xmlbeans:5.2.0 - https://xmlbeans.apache.org/)
         * Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.6.2 - http://zookeeper.apache.org/zookeeper)
         * Apache ZooKeeper - Jute (org.apache.zookeeper:zookeeper-jute:3.6.2 - http://zookeeper.apache.org/zookeeper-jute)
-        * org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.0 - https://github.com/apiguardian-team/apiguardian)
-        * AssertJ fluent assertions (org.assertj:assertj-core:3.22.0 - https://assertj.github.io/doc/assertj-core/)
+        * org.apiguardian:apiguardian-api (org.apiguardian:apiguardian-api:1.1.2 - https://github.com/apiguardian-team/apiguardian)
+        * AssertJ Core (org.assertj:assertj-core:3.24.2 - https://assertj.github.io/doc/#assertj-core)
         * Evo Inflector (org.atteo:evo-inflector:1.3 - http://atteo.org/static/evo-inflector)
+        * Awaitility (org.awaitility:awaitility:4.2.1 - http://awaitility.org)
         * jose4j (org.bitbucket.b_c:jose4j:0.6.5 - https://bitbucket.org/b_c/jose4j/)
         * TagSoup (org.ccil.cowan.tagsoup:tagsoup:1.2.1 - http://home.ccil.org/~cowan/XML/tagsoup/)
+        * Woodstox (org.codehaus.woodstox:wstx-asl:3.2.6 - http://woodstox.codehaus.org)
         * jems (org.dmfs:jems:1.18 - https://github.com/dmfs/jems)
         * rfc3986-uri (org.dmfs:rfc3986-uri:0.8.1 - https://github.com/dmfs/uri-toolkit)
         * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.15.v20190215 - http://tomcat.apache.org/taglibs/standard/)
-        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
-        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
+        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
         * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-client)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-deploy)
-        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-http)
-        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-io)
-        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-jmx)
+        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.15.v20190215 - http://www.eclipse.org/jetty)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation)
+        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-deploy)
+        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-http)
+        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-io)
+        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-jmx)
         * Jetty :: JNDI Naming (org.eclipse.jetty:jetty-jndi:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-rewrite)
-        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-security)
-        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-security)
-        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-server)
-        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-servlet)
-        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-servlets)
-        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-util)
-        * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-util-ajax)
-        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-webapp)
-        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-xml)
-        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-client)
-        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.51.v20230217 - https://eclipse.org/jetty/http2-parent/http2-common)
-        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-hpack)
-        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
-        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.51.v20230217 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-rewrite)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-server)
+        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-servlet)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.15.v20190215 - http://www.eclipse.org/jetty)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-servlets)
+        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-util)
+        * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-util-ajax)
+        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-webapp)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-xml)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-xml)
+        * Jetty :: ALPN :: API (org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715 - http://www.eclipse.org/jetty/alpn-api)
+        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-client)
+        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.54.v20240208 - https://eclipse.org/jetty/http2-parent/http2-common)
+        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-hpack)
+        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.15.v20190215 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-server)
         * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas)
-        * Ehcache (org.ehcache:ehcache:3.4.0 - http://ehcache.org)
-        * flyway-core (org.flywaydb:flyway-core:8.4.4 - https://flywaydb.org/flyway-core)
+        * Ehcache (org.ehcache:ehcache:3.10.8 - http://ehcache.org)
+        * flyway-core (org.flywaydb:flyway-core:10.10.0 - https://flywaydb.org/flyway-core)
+        * flyway-database-postgresql (org.flywaydb:flyway-database-postgresql:10.10.0 - https://flywaydb.org/flyway-database-postgresql)
         * Ogg and Vorbis for Java, Core (org.gagravarr:vorbis-java-core:0.8 - https://github.com/Gagravarr/VorbisJava)
         * Apache Tika plugin for Ogg, Vorbis and FLAC (org.gagravarr:vorbis-java-tika:0.8 - https://github.com/Gagravarr/VorbisJava)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:6.2.5.Final - http://hibernate.org/validator/hibernate-validator)
-        * Hibernate Validator Portable Extension (org.hibernate.validator:hibernate-validator-cdi:6.2.5.Final - http://hibernate.org/validator/hibernate-validator-cdi)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * Hibernate Validator Engine (org.hibernate.validator:hibernate-validator:8.0.1.Final - http://hibernate.org/validator/hibernate-validator)
+        * Hibernate Validator Portable Extension (org.hibernate.validator:hibernate-validator-cdi:8.0.1.Final - http://hibernate.org/validator/hibernate-validator-cdi)
+        * org.immutables.value-annotations (org.immutables:value-annotations:2.9.2 - http://immutables.org/value-annotations)
         * leveldb (org.iq80.leveldb:leveldb:0.12 - http://github.com/dain/leveldb/leveldb)
         * leveldb-api (org.iq80.leveldb:leveldb-api:0.12 - http://github.com/dain/leveldb/leveldb-api)
-        * Javassist (org.javassist:javassist:3.25.0-GA - http://www.javassist.org/)
-        * Java Annotation Indexer (org.jboss:jandex:2.4.2.Final - http://www.jboss.org/jandex)
+        * Javassist (org.javassist:javassist:3.29.2-GA - http://www.javassist.org/)
         * JBoss Logging 3 (org.jboss.logging:jboss-logging:3.4.3.Final - http://www.jboss.org)
         * JDOM (org.jdom:jdom2:2.0.6.1 - http://www.jdom.org)
         * jtwig-core (org.jtwig:jtwig-core:5.87.0.RELEASE - http://jtwig.org)
@@ -335,115 +380,108 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * jtwig-spring (org.jtwig:jtwig-spring:5.87.0.RELEASE - http://jtwig.org)
         * jtwig-spring-boot-starter (org.jtwig:jtwig-spring-boot-starter:5.87.0.RELEASE - http://jtwig.org)
         * jtwig-web (org.jtwig:jtwig-web:5.87.0.RELEASE - http://jtwig.org)
+        * Proj4J (org.locationtech.proj4j:proj4j:1.1.5 - https://github.com/locationtech/proj4j)
         * Spatial4J (org.locationtech.spatial4j:spatial4j:0.7 - https://projects.eclipse.org/projects/locationtech.spatial4j)
         * MockServer Java Client (org.mock-server:mockserver-client-java:5.11.2 - http://www.mock-server.com)
         * MockServer Core (org.mock-server:mockserver-core:5.11.2 - http://www.mock-server.com)
         * MockServer JUnit 4 Integration (org.mock-server:mockserver-junit-rule:5.11.2 - http://www.mock-server.com)
         * MockServer & Proxy Netty (org.mock-server:mockserver-netty:5.11.2 - http://www.mock-server.com)
-        * MortBay :: Apache EL :: API and Implementation (org.mortbay.jasper:apache-el:8.5.35.1 - https://github.com/jetty-project/jasper-jsp/apache-el)
-        * MortBay :: Apache Jasper :: JSP Implementation (org.mortbay.jasper:apache-jsp:8.5.35.1 - https://github.com/jetty-project/jasper-jsp/apache-jsp)
         * Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
         * Jetty Servlet Tester (org.mortbay.jetty:jetty-servlet-tester:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-servlet-tester)
         * Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
         * Servlet Specification API (org.mortbay.jetty:servlet-api:2.5-20081211 - http://jetty.mortbay.org/servlet-api)
-        * jwarc (org.netpreserve:jwarc:0.19.0 - https://github.com/iipc/jwarc)
+        * jwarc (org.netpreserve:jwarc:0.29.0 - https://github.com/iipc/jwarc)
         * Objenesis (org.objenesis:objenesis:3.2 - http://objenesis.org/objenesis)
         * parboiled-core (org.parboiled:parboiled-core:1.3.1 - http://parboiled.org)
         * parboiled-java (org.parboiled:parboiled-java:1.3.1 - http://parboiled.org)
+        * org.roaringbitmap:RoaringBitmap (org.roaringbitmap:RoaringBitmap:0.9.45 - https://github.com/RoaringBitmap/RoaringBitmap)
+        * org.roaringbitmap:shims (org.roaringbitmap:shims:0.9.45 - https://github.com/RoaringBitmap/RoaringBitmap)
         * RRD4J (org.rrd4j:rrd4j:3.5 - https://github.com/rrd4j/rrd4j/)
-        * Scala Library (org.scala-lang:scala-library:2.13.9 - https://www.scala-lang.org/)
+        * Scala Library (org.scala-lang:scala-library:2.13.11 - https://www.scala-lang.org/)
         * Scala Compiler (org.scala-lang:scala-reflect:2.13.0 - https://www.scala-lang.org/)
         * scala-collection-compat (org.scala-lang.modules:scala-collection-compat_2.13:2.1.6 - http://www.scala-lang.org/)
         * scala-java8-compat (org.scala-lang.modules:scala-java8-compat_2.13:0.9.0 - http://www.scala-lang.org/)
         * scala-parser-combinators (org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2 - http://www.scala-lang.org/)
         * scala-xml (org.scala-lang.modules:scala-xml_2.13:1.3.0 - http://www.scala-lang.org/)
         * JSONassert (org.skyscreamer:jsonassert:1.5.1 - https://github.com/skyscreamer/JSONassert)
-        * JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:1.7.36 - http://www.slf4j.org)
-        * Spring AOP (org.springframework:spring-aop:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Beans (org.springframework:spring-beans:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Context (org.springframework:spring-context:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Context Support (org.springframework:spring-context-support:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Core (org.springframework:spring-core:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Expression Language (SpEL) (org.springframework:spring-expression:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Commons Logging Bridge (org.springframework:spring-jcl:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring JDBC (org.springframework:spring-jdbc:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Object/Relational Mapping (org.springframework:spring-orm:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring TestContext Framework (org.springframework:spring-test:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Transaction (org.springframework:spring-tx:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Web (org.springframework:spring-web:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * Spring Web MVC (org.springframework:spring-webmvc:5.3.27 - https://github.com/spring-projects/spring-framework)
-        * spring-boot (org.springframework.boot:spring-boot:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-actuator (org.springframework.boot:spring-boot-actuator:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-actuator-autoconfigure (org.springframework.boot:spring-boot-actuator-autoconfigure:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:2.7.12 - https://spring.io/projects/spring-boot)
+        * JCL 1.2 implemented over SLF4J (org.slf4j:jcl-over-slf4j:2.0.11 - http://www.slf4j.org)
+        * Spring AOP (org.springframework:spring-aop:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Beans (org.springframework:spring-beans:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Context (org.springframework:spring-context:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Context Support (org.springframework:spring-context-support:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Core (org.springframework:spring-core:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Expression Language (SpEL) (org.springframework:spring-expression:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Commons Logging Bridge (org.springframework:spring-jcl:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring JDBC (org.springframework:spring-jdbc:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Object/Relational Mapping (org.springframework:spring-orm:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring TestContext Framework (org.springframework:spring-test:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Transaction (org.springframework:spring-tx:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Web (org.springframework:spring-web:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * Spring Web MVC (org.springframework:spring-webmvc:6.1.8 - https://github.com/spring-projects/spring-framework)
+        * spring-boot (org.springframework.boot:spring-boot:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-actuator (org.springframework.boot:spring-boot-actuator:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-actuator-autoconfigure (org.springframework.boot:spring-boot-actuator-autoconfigure:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-autoconfigure (org.springframework.boot:spring-boot-autoconfigure:3.2.6 - https://spring.io/projects/spring-boot)
         * Spring Boot Configuration Processor (org.springframework.boot:spring-boot-configuration-processor:2.0.0.RELEASE - https://projects.spring.io/spring-boot/#/spring-boot-parent/spring-boot-tools/spring-boot-configuration-processor)
-        * spring-boot-starter (org.springframework.boot:spring-boot-starter:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-aop (org.springframework.boot:spring-boot-starter-aop:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-cache (org.springframework.boot:spring-boot-starter-cache:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-data-rest (org.springframework.boot:spring-boot-starter-data-rest:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-log4j2 (org.springframework.boot:spring-boot-starter-log4j2:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-test (org.springframework.boot:spring-boot-test:2.7.12 - https://spring.io/projects/spring-boot)
-        * spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:2.7.12 - https://spring.io/projects/spring-boot)
-        * Spring Data Core (org.springframework.data:spring-data-commons:2.7.12 - https://www.spring.io/spring-data/spring-data-commons)
-        * Spring Data REST - Core (org.springframework.data:spring-data-rest-core:3.7.12 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-core)
-        * Spring Data REST - WebMVC (org.springframework.data:spring-data-rest-webmvc:3.7.12 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-webmvc)
-        * Spring HATEOAS (org.springframework.hateoas:spring-hateoas:1.5.4 - https://github.com/spring-projects/spring-hateoas)
-        * Spring Plugin - Core (org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE - https://github.com/spring-projects/spring-plugin/spring-plugin-core)
-        * spring-security-config (org.springframework.security:spring-security-config:5.7.8 - https://spring.io/projects/spring-security)
-        * spring-security-core (org.springframework.security:spring-security-core:5.7.8 - https://spring.io/projects/spring-security)
-        * spring-security-crypto (org.springframework.security:spring-security-crypto:5.7.8 - https://spring.io/projects/spring-security)
-        * spring-security-test (org.springframework.security:spring-security-test:5.7.8 - https://spring.io/projects/spring-security)
-        * spring-security-web (org.springframework.security:spring-security-web:5.7.8 - https://spring.io/projects/spring-security)
-        * SWORD v2 :: Common Server Library (org.swordapp:sword2-server:1.0 - http://www.swordapp.org/)
-        * snappy-java (org.xerial.snappy:snappy-java:1.1.7.6 - https://github.com/xerial/snappy-java)
+        * spring-boot-starter (org.springframework.boot:spring-boot-starter:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-actuator (org.springframework.boot:spring-boot-starter-actuator:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-aop (org.springframework.boot:spring-boot-starter-aop:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-cache (org.springframework.boot:spring-boot-starter-cache:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-data-rest (org.springframework.boot:spring-boot-starter-data-rest:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-json (org.springframework.boot:spring-boot-starter-json:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-log4j2 (org.springframework.boot:spring-boot-starter-log4j2:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-security (org.springframework.boot:spring-boot-starter-security:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-test (org.springframework.boot:spring-boot-starter-test:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-tomcat (org.springframework.boot:spring-boot-starter-tomcat:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-starter-web (org.springframework.boot:spring-boot-starter-web:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-test (org.springframework.boot:spring-boot-test:3.2.6 - https://spring.io/projects/spring-boot)
+        * spring-boot-test-autoconfigure (org.springframework.boot:spring-boot-test-autoconfigure:3.2.6 - https://spring.io/projects/spring-boot)
+        * Spring Data Core (org.springframework.data:spring-data-commons:3.2.6 - https://spring.io/projects/spring-data)
+        * Spring Data REST - Core (org.springframework.data:spring-data-rest-core:4.2.6 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-core)
+        * Spring Data REST - WebMVC (org.springframework.data:spring-data-rest-webmvc:4.2.6 - https://www.spring.io/spring-data/spring-data-rest-parent/spring-data-rest-webmvc)
+        * Spring HATEOAS (org.springframework.hateoas:spring-hateoas:2.2.2 - https://github.com/spring-projects/spring-hateoas)
+        * Spring Plugin - Core (org.springframework.plugin:spring-plugin-core:3.0.0 - https://github.com/spring-projects/spring-plugin/spring-plugin-core)
+        * spring-security-config (org.springframework.security:spring-security-config:6.2.4 - https://spring.io/projects/spring-security)
+        * spring-security-core (org.springframework.security:spring-security-core:6.2.4 - https://spring.io/projects/spring-security)
+        * spring-security-crypto (org.springframework.security:spring-security-crypto:6.2.4 - https://spring.io/projects/spring-security)
+        * spring-security-test (org.springframework.security:spring-security-test:6.2.4 - https://spring.io/projects/spring-security)
+        * spring-security-web (org.springframework.security:spring-security-web:6.2.4 - https://spring.io/projects/spring-security)
+        * snappy-java (org.xerial.snappy:snappy-java:1.1.10.1 - https://github.com/xerial/snappy-java)
         * xml-matchers (org.xmlmatchers:xml-matchers:0.10 - http://code.google.com/p/xml-matchers/)
-        * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.8.0 - https://www.xmlunit.org/)
+        * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.10.0 - https://www.xmlunit.org/)
         * org.xmlunit:xmlunit-core (org.xmlunit:xmlunit-core:2.9.1 - https://www.xmlunit.org/)
         * org.xmlunit:xmlunit-placeholders (org.xmlunit:xmlunit-placeholders:2.8.0 - https://www.xmlunit.org/xmlunit-placeholders/)
-        * SnakeYAML (org.yaml:snakeyaml:1.30 - https://bitbucket.org/snakeyaml/snakeyaml)
+        * SnakeYAML (org.yaml:snakeyaml:2.2 - https://bitbucket.org/snakeyaml/snakeyaml)
         * software.amazon.ion:ion-java (software.amazon.ion:ion-java:1.0.2 - https://github.com/amznlabs/ion-java/)
-        * Xalan Java Serializer (xalan:serializer:2.7.2 - http://xml.apache.org/xalan-j/)
-        * xalan (xalan:xalan:2.7.0 - no url defined)
-        * Xalan Java (xalan:xalan:2.7.2 - http://xml.apache.org/xalan-j/)
         * Xerces2-j (xerces:xercesImpl:2.12.2 - https://xerces.apache.org/xerces2-j/)
-        * XML Commons External Components XML APIs (xml-apis:xml-apis:1.4.01 - http://xml.apache.org/commons/components/external/)
 
     BSD License:
 
-        * AntLR Parser Generator (antlr:antlr:2.7.7 - http://www.antlr.org/)
         * Adobe XMPCore (com.adobe.xmp:xmpcore:6.1.11 - https://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html)
         * coverity-escapers (com.coverity.security:coverity-escapers:1.1.1 - http://coverity.com/security)
         * Java Advanced Imaging Image I/O Tools API core (standalone) (com.github.jai-imageio:jai-imageio-core:1.4.0 - https://github.com/jai-imageio/jai-imageio-core)
-        * JSONLD Java :: Core (com.github.jsonld-java:jsonld-java:0.5.1 - http://github.com/jsonld-java/jsonld-java/jsonld-java/)
-        * curvesapi (com.github.virtuald:curvesapi:1.07 - https://github.com/virtuald/curvesapi)
-        * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.11.0 - https://developers.google.com/protocol-buffers/protobuf-java/)
+        * JSONLD Java :: Core (com.github.jsonld-java:jsonld-java:0.13.4 - http://github.com/jsonld-java/jsonld-java/jsonld-java/)
+        * curvesapi (com.github.virtuald:curvesapi:1.08 - https://github.com/virtuald/curvesapi)
+        * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.15.0 - https://developers.google.com/protocol-buffers/protobuf-java/)
+        * Protocol Buffers [Core] (com.google.protobuf:protobuf-java:3.23.3 - https://developers.google.com/protocol-buffers/protobuf-java/)
         * JZlib (com.jcraft:jzlib:1.1.3 - http://www.jcraft.com/jzlib/)
-        * dnsjava (dnsjava:dnsjava:2.1.7 - http://www.dnsjava.org)
-        * jaxen (jaxen:jaxen:1.1.6 - http://jaxen.codehaus.org/)
-        * ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.5.1-1 - http://www.antlr.org/antlr4-runtime)
-        * commons-compiler (org.codehaus.janino:commons-compiler:3.0.9 - http://janino-compiler.github.io/commons-compiler/)
-        * janino (org.codehaus.janino:janino:3.0.9 - http://janino-compiler.github.io/janino/)
+        * dnsjava (dnsjava:dnsjava:2.1.9 - http://www.dnsjava.org)
+        * jaxen (jaxen:jaxen:2.0.0 - http://www.cafeconleche.org/jaxen/jaxen)
+        * ANTLR 4 Runtime (org.antlr:antlr4-runtime:4.13.1 - https://www.antlr.org/antlr4-runtime/)
+        * commons-compiler (org.codehaus.janino:commons-compiler:3.1.8 - http://janino-compiler.github.io/commons-compiler/)
+        * janino (org.codehaus.janino:janino:3.1.8 - http://janino-compiler.github.io/janino/)
         * Stax2 API (org.codehaus.woodstox:stax2-api:4.2.1 - http://github.com/FasterXML/stax2-api)
-        * Hamcrest Date (org.exparity:hamcrest-date:2.0.7 - https://github.com/exparity/hamcrest-date)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * Hamcrest Date (org.exparity:hamcrest-date:2.0.8 - https://github.com/exparity/hamcrest-date)
         * Hamcrest (org.hamcrest:hamcrest:2.2 - http://hamcrest.org/JavaHamcrest/)
-        * Hamcrest All (org.hamcrest:hamcrest-all:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-all)
-        * Hamcrest Core (org.hamcrest:hamcrest-core:1.3 - https://github.com/hamcrest/JavaHamcrest/hamcrest-core)
+        * Hamcrest Core (org.hamcrest:hamcrest-core:2.2 - http://hamcrest.org/JavaHamcrest/)
         * HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
         * JBibTeX (org.jbibtex:jbibtex:1.0.20 - http://www.jbibtex.org)
         * asm (org.ow2.asm:asm:8.0.1 - http://asm.ow2.io/)
-        * asm-analysis (org.ow2.asm:asm-analysis:7.1 - http://asm.ow2.org/)
+        * asm-analysis (org.ow2.asm:asm-analysis:8.0.1 - http://asm.ow2.io/)
         * asm-commons (org.ow2.asm:asm-commons:8.0.1 - http://asm.ow2.io/)
-        * asm-tree (org.ow2.asm:asm-tree:7.1 - http://asm.ow2.org/)
+        * asm-tree (org.ow2.asm:asm-tree:8.0.1 - http://asm.ow2.io/)
         * asm-util (org.ow2.asm:asm-util:7.1 - http://asm.ow2.org/)
-        * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.6.0 - https://jdbc.postgresql.org)
+        * PostgreSQL JDBC Driver (org.postgresql:postgresql:42.7.3 - https://jdbc.postgresql.org)
         * Reflections (org.reflections:reflections:0.9.12 - http://github.com/ronmamo/reflections)
         * JMatIO (org.tallison:jmatio:1.5 - https://github.com/tballison/jmatio)
         * XMLUnit for Java (xmlunit:xmlunit:1.3 - http://xmlunit.sourceforge.net/)
@@ -454,101 +492,121 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     Common Development and Distribution License (CDDL):
 
-        * istack common utility code runtime (com.sun.istack:istack-commons-runtime:3.0.7 - http://java.net/istack-commons/istack-commons-runtime/)
-        * JavaMail API (com.sun.mail:javax.mail:1.6.2 - http://javaee.github.io/javamail/javax.mail)
         * JavaMail API (no providers) (com.sun.mail:mailapi:1.6.2 - http://javaee.github.io/javamail/mailapi)
         * Old JAXB Core (com.sun.xml.bind:jaxb-core:2.3.0.1 - http://jaxb.java.net/jaxb-bundles/jaxb-core)
         * Old JAXB Runtime (com.sun.xml.bind:jaxb-impl:2.3.1 - http://jaxb.java.net/jaxb-bundles/jaxb-impl)
-        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
-        * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
-        * JavaBeans Activation Framework (JAF) (javax.activation:activation:1.1 - http://java.sun.com/products/javabeans/jaf/index.jsp)
+        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca)
+        * Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.3 - https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
+        * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:6.0.0 - https://projects.eclipse.org/projects/ee4j.servlet)
+        * jakarta.transaction API (jakarta.transaction:jakarta.transaction-api:2.0.1 - https://projects.eclipse.org/projects/ee4j.jta)
         * JavaBeans Activation Framework API jar (javax.activation:javax.activation-api:1.2.0 - http://java.net/all/javax.activation-api/)
-        * javax.annotation API (javax.annotation:javax.annotation-api:1.3.2 - http://jcp.org/en/jsr/detail?id=250)
+        * javax.annotation API (javax.annotation:javax.annotation-api:1.3 - http://jcp.org/en/jsr/detail?id=250)
         * Java Servlet API (javax.servlet:javax.servlet-api:3.1.0 - http://servlet-spec.java.net)
         * javax.transaction API (javax.transaction:javax.transaction-api:1.3 - http://jta-spec.java.net)
         * jaxb-api (javax.xml.bind:jaxb-api:2.3.1 - https://github.com/javaee/jaxb-spec/jaxb-api)
         * JHighlight (org.codelibs:jhighlight:1.1.0 - https://github.com/codelibs/jhighlight)
-        * HK2 API module (org.glassfish.hk2:hk2-api:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
-        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
-        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
+        * Angus Mail default provider (org.eclipse.angus:jakarta.mail:2.0.3 - http://eclipse-ee4j.github.io/angus-mail/jakarta.mail)
+        * HK2 API module (org.glassfish.hk2:hk2-api:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
+        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
+        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
         * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator)
-        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
-        * javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
-        * JAXB Runtime (org.glassfish.jaxb:jaxb-runtime:2.3.1 - http://jaxb.java.net/jaxb-runtime-parent/jaxb-runtime)
-        * TXW2 Runtime (org.glassfish.jaxb:txw2:2.3.1 - http://jaxb.java.net/jaxb-txw-parent/txw2)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Transaction API (org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.1.1.Final - http://www.jboss.org/jboss-transaction-api_1.2_spec)
-        * Extended StAX API (org.jvnet.staxex:stax-ex:1.8 - http://stax-ex.java.net/)
+        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
 
     Cordra (Version 2) License Agreement:
 
-        * net.cnri:cnri-servlet-container (net.cnri:cnri-servlet-container:3.0.0 - https://gitlab.com/cnri/cnri-servlet-container)
-        * net.cnri:cnri-servlet-container-lib (net.cnri:cnri-servlet-container-lib:3.0.0 - https://gitlab.com/cnri/cnri-servlet-container)
+        * net.cnri:cnri-servlet-container-lib (net.cnri:cnri-servlet-container-lib:3.1.0 - https://gitlab.com/cnri/cnri-servlet-container)
         * net.cnri:cnriutil (net.cnri:cnriutil:2.0 - https://gitlab.com/cnri/cnriutil)
 
+    Cordra (Version 2.5.0) License Agreement:
+
+        * net.cnri:cnri-servlet-container (net.cnri:cnri-servlet-container:3.1.0 - https://gitlab.com/cnri/cnri-servlet-container)
+
     Eclipse Distribution License, Version 1.0:
 
-        * Jakarta Activation API jar (jakarta.activation:jakarta.activation-api:1.2.2 - https://github.com/eclipse-ee4j/jaf/jakarta.activation-api)
-        * Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:2.3.3 - https://github.com/eclipse-ee4j/jaxb-api/jakarta.xml.bind-api)
-        * javax.persistence-api (javax.persistence:javax.persistence-api:2.2 - https://github.com/javaee/jpa-spec)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final - http://hibernate.org)
+        * istack common utility code runtime (com.sun.istack:istack-commons-runtime:4.1.2 - https://projects.eclipse.org/projects/ee4j/istack-commons/istack-commons-runtime)
+        * Jakarta Activation API (jakarta.activation:jakarta.activation-api:2.1.3 - https://github.com/jakartaee/jaf-api)
+        * Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.3 - https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
+        * Jakarta Persistence API (jakarta.persistence:jakarta.persistence-api:3.1.0 - https://github.com/eclipse-ee4j/jpa-api)
+        * Jakarta XML Binding API (jakarta.xml.bind:jakarta.xml.bind-api:4.0.2 - https://github.com/jakartaee/jaxb-api/jakarta.xml.bind-api)
+        * Angus Activation Registries (org.eclipse.angus:angus-activation:2.0.2 - https://github.com/eclipse-ee4j/angus-activation/angus-activation)
+        * Angus Mail default provider (org.eclipse.angus:jakarta.mail:2.0.3 - http://eclipse-ee4j.github.io/angus-mail/jakarta.mail)
+        * JAXB Core (org.glassfish.jaxb:jaxb-core:4.0.5 - https://eclipse-ee4j.github.io/jaxb-ri/)
+        * JAXB Runtime (org.glassfish.jaxb:jaxb-runtime:4.0.5 - https://eclipse-ee4j.github.io/jaxb-ri/)
+        * TXW2 Runtime (org.glassfish.jaxb:txw2:4.0.5 - https://eclipse-ee4j.github.io/jaxb-ri/)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
+        * MIME streaming extension (org.jvnet.mimepull:mimepull:1.9.15 - https://github.com/eclipse-ee4j/metro-mimepull)
+        * org.locationtech.jts:jts-core (org.locationtech.jts:jts-core:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-core)
+        * org.locationtech.jts.io:jts-io-common (org.locationtech.jts.io:jts-io-common:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-io/jts-io-common)
 
     Eclipse Public License:
 
         * System Rules (com.github.stefanbirkner:system-rules:1.19.0 - http://stefanbirkner.github.io/system-rules/)
-        * H2 Database Engine (com.h2database:h2:2.1.210 - https://h2database.com)
-        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:1.3.5 - https://projects.eclipse.org/projects/ee4j.ca)
-        * jakarta.ws.rs-api (jakarta.ws.rs:jakarta.ws.rs-api:2.1.6 - https://github.com/eclipse-ee4j/jaxrs-api)
-        * javax.persistence-api (javax.persistence:javax.persistence-api:2.2 - https://github.com/javaee/jpa-spec)
-        * JUnit (junit:junit:4.13.1 - http://junit.org)
-        * AspectJ Weaver (org.aspectj:aspectjweaver:1.9.7 - https://www.eclipse.org/aspectj/)
-        * Eclipse Compiler for Java(TM) (org.eclipse.jdt:ecj:3.14.0 - http://www.eclipse.org/jdt)
+        * H2 Database Engine (com.h2database:h2:2.2.224 - https://h2database.com)
+        * Jakarta Annotations API (jakarta.annotation:jakarta.annotation-api:2.1.1 - https://projects.eclipse.org/projects/ee4j.ca)
+        * Jakarta Expression Language API (jakarta.el:jakarta.el-api:5.0.1 - https://projects.eclipse.org/projects/ee4j.el)
+        * Jakarta Mail API (jakarta.mail:jakarta.mail-api:2.1.3 - https://projects.eclipse.org/projects/ee4j/jakarta.mail-api)
+        * Jakarta Persistence API (jakarta.persistence:jakarta.persistence-api:3.1.0 - https://github.com/eclipse-ee4j/jpa-api)
+        * Jakarta Servlet (jakarta.servlet:jakarta.servlet-api:6.0.0 - https://projects.eclipse.org/projects/ee4j.servlet)
+        * jakarta.transaction API (jakarta.transaction:jakarta.transaction-api:2.0.1 - https://projects.eclipse.org/projects/ee4j.jta)
+        * Jakarta RESTful WS API (jakarta.ws.rs:jakarta.ws.rs-api:3.1.0 - https://github.com/eclipse-ee4j/jaxrs-api)
+        * JUnit (junit:junit:4.13.2 - http://junit.org)
+        * AspectJ Weaver (org.aspectj:aspectjweaver:1.9.22 - https://www.eclipse.org/aspectj/)
+        * Angus Mail default provider (org.eclipse.angus:jakarta.mail:2.0.3 - http://eclipse-ee4j.github.io/angus-mail/jakarta.mail)
         * Jetty :: Apache JSP Implementation (org.eclipse.jetty:apache-jsp:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Apache :: JSTL module (org.eclipse.jetty:apache-jstl:9.4.15.v20190215 - http://tomcat.apache.org/taglibs/standard/)
-        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
-        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
-        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
-        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Client (org.eclipse.jetty:jetty-alpn-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-client)
+        * Jetty :: ALPN :: JDK9 Client Implementation (org.eclipse.jetty:jetty-alpn-java-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-client)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: JDK9 Server Implementation (org.eclipse.jetty:jetty-alpn-java-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-java-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.15.v20190215 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
+        * Jetty :: ALPN :: Server (org.eclipse.jetty:jetty-alpn-server:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-alpn-parent/jetty-alpn-server)
         * Jetty :: Servlet Annotations (org.eclipse.jetty:jetty-annotations:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-client)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-continuation)
-        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-deploy)
-        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-http)
-        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-io)
-        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-jmx)
+        * Jetty :: Asynchronous HTTP Client (org.eclipse.jetty:jetty-client:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-client)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.15.v20190215 - http://www.eclipse.org/jetty)
+        * Jetty :: Continuation (org.eclipse.jetty:jetty-continuation:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-continuation)
+        * Jetty :: Deployers (org.eclipse.jetty:jetty-deploy:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-deploy)
+        * Jetty :: Http Utility (org.eclipse.jetty:jetty-http:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-http)
+        * Jetty :: IO Utility (org.eclipse.jetty:jetty-io:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-io)
+        * Jetty :: JMX Management (org.eclipse.jetty:jetty-jmx:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-jmx)
         * Jetty :: JNDI Naming (org.eclipse.jetty:jetty-jndi:9.4.15.v20190215 - http://www.eclipse.org/jetty)
         * Jetty :: Plus (org.eclipse.jetty:jetty-plus:9.4.15.v20190215 - http://www.eclipse.org/jetty)
-        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-rewrite)
-        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.44.v20210927 - https://eclipse.org/jetty/jetty-security)
-        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-security)
-        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-server)
-        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-servlet)
-        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-servlets)
-        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-util)
-        * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-util-ajax)
-        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-webapp)
-        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.51.v20230217 - https://eclipse.org/jetty/jetty-xml)
-        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-client)
-        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.51.v20230217 - https://eclipse.org/jetty/http2-parent/http2-common)
-        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-hpack)
-        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.44.v20210927 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
-        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.51.v20230217 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: Rewrite Handler (org.eclipse.jetty:jetty-rewrite:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-rewrite)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Security (org.eclipse.jetty:jetty-security:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-security)
+        * Jetty :: Server Core (org.eclipse.jetty:jetty-server:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-server)
+        * Jetty :: Servlet Handling (org.eclipse.jetty:jetty-servlet:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-servlet)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.15.v20190215 - http://www.eclipse.org/jetty)
+        * Jetty :: Utility Servlets and Filters (org.eclipse.jetty:jetty-servlets:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-servlets)
+        * Jetty :: Utilities (org.eclipse.jetty:jetty-util:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-util)
+        * Jetty :: Utilities :: Ajax(JSON) (org.eclipse.jetty:jetty-util-ajax:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-util-ajax)
+        * Jetty :: Webapp Application Support (org.eclipse.jetty:jetty-webapp:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-webapp)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.53.v20231009 - https://eclipse.org/jetty/jetty-xml)
+        * Jetty :: XML utilities (org.eclipse.jetty:jetty-xml:9.4.54.v20240208 - https://eclipse.org/jetty/jetty-xml)
+        * Jetty :: ALPN :: API (org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715 - http://www.eclipse.org/jetty/alpn-api)
+        * Jetty :: HTTP2 :: Client (org.eclipse.jetty.http2:http2-client:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-client)
+        * Jetty :: HTTP2 :: Common (org.eclipse.jetty.http2:http2-common:9.4.54.v20240208 - https://eclipse.org/jetty/http2-parent/http2-common)
+        * Jetty :: HTTP2 :: HPACK (org.eclipse.jetty.http2:http2-hpack:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-hpack)
+        * Jetty :: HTTP2 :: HTTP Client Transport (org.eclipse.jetty.http2:http2-http-client-transport:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-http-client-transport)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.15.v20190215 - https://eclipse.org/jetty/http2-parent/http2-server)
+        * Jetty :: HTTP2 :: Server (org.eclipse.jetty.http2:http2-server:9.4.53.v20231009 - https://eclipse.org/jetty/http2-parent/http2-server)
         * Jetty :: Schemas (org.eclipse.jetty.toolchain:jetty-schemas:3.1.2 - https://eclipse.org/jetty/jetty-schemas)
-        * HK2 API module (org.glassfish.hk2:hk2-api:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
-        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
-        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
+        * JSON-P Default Provider (org.glassfish:jakarta.json:2.0.1 - https://github.com/eclipse-ee4j/jsonp)
+        * HK2 API module (org.glassfish.hk2:hk2-api:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-api)
+        * ServiceLocator Default Implementation (org.glassfish.hk2:hk2-locator:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-locator)
+        * HK2 Implementation Utilities (org.glassfish.hk2:hk2-utils:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/hk2-utils)
         * OSGi resource locator (org.glassfish.hk2:osgi-resource-locator:1.0.3 - https://projects.eclipse.org/projects/ee4j/osgi-resource-locator)
-        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
-        * javax.inject:1 as OSGi bundle (org.glassfish.hk2.external:jakarta.inject:2.6.1 - https://github.com/eclipse-ee4j/glassfish-hk2/external/jakarta.inject)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
-        * Java Persistence API, Version 2.1 (org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.2.Final - http://hibernate.org)
+        * aopalliance version 1.0 repackaged as a module (org.glassfish.hk2.external:aopalliance-repackaged:3.0.5 - https://github.com/eclipse-ee4j/glassfish-hk2/external/aopalliance-repackaged)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
+        * org.locationtech.jts:jts-core (org.locationtech.jts:jts-core:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-core)
+        * org.locationtech.jts.io:jts-io-common (org.locationtech.jts.io:jts-io-common:1.19.0 - https://www.locationtech.org/projects/technology.jts/jts-modules/jts-io/jts-io-common)
         * Jetty Server (org.mortbay.jetty:jetty:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty)
         * Jetty Servlet Tester (org.mortbay.jetty:jetty-servlet-tester:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-servlet-tester)
         * Jetty Utilities (org.mortbay.jetty:jetty-util:6.1.26 - http://www.eclipse.org/jetty/jetty-parent/project/jetty-util)
@@ -564,14 +622,13 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
         * uri-template (com.github.java-json-tools:uri-template:0.10 - https://github.com/java-json-tools/uri-template)
         * FindBugs-Annotations (com.google.code.findbugs:annotations:3.0.1u2 - http://findbugs.sourceforge.net/)
         * JHighlight (org.codelibs:jhighlight:1.1.0 - https://github.com/codelibs/jhighlight)
-        * Hibernate ORM - hibernate-core (org.hibernate:hibernate-core:5.6.15.Final - https://hibernate.org/orm)
-        * Hibernate ORM - hibernate-jcache (org.hibernate:hibernate-jcache:5.6.15.Final - https://hibernate.org/orm)
-        * Hibernate ORM - hibernate-jpamodelgen (org.hibernate:hibernate-jpamodelgen:5.6.15.Final - https://hibernate.org/orm)
-        * Hibernate Commons Annotations (org.hibernate.common:hibernate-commons-annotations:5.1.2.Final - http://hibernate.org)
+        * Hibernate Commons Annotations (org.hibernate.common:hibernate-commons-annotations:6.0.6.Final - http://hibernate.org)
+        * Hibernate ORM - hibernate-core (org.hibernate.orm:hibernate-core:6.4.8.Final - https://hibernate.org/orm)
+        * Hibernate ORM - hibernate-jcache (org.hibernate.orm:hibernate-jcache:6.4.8.Final - https://hibernate.org/orm)
+        * Hibernate ORM - hibernate-jpamodelgen (org.hibernate.orm:hibernate-jpamodelgen:6.4.8.Final - https://hibernate.org/orm)
         * im4java (org.im4java:im4java:1.4.0 - http://sourceforge.net/projects/im4java/)
-        * Javassist (org.javassist:javassist:3.25.0-GA - http://www.javassist.org/)
-        * XOM (xom:xom:1.2.5 - http://xom.nu)
-        * XOM (xom:xom:1.3.7 - https://xom.nu)
+        * Javassist (org.javassist:javassist:3.29.2-GA - http://www.javassist.org/)
+        * XOM (xom:xom:1.3.9 - https://xom.nu)
 
     Go License:
 
@@ -579,63 +636,70 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     Handle.Net Public License Agreement (Ver.2):
 
-        * Handle Server (net.handle:handle:9.3.0 - https://www.handle.net)
+        * Handle Server (net.handle:handle:9.3.1 - https://www.handle.net)
+
+    ISC License:
+
+        * Simple Magic (com.j256.simplemagic:simplemagic:1.17 - https://256stuff.com/sources/simplemagic/)
 
     MIT License:
 
+        * dexx (com.github.andrewoma.dexx:collection:0.7 - https://github.com/andrewoma/dexx)
         * better-files (com.github.pathikrit:better-files_2.13:3.9.1 - https://github.com/pathikrit/better-files)
         * Java SemVer (com.github.zafarkhaja:java-semver:0.9.0 - https://github.com/zafarkhaja/jsemver)
-        * dd-plist (com.googlecode.plist:dd-plist:1.25 - http://www.github.com/3breadt/dd-plist)
-        * DigitalCollections: IIIF API Library (de.digitalcollections.iiif:iiif-apis:0.3.9 - https://github.com/dbmdz/iiif-apis)
+        * dd-plist (com.googlecode.plist:dd-plist:1.28 - http://www.github.com/3breadt/dd-plist)
+        * DigitalCollections: IIIF API Library (de.digitalcollections.iiif:iiif-apis:0.3.10 - https://github.com/dbmdz/iiif-apis)
         * s3mock (io.findify:s3mock_2.13:0.2.6 - https://github.com/findify/s3mock)
+        * ClassGraph (io.github.classgraph:classgraph:4.8.165 - https://github.com/classgraph/classgraph)
         * JOpt Simple (net.sf.jopt-simple:jopt-simple:5.0.4 - http://jopt-simple.github.io/jopt-simple)
-        * Bouncy Castle S/MIME API (org.bouncycastle:bcmail-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
-        * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
-        * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
-        * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk15on:1.70 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle S/MIME API (org.bouncycastle:bcmail-jdk18on:1.77 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk15on:1.67 - http://www.bouncycastle.org/java.html)
+        * Bouncy Castle PKIX, CMS, EAC, TSP, PKCS, OCSP, CMP, and CRMF APIs (org.bouncycastle:bcpkix-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk15on:1.67 - http://www.bouncycastle.org/java.html)
+        * Bouncy Castle Provider (org.bouncycastle:bcprov-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
+        * Bouncy Castle ASN.1 Extension and Utility APIs (org.bouncycastle:bcutil-jdk18on:1.78.1 - https://www.bouncycastle.org/java.html)
         * org.brotli:dec (org.brotli:dec:0.1.2 - http://brotli.org/dec)
-        * Checker Qual (org.checkerframework:checker-qual:3.10.0 - https://checkerframework.org)
         * Checker Qual (org.checkerframework:checker-qual:3.31.0 - https://checkerframework.org)
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
         * mockito-core (org.mockito:mockito-core:3.12.4 - https://github.com/mockito/mockito)
         * mockito-inline (org.mockito:mockito-inline:3.12.4 - https://github.com/mockito/mockito)
-        * ORCID - Model (org.orcid:orcid-model:3.0.2 - http://github.com/ORCID/orcid-model)
-        * JUL to SLF4J bridge (org.slf4j:jul-to-slf4j:1.7.36 - http://www.slf4j.org)
-        * SLF4J API Module (org.slf4j:slf4j-api:1.7.36 - http://www.slf4j.org)
+        * SLF4J API Module (org.slf4j:slf4j-api:2.0.11 - http://www.slf4j.org)
         * SLF4J Extensions Module (org.slf4j:slf4j-ext:1.7.28 - http://www.slf4j.org)
         * HAL Browser (org.webjars:hal-browser:ad9b865 - http://webjars.org)
         * toastr (org.webjars.bowergithub.codeseven:toastr:2.1.4 - http://webjars.org)
         * backbone (org.webjars.bowergithub.jashkenas:backbone:1.4.1 - https://www.webjars.org)
         * underscore (org.webjars.bowergithub.jashkenas:underscore:1.13.2 - https://www.webjars.org)
-        * jquery (org.webjars.bowergithub.jquery:jquery-dist:3.6.0 - https://www.webjars.org)
-        * urijs (org.webjars.bowergithub.medialize:uri.js:1.19.10 - https://www.webjars.org)
-        * bootstrap (org.webjars.bowergithub.twbs:bootstrap:4.6.1 - https://www.webjars.org)
-        * core-js (org.webjars.npm:core-js:3.30.1 - https://www.webjars.org)
+        * jquery (org.webjars.bowergithub.jquery:jquery-dist:3.7.1 - https://www.webjars.org)
+        * urijs (org.webjars.bowergithub.medialize:uri.js:1.19.11 - https://www.webjars.org)
+        * bootstrap (org.webjars.bowergithub.twbs:bootstrap:4.6.2 - https://www.webjars.org)
+        * core-js (org.webjars.npm:core-js:3.37.1 - https://www.webjars.org)
         * @json-editor/json-editor (org.webjars.npm:json-editor__json-editor:2.6.1 - https://www.webjars.org)
 
     Mozilla Public License:
 
-        * juniversalchardet (com.googlecode.juniversalchardet:juniversalchardet:1.0.3 - http://juniversalchardet.googlecode.com/)
-        * H2 Database Engine (com.h2database:h2:2.1.210 - https://h2database.com)
+        * juniversalchardet (com.github.albfernandez:juniversalchardet:2.4.0 - https://github.com/albfernandez/juniversalchardet)
+        * H2 Database Engine (com.h2database:h2:2.2.224 - https://h2database.com)
         * Saxon-HE (net.sf.saxon:Saxon-HE:9.8.0-14 - http://www.saxonica.com/)
-        * Javassist (org.javassist:javassist:3.25.0-GA - http://www.javassist.org/)
+        * Javassist (org.javassist:javassist:3.29.2-GA - http://www.javassist.org/)
         * Mozilla Rhino (org.mozilla:rhino:1.7.7.2 - https://developer.mozilla.org/en/Rhino)
 
     Public Domain:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-core-common (org.glassfish.jersey.core:jersey-common:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-core-common (org.glassfish.jersey.core:jersey-common:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-common)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
         * HdrHistogram (org.hdrhistogram:HdrHistogram:2.1.12 - http://hdrhistogram.github.io/HdrHistogram/)
-        * JSON in Java (org.json:json:20230227 - https://github.com/douglascrockford/JSON-java)
+        * JSON in Java (org.json:json:20231013 - https://github.com/douglascrockford/JSON-java)
         * LatencyUtils (org.latencyutils:LatencyUtils:2.0.3 - http://latencyutils.github.io/LatencyUtils/)
         * Reflections (org.reflections:reflections:0.9.12 - http://github.com/ronmamo/reflections)
         * XZ for Java (org.tukaani:xz:1.9 - https://tukaani.org/xz/java.html)
 
     UnRar License:
 
-        * Java Unrar (com.github.junrar:junrar:7.5.3 - https://github.com/junrar/junrar)
+        * Java Unrar (com.github.junrar:junrar:7.5.5 - https://github.com/junrar/junrar)
 
     Unicode/ICU License:
 
@@ -643,10 +707,12 @@ https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines
 
     W3C license:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
 
     jQuery license:
 
-        * jersey-core-client (org.glassfish.jersey.core:jersey-client:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
-        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:2.35 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-core-client (org.glassfish.jersey.core:jersey-client:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/jersey-client)
+        * jersey-inject-hk2 (org.glassfish.jersey.inject:jersey-hk2:3.1.5 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-hk2)
+        * jersey-media-multipart (org.glassfish.jersey.media:jersey-media-multipart:3.1.3 - https://projects.eclipse.org/projects/ee4j.jersey/project/jersey-media-multipart)
diff --git a/README.md b/README.md
index af9158eff3..1d93abe499 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ DSpace consists of both a Java-based backend and an Angular-based frontend.
     * The REST Contract is at https://github.com/DSpace/RestContract
 * Frontend (https://github.com/DSpace/dspace-angular/) is the User Interface built on the REST API
 
-Prior versions of DSpace (v6.x and below) used two different UIs (XMLUI and JSPUI). Those UIs are no longer supported in v7 (and above).
+Prior versions of DSpace (v6.x and below) used two different UIs (XMLUI and JSPUI). Those UIs are no longer supported in v7 and above.
 * A maintenance branch for older versions is still available, see `dspace-6_x` for 6.x maintenance.
 
 ## Downloads
@@ -33,18 +33,18 @@ Prior versions of DSpace (v6.x and below) used two different UIs (XMLUI and JSPU
 Documentation for each release may be viewed online or downloaded via our [Documentation Wiki](https://wiki.lyrasis.org/display/DSDOC/).
 
 The latest DSpace Installation instructions are available at:
-https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
+https://wiki.lyrasis.org/display/DSDOC8x/Installing+DSpace
 
 Please be aware that, as a Java web application, DSpace requires a database (PostgreSQL)
 and a servlet container (usually Tomcat) in order to function.
 More information about these and all other prerequisites can be found in the Installation instructions above.
 
-## Running DSpace 7 in Docker
+## Running DSpace 8 in Docker
 
 NOTE: At this time, we do not have production-ready Docker images for DSpace.
 That said, we do have quick-start Docker Compose scripts for development or testing purposes.
 
-See [Running DSpace 7 with Docker Compose](dspace/src/main/docker-compose/README.md)
+See [Running DSpace 8 with Docker Compose](dspace/src/main/docker-compose/README.md)
 
 ## Contributing
 
@@ -64,7 +64,7 @@ Great Q&A is also available under the [DSpace tag on Stackoverflow](http://stack
 Additional support options are at https://wiki.lyrasis.org/display/DSPACE/Support
 
 DSpace also has an active service provider network. If you'd rather hire a service provider to
-install, upgrade, customize or host DSpace, then we recommend getting in touch with one of our
+install, upgrade, customize, or host DSpace, then we recommend getting in touch with one of our
 [Registered Service Providers](http://www.dspace.org/service-providers).
 
 ## Issue Tracker
@@ -112,7 +112,7 @@ run automatically by [GitHub Actions](https://github.com/DSpace/DSpace/actions?q
   ```
 * How to run only tests of a specific DSpace module
   ```
-  # Before you can run only one module's tests, other modules may need installing into your ~/.m2
+  # Before you can run only one module's tests, other modules may need to be installed into your ~/.m2
   cd [dspace-src]
   mvn clean install
 
diff --git a/checkstyle.xml b/checkstyle.xml
index e0fa808d83..a33fc48319 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -92,7 +92,7 @@ For more information on CheckStyle configurations below, see: http://checkstyle.
         <!-- Requirements for Javadocs for methods -->
         <module name="JavadocMethod">
             <!-- All public methods MUST HAVE Javadocs -->
-            <property name="scope" value="public"/>
+            <property name="accessModifiers" value="public"/>
             <!-- Allow params, throws and return tags to be optional -->
             <property name="allowMissingParamTags" value="true"/>
             <property name="allowMissingReturnTag" value="true"/>
diff --git a/docker-compose-cli.yml b/docker-compose-cli.yml
index d6a194617e..91f89916d2 100644
--- a/docker-compose-cli.yml
+++ b/docker-compose-cli.yml
@@ -6,7 +6,7 @@ networks:
     external: true
 services:
   dspace-cli:
-    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
     container_name: dspace-cli
     build:
       context: .
diff --git a/docker-compose.yml b/docker-compose.yml
index 23fce37db2..6a930a8d31 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
       # from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
       proxies__P__trusted__P__ipranges: '172.23.0'
       LOGGING_CONFIG: /dspace/config/log4j2-container.xml
-    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-dspace-7_x-test}"
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     build:
       context: .
       dockerfile: Dockerfile.test
@@ -39,8 +39,6 @@ services:
     ports:
     - published: 8080
       target: 8080
-    - published: 8009
-      target: 8009
     - published: 8000
       target: 8000
     stdin_open: true
@@ -54,19 +52,19 @@ services:
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run database migration to init database tables
-    # 3. Finally, start Tomcat
+    # 3. Finally, start DSpace
     entrypoint:
     - /bin/bash
     - '-c'
     - |
       while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
       /dspace/bin/dspace database migrate
-      catalina.sh run
+      java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
   # DSpace PostgreSQL database container
   dspacedb:
     container_name: dspacedb
     # Uses a custom Postgres image with pgcrypto installed
-    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
     build:
       # Must build out of subdirectory to have access to install script for pgcrypto
       context: ./dspace/src/main/docker/dspace-postgres-pgcrypto/
@@ -86,7 +84,7 @@ services:
   # DSpace Solr container
   dspacesolr:
     container_name: dspacesolr
-    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-dspace-7_x}"
+    image: "${DOCKER_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     build:
       context: ./dspace/src/main/docker/dspace-solr/
       # Provide path to Solr configs necessary to build Docker image
@@ -122,6 +120,10 @@ services:
       cp -r /opt/solr/server/solr/configsets/search/* search
       precreate-core statistics /opt/solr/server/solr/configsets/statistics
       cp -r /opt/solr/server/solr/configsets/statistics/* statistics
+      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
+      precreate-core suggestion /opt/solr/server/solr/configsets/suggestion
+      cp -r /opt/solr/server/solr/configsets/suggestion/* suggestion
       exec solr -f
 volumes:
   assetstore:
diff --git a/dspace-api/pom.xml b/dspace-api/pom.xml
index 4c881cbd24..a80f27bc22 100644
--- a/dspace-api/pom.xml
+++ b/dspace-api/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -54,21 +54,21 @@
                         <!-- Enable Hibernate's Metamodel Generator to generate metadata model classes
                              (ending in _ suffix) for more type-safe Criteria queries -->
                         <path>
-                            <groupId>org.hibernate</groupId>
+                            <groupId>org.hibernate.orm</groupId>
                             <artifactId>hibernate-jpamodelgen</artifactId>
                             <version>${hibernate.version}</version>
                         </path>
                         <!-- Enable JAXB -->
                         <path>
-                            <groupId>javax.xml.bind</groupId>
-                            <artifactId>jaxb-api</artifactId>
+                            <groupId>jakarta.xml.bind</groupId>
+                            <artifactId>jakarta.xml.bind-api</artifactId>
                             <version>${jaxb-api.version}</version>
                         </path>
                         <!-- Enable Commons Annotations -->
                         <path>
-                            <groupId>javax.annotation</groupId>
-                            <artifactId>javax.annotation-api</artifactId>
-                            <version>${javax-annotation.version}</version>
+                            <groupId>jakarta.annotation</groupId>
+                            <artifactId>jakarta.annotation-api</artifactId>
+                            <version>${jakarta-annotation.version}</version>
                         </path>
                         <!-- Enable http://errorprone.info -->
                         <path>
@@ -102,7 +102,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
-                <version>3.4.0</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -116,7 +116,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>buildnumber-maven-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
                 <configuration>
                     <revisionOnScmFailure>UNKNOWN_REVISION</revisionOnScmFailure>
                 </configuration>
@@ -177,7 +177,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jaxb2-maven-plugin</artifactId>
-                <version>2.5.0</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>workflow-curation</id>
@@ -265,7 +265,7 @@
                                 <!-- 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>
+                                <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>
@@ -324,7 +324,7 @@
                             <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>
+                                <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>
@@ -342,18 +342,15 @@
             <artifactId>log4j-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
-                <exclusions>
-                    <!-- Newer version pulled in via Jersey below -->
-                    <exclusion>
-                        <groupId>org.javassist</groupId>
-                        <artifactId>javassist</artifactId>
-                    </exclusion>
-                </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.orm</groupId>
+            <artifactId>hibernate-jpamodelgen</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-jcache</artifactId>
         </dependency>
         <dependency>
@@ -375,23 +372,18 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>javax.cache</groupId>
-            <artifactId>cache-api</artifactId>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
-            <artifactId>hibernate-jpamodelgen</artifactId>
+            <groupId>javax.cache</groupId>
+            <artifactId>cache-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <version>${hibernate-validator.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.2.Final</version>
-        </dependency>
 
         <dependency>
             <groupId>org.springframework</groupId>
@@ -402,30 +394,26 @@
             <groupId>net.handle</groupId>
             <artifactId>handle</artifactId>
         </dependency>
+        <!-- Only necessary to run Handle Server from commandline. This is why it is a runtime dependency. -->
         <dependency>
             <groupId>net.cnri</groupId>
             <artifactId>cnri-servlet-container</artifactId>
+            <scope>runtime</scope>
             <exclusions>
-                <!-- Newer versions provided in our parent POM -->
+                <!-- Excluded because this library is incompatible with Jakarta EE. It causes errors in DSpace during
+                     startup & integration testing. Excluding doesn't seem to effect Handle Server startup. -->
                 <exclusion>
-                    <groupId>org.ow2.asm</groupId>
-                    <artifactId>asm-commons</artifactId>
-                </exclusion>
-                <!-- Newer version of Bouncycastle brought in via Tika -->
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcpkix-jdk15on</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk15on</artifactId>
+                    <groupId>org.mortbay.jasper</groupId>
+                    <artifactId>apache-jsp</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- Jetty is needed to run Handle Server -->
+
+        <!-- Jetty is needed to run Handle Server ONLY. This is why it is a runtime dependency. -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-server</artifactId>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.dspace</groupId>
@@ -435,12 +423,6 @@
             <groupId>org.apache.jena</groupId>
             <artifactId>apache-jena-libs</artifactId>
             <type>pom</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>
@@ -458,10 +440,6 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>
         </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
@@ -480,17 +458,26 @@
             <artifactId>commons-validator</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>jakarta.mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
         </dependency>
         <dependency>
             <groupId>jaxen</groupId>
@@ -586,6 +573,13 @@
             <artifactId>solr-core</artifactId>
             <scope>test</scope>
             <version>${solr.client.version}</version>
+            <exclusions>
+                <!-- Later version provided by Hibernate -->
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
@@ -629,7 +623,7 @@
         <dependency>
             <groupId>dnsjava</groupId>
             <artifactId>dnsjava</artifactId>
-            <version>2.1.9</version>
+            <version>3.6.0</version>
         </dependency>
 
         <dependency>
@@ -665,7 +659,12 @@
         <dependency>
             <groupId>org.flywaydb</groupId>
             <artifactId>flyway-core</artifactId>
-            <version>8.5.13</version>
+            <version>${flyway.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.flywaydb</groupId>
+            <artifactId>flyway-database-postgresql</artifactId>
+            <version>${flyway.version}</version>
         </dependency>
 
         <!-- Google Analytics -->
@@ -701,27 +700,22 @@
         </dependency>
 
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>1</version>
-            <type>jar</type>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>2.0.1</version>
         </dependency>
 
         <!-- JAXB API and implementation (no longer bundled as of Java 11) -->
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jaxb</groupId>
             <artifactId>jaxb-runtime</artifactId>
         </dependency>
 
-        <!-- Jersey / JAX-RS client (javax.ws.rs.*) dependencies needed to integrate with external sources/services -->
+        <!-- Jersey / JAX-RS client (jakarta.ws.rs.*) dependencies needed to integrate with external sources/services -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
             <artifactId>jersey-client</artifactId>
@@ -742,31 +736,18 @@
             <version>1.12.261</version>
         </dependency>
 
+        <!-- TODO: This may need to be replaced with the "orcid-model" artifact once this ticket is resolved:
+             https://github.com/ORCID/orcid-model/issues/50 -->
+        <!-- Maintained at https://github.com/DSpace/orcid-model -->
         <dependency>
-            <groupId>org.orcid</groupId>
-            <artifactId>orcid-model</artifactId>
-            <version>3.0.2</version>
+            <groupId>org.dspace</groupId>
+            <artifactId>orcid-model-jakarta</artifactId>
+            <version>3.3.0</version>
             <exclusions>
-                <exclusion>
-                    <groupId>javax.validation</groupId>
-                    <artifactId>validation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                    <artifactId>jackson-jaxrs-json-provider</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.yaml</groupId>
-                    <artifactId>snakeyaml</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.javassist</groupId>
                     <artifactId>javassist</artifactId>
                 </exclusion>
-                <exclusion>
-                	<groupId>io.swagger</groupId>
-                	<artifactId>swagger-jersey-jaxrs</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
 
@@ -823,11 +804,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <dependency>
+          <groupId>eu.openaire</groupId>
+          <artifactId>broker-client</artifactId>
+          <version>1.1.2</version>
+        </dependency>
 
         <dependency>
             <groupId>org.mock-server</groupId>
             <artifactId>mockserver-junit-rule</artifactId>
-            <version>5.11.2</version>
+            <version>5.15.0</version>
             <scope>test</scope>
             <exclusions>
                 <!-- Exclude snakeyaml to avoid conflicts with: spring-boot-starter-cache -->
@@ -835,6 +822,20 @@
             		<groupId>org.yaml</groupId>
             		<artifactId>snakeyaml</artifactId>
             	</exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.datatype</groupId>
+                    <artifactId>jackson-datatype-jsr310</artifactId>
+                </exclusion>
+                <!-- Resolve dependency conflicts with Hibernate -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <!-- Resolve dependency conflicts with Solr -->
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>javax.servlet-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         
@@ -854,7 +855,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-    
     </dependencies>
 
     <dependencyManagement>
@@ -865,32 +865,32 @@
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
-            <version>4.1.106.Final</version>
+            <version>4.1.114.Final</version>
           </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport</artifactId>
-            <version>4.1.106.Final</version>
+            <version>4.1.114.Final</version>
           </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-unix-common</artifactId>
-            <version>4.1.106.Final</version>
+            <version>4.1.114.Final</version>
            </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-common</artifactId>
-            <version>4.1.106.Final</version>
+            <version>4.1.114.Final</version>
           </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>
-            <version>4.1.106.Final</version>
+            <version>4.1.114.Final</version>
           </dependency>
           <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec</artifactId>
-            <version>4.1.106.Final</version>
+            <version>4.1.114.Final</version>
           </dependency>
           <dependency>
             <groupId>org.apache.velocity</groupId>
@@ -909,14 +909,9 @@
             <version>2.2.14</version>
           </dependency>
           <dependency>
-            <groupId>jakarta.xml.bind</groupId>
-            <artifactId>jakarta.xml.bind-api</artifactId>
-            <version>2.3.3</version>
-          </dependency>
-          <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
+            <version>3.1.0</version>
           </dependency>
           <dependency>
             <groupId>io.swagger</groupId>
diff --git a/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java b/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java
index e1f11285d8..01b3707479 100644
--- a/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/access/status/AccessStatusServiceImpl.java
@@ -8,6 +8,8 @@
 package org.dspace.access.status;
 
 import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.Date;
 
 import org.dspace.access.status.service.AccessStatusService;
@@ -15,7 +17,6 @@ import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.service.PluginService;
 import org.dspace.services.ConfigurationService;
-import org.joda.time.LocalDate;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -55,7 +56,10 @@ public class AccessStatusServiceImpl implements AccessStatusService {
             int month = configurationService.getIntProperty("access.status.embargo.forever.month");
             int day = configurationService.getIntProperty("access.status.embargo.forever.day");
 
-            forever_date = new LocalDate(year, month, day).toDate();
+            forever_date = Date.from(LocalDate.of(year, month, day)
+                    .atStartOfDay()
+                    .atZone(ZoneId.systemDefault())
+                    .toInstant());
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java b/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java
index 2ed47bde4c..e86c5a69f4 100644
--- a/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java
+++ b/dspace-api/src/main/java/org/dspace/access/status/service/AccessStatusService.java
@@ -18,7 +18,7 @@ import org.dspace.core.Context;
  * Configuration properties: (with examples)
  * {@code
  * # values for the forever embargo date threshold
- * # This threshold date is used in the default access status helper to dermine if an item is
+ * # This threshold date is used in the default access status helper to determine if an item is
  * # restricted or embargoed based on the start date of the primary (or first) file policies.
  * # In this case, if the policy start date is inferior to the threshold date, the status will
  * # be embargo, else it will be restricted.
diff --git a/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java b/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java
index 2677cb2050..80bda610c7 100644
--- a/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java
+++ b/dspace-api/src/main/java/org/dspace/administer/MetadataImporter.java
@@ -21,6 +21,8 @@ import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataSchema;
@@ -30,8 +32,6 @@ import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.MetadataSchemaService;
 import org.dspace.core.Context;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
@@ -40,9 +40,9 @@ import org.xml.sax.SAXException;
 /**
  * @author Richard Jones
  *
- * This class takes an xml document as passed in the arguments and
+ * This class takes an XML document as passed in the arguments and
  * uses it to create metadata elements in the Metadata Registry if
- * they do not already exist
+ * they do not already exist.
  *
  * The format of the XML file is as follows:
  *
@@ -69,7 +69,7 @@ public class MetadataImporter {
     /**
      * logging category
      */
-    private static final Logger log = LoggerFactory.getLogger(MetadataImporter.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Default constructor
@@ -89,6 +89,7 @@ public class MetadataImporter {
      * @throws SAXException                 if parser error
      * @throws NonUniqueMetadataException   if duplicate metadata
      * @throws RegistryImportException      if import fails
+     * @throws XPathExpressionException     passed through
      **/
     public static void main(String[] args)
         throws ParseException, SQLException, IOException, TransformerException,
@@ -125,6 +126,7 @@ public class MetadataImporter {
      * @throws SAXException                 if parser error
      * @throws NonUniqueMetadataException   if duplicate metadata
      * @throws RegistryImportException      if import fails
+     * @throws XPathExpressionException     passed through
      */
     public static void loadRegistry(String file, boolean forceUpdate)
         throws SQLException, IOException, TransformerException, ParserConfigurationException, AuthorizeException,
@@ -203,7 +205,7 @@ public class MetadataImporter {
 
         if (s == null) {
             // Schema does not exist - create
-            log.info("Registering Schema " + name + " (" + namespace + ")");
+            log.info("Registering Schema {}({})", name, namespace);
             metadataSchemaService.create(context, name, namespace);
         } else {
             // Schema exists - if it's the same namespace, allow the type imports to continue
@@ -215,7 +217,7 @@ public class MetadataImporter {
             // It's a different namespace - have we been told to update?
             if (updateExisting) {
                 // Update the existing schema namespace and continue to type import
-                log.info("Updating Schema " + name + ": New namespace " + namespace);
+                log.info("Updating Schema {}: New namespace {}", name, namespace);
                 s.setNamespace(namespace);
                 metadataSchemaService.update(context, s);
             } else {
@@ -274,7 +276,7 @@ public class MetadataImporter {
         if (qualifier == null) {
             fieldName = schema + "." + element;
         }
-        log.info("Registering metadata field " + fieldName);
+        log.info("Registering metadata field {}", fieldName);
         MetadataField field = metadataFieldService.create(context, schemaObj, element, qualifier, scopeNote);
         metadataFieldService.update(context, field);
     }
diff --git a/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java b/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
index 13a1b3b5bb..8bbcfe0ff7 100644
--- a/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
+++ b/dspace-api/src/main/java/org/dspace/administer/StructBuilder.java
@@ -802,7 +802,7 @@ public class StructBuilder {
 
             // default the short description to the empty string
             collectionService.setMetadataSingleValue(context, collection,
-                    MD_SHORT_DESCRIPTION, Item.ANY, " ");
+                    MD_SHORT_DESCRIPTION, null, " ");
 
             // import the rest of the metadata
             for (Map.Entry<String, MetadataFieldName> entry : collectionMap.entrySet()) {
diff --git a/dspace-api/src/main/java/org/dspace/alerts/SystemWideAlert.java b/dspace-api/src/main/java/org/dspace/alerts/SystemWideAlert.java
index f56cbdcce9..432c633ea5 100644
--- a/dspace-api/src/main/java/org/dspace/alerts/SystemWideAlert.java
+++ b/dspace-api/src/main/java/org/dspace/alerts/SystemWideAlert.java
@@ -8,17 +8,17 @@
 package org.dspace.alerts;
 
 import java.util.Date;
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/alerts/dao/impl/SystemWideAlertDAOImpl.java b/dspace-api/src/main/java/org/dspace/alerts/dao/impl/SystemWideAlertDAOImpl.java
index 13a0e0af23..79dc1bcf27 100644
--- a/dspace-api/src/main/java/org/dspace/alerts/dao/impl/SystemWideAlertDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/alerts/dao/impl/SystemWideAlertDAOImpl.java
@@ -9,10 +9,10 @@ package org.dspace.alerts.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.alerts.SystemWideAlert;
 import org.dspace.alerts.SystemWideAlert_;
 import org.dspace.alerts.dao.SystemWideAlertDAO;
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java
index cbc052b557..ecd6a24287 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/DSpaceCSV.java
@@ -188,6 +188,15 @@ public class DSpaceCSV implements Serializable {
                     // Verify that the heading is valid in the metadata registry
                     String[] clean = element.split("\\[");
                     String[] parts = clean[0].split("\\.");
+                    // Check language if present, if it's ANY then throw an exception
+                    if (clean.length > 1 && clean[1].equals(Item.ANY + "]")) {
+                        throw new MetadataImportInvalidHeadingException("Language ANY (*) was found in the heading " +
+                                                                                "of the metadata value to import, " +
+                                                                                "this should never be the case",
+                                                                        MetadataImportInvalidHeadingException.ENTRY,
+                                                                        columnCounter);
+
+                    }
 
                     if (parts.length < 2) {
                         throw new MetadataImportInvalidHeadingException(element,
@@ -223,6 +232,15 @@ public class DSpaceCSV implements Serializable {
                         }
                     }
 
+                    // Verify there isn’t already a header that is the same; if it already exists,
+                    // throw MetadataImportInvalidHeadingException
+                    String header = authorityPrefix + element;
+                    if (headings.contains(header)) {
+                        throw new MetadataImportInvalidHeadingException("Duplicate heading found: " + header,
+                                                                        MetadataImportInvalidHeadingException.ENTRY,
+                                                                        columnCounter);
+                    }
+
                     // Store the heading
                     headings.add(authorityPrefix + element);
                 }
@@ -457,7 +475,7 @@ public class DSpaceCSV implements Serializable {
                 key = key + "." + metadataField.getQualifier();
             }
 
-            // Add the language if there is one (schema.element.qualifier[langauge])
+            // Add the language if there is one (schema.element.qualifier[language])
             //if ((value.language != null) && (!"".equals(value.language)))
             if (value.getLanguage() != null) {
                 key = key + "[" + value.getLanguage() + "]";
diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
index ad46cb95c3..988768864e 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
@@ -20,8 +20,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -253,7 +253,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
                 displayChanges(changes, true);
             }
 
-            // Finsh off and tidy up
+            // Finish off and tidy up
             c.restoreAuthSystemState();
             c.complete();
         } catch (Exception e) {
@@ -1653,7 +1653,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
                                                   .getLabel();
                 } else {
                     // Target item may be archived; check there.
-                    // Add to errors if Realtionship.type cannot be derived
+                    // Add to errors if Relationship.type cannot be derived
                     Item targetItem = null;
                     if (itemService.find(c, UUID.fromString(targetUUID)) != null) {
                         targetItem = itemService.find(c, UUID.fromString(targetUUID));
@@ -1698,7 +1698,7 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
                             validateTypesByTypeByTypeName(c, targetType, originType, typeName, originRow);
                         } else {
                             // Origin item may be archived; check there.
-                            // Add to errors if Realtionship.type cannot be derived.
+                            // Add to errors if Relationship.type cannot be derived.
                             Item originItem = null;
                             if (itemService.find(c, UUID.fromString(targetUUID)) != null) {
                                 DSpaceCSVLine dSpaceCSVLine = this.csv.getCSVLines()
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
index 7c80e1ea7d..0ae2283d35 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/ItemExportServiceImpl.java
@@ -31,8 +31,8 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.itemexport.service.ItemExportService;
@@ -725,7 +725,7 @@ public class ItemExportServiceImpl implements ItemExportService {
                         try {
                             emailErrorMessage(eperson, e1.getMessage());
                         } catch (Exception e) {
-                            // wont throw here
+                            // won't throw here
                         }
                         throw new IllegalStateException(e1);
                     } finally {
diff --git a/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java b/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java
index 6ec1027709..c28ec70d6f 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemexport/service/ItemExportService.java
@@ -11,8 +11,8 @@ import java.io.InputStream;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
@@ -69,7 +69,7 @@ public interface ItemExportService {
                             boolean excludeBitstreams) throws Exception;
 
     /**
-     * Convenience methot to create export a single Community, Collection, or
+     * Convenience method to create export a single Community, Collection, or
      * Item
      *
      * @param dso     - the dspace object to export
@@ -93,7 +93,7 @@ public interface ItemExportService {
                                          Context context, boolean migrate) throws Exception;
 
     /**
-     * Convenience methot to create export a single Community, Collection, or
+     * Convenience method to create export a single Community, Collection, or
      * Item
      *
      * @param dso             - the dspace object to export
@@ -156,7 +156,7 @@ public interface ItemExportService {
     public String getExportWorkDirectory() throws Exception;
 
     /**
-     * Used to read the export archived. Inteded for download.
+     * Used to read the export archived. Intended for download.
      *
      * @param fileName the name of the file to download
      * @param eperson  the eperson requesting the download
@@ -233,7 +233,7 @@ public interface ItemExportService {
 
     /**
      * Since the archive is created in a new thread we are unable to communicate
-     * with calling method about success or failure. We accomplis this
+     * with calling method about success or failure. We accomplish this
      * communication with email instead. Send a success email once the export
      * archive is complete and ready for download
      *
@@ -248,7 +248,7 @@ public interface ItemExportService {
 
     /**
      * Since the archive is created in a new thread we are unable to communicate
-     * with calling method about success or failure. We accomplis this
+     * with calling method about success or failure. We accomplish this
      * communication with email instead. Send an error email if the export
      * archive fails
      *
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
index 1e219ee631..01859c4f6b 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/ItemImportServiceImpl.java
@@ -46,7 +46,6 @@ import java.util.TreeMap;
 import java.util.UUID;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import javax.mail.MessagingException;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -56,6 +55,7 @@ import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.collections4.ComparatorUtils;
 import org.apache.commons.io.FileDeleteStrategy;
 import org.apache.commons.io.FileUtils;
@@ -2210,7 +2210,7 @@ public class ItemImportServiceImpl implements ItemImportService, InitializingBea
                         emailErrorMessage(eperson, exceptionString);
                         throw new Exception(e.getMessage());
                     } catch (Exception e2) {
-                        // wont throw here
+                        // won't throw here
                     }
                 } finally {
                     // Make sure the database connection gets closed in all conditions.
diff --git a/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java b/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
index e99ece31b9..738991a839 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemimport/service/ItemImportService.java
@@ -10,8 +10,8 @@ package org.dspace.app.itemimport.service;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.dspace.app.itemimport.BatchUpload;
 import org.dspace.content.Collection;
 import org.dspace.core.Context;
@@ -121,7 +121,7 @@ public interface ItemImportService {
 
     /**
      * If a batch import is done in a new thread we are unable to communicate
-     * with calling method about success or failure. We accomplis this
+     * with calling method about success or failure. We accomplish this
      * communication with email instead. Send an error email if the batch
      * import fails
      *
diff --git a/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemArchive.java b/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemArchive.java
index 26de45caf7..a3dead0574 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemArchive.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemupdate/ItemArchive.java
@@ -217,7 +217,7 @@ public class ItemArchive {
         throws SQLException, Exception {
         DtoMetadata dtom = getMetadataField("dc.identifier.uri");
         if (dtom == null) {
-            throw new Exception("No dc.identier.uri field found for handle");
+            throw new Exception("No dc.identifier.uri field found for handle");
         }
 
         this.addUndoMetadataField(dtom);  //seed the undo list with the uri
diff --git a/dspace-api/src/main/java/org/dspace/app/itemupdate/ThumbnailBitstreamFilter.java b/dspace-api/src/main/java/org/dspace/app/itemupdate/ThumbnailBitstreamFilter.java
index 2a8f9ac200..b600077887 100644
--- a/dspace-api/src/main/java/org/dspace/app/itemupdate/ThumbnailBitstreamFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/itemupdate/ThumbnailBitstreamFilter.java
@@ -10,7 +10,7 @@ package org.dspace.app.itemupdate;
 import java.util.Properties;
 
 /**
- * Bitstream filter targetting the THUMBNAIL bundle
+ * Bitstream filter targeting the THUMBNAIL bundle
  */
 public class ThumbnailBitstreamFilter extends BitstreamFilterByBundleName {
 
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/ItemFilter.java b/dspace-api/src/main/java/org/dspace/app/ldn/ItemFilter.java
new file mode 100644
index 0000000000..44dd5389d3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/ItemFilter.java
@@ -0,0 +1,30 @@
+/**
+ * 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.ldn;
+
+/**
+ * model class for the item filters configured into item-filters.xml
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class ItemFilter {
+
+    private String id;
+
+    public ItemFilter(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageConsumer.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageConsumer.java
new file mode 100644
index 0000000000..210aaa6c9c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageConsumer.java
@@ -0,0 +1,243 @@
+/**
+ * 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.ldn;
+
+import static java.lang.String.format;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.ldn.factory.NotifyServiceFactory;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.content.Bitstream;
+import org.dspace.content.BitstreamFormat;
+import org.dspace.content.Bundle;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.logic.LogicalStatement;
+import org.dspace.content.service.BitstreamService;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.core.I18nUtil;
+import org.dspace.core.LDN;
+import org.dspace.event.Consumer;
+import org.dspace.event.Event;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+import org.dspace.web.ContextUtil;
+
+/**
+ * class for creating a new LDN Messages of installed item
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageConsumer implements Consumer {
+
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+    private NotifyServiceInboundPatternService inboundPatternService;
+    private LDNMessageService ldnMessageService;
+    private ConfigurationService configurationService;
+    private ItemService itemService;
+    private BitstreamService bitstreamService;
+
+    @Override
+    public void initialize() throws Exception {
+        notifyPatternToTriggerService = NotifyServiceFactory.getInstance().getNotifyPatternToTriggerService();
+        ldnMessageService = NotifyServiceFactory.getInstance().getLDNMessageService();
+        configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        itemService = ContentServiceFactory.getInstance().getItemService();
+        bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
+        inboundPatternService = NotifyServiceFactory.getInstance().getNotifyServiceInboundPatternService();
+    }
+
+    @Override
+    public void consume(Context context, Event event) throws Exception {
+
+        if (event.getSubjectType() != Constants.ITEM ||
+            event.getEventType() != Event.INSTALL) {
+            return;
+        }
+
+        Item item = (Item) event.getSubject(context);
+        createManualLDNMessages(context, item);
+        createAutomaticLDNMessages(context, item);
+    }
+
+    private void createManualLDNMessages(Context context, Item item) throws SQLException, JsonProcessingException {
+        List<NotifyPatternToTrigger> patternsToTrigger =
+            notifyPatternToTriggerService.findByItem(context, item);
+
+        for (NotifyPatternToTrigger patternToTrigger : patternsToTrigger) {
+            createLDNMessage(context,patternToTrigger.getItem(),
+                patternToTrigger.getNotifyService(), patternToTrigger.getPattern());
+        }
+    }
+
+    private void createAutomaticLDNMessages(Context context, Item item) throws SQLException, JsonProcessingException {
+
+        List<NotifyServiceInboundPattern> inboundPatterns = inboundPatternService.findAutomaticPatterns(context);
+
+        for (NotifyServiceInboundPattern inboundPattern : inboundPatterns) {
+            if (StringUtils.isEmpty(inboundPattern.getConstraint()) ||
+                evaluateFilter(context, item, inboundPattern.getConstraint())) {
+                createLDNMessage(context, item, inboundPattern.getNotifyService(), inboundPattern.getPattern());
+            }
+        }
+    }
+
+    private boolean evaluateFilter(Context context, Item item, String constraint) {
+        LogicalStatement filter =
+            new DSpace().getServiceManager().getServiceByName(constraint, LogicalStatement.class);
+
+        return filter != null && filter.getResult(context, item);
+    }
+
+    private void createLDNMessage(Context context, Item item, NotifyServiceEntity service, String pattern)
+        throws SQLException, JsonMappingException, JsonProcessingException {
+
+        LDN ldn = getLDNMessage(pattern);
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.create(context, format("urn:uuid:%s", UUID.randomUUID()));
+
+        ldnMessage.setObject(item);
+        ldnMessage.setTarget(service);
+        ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+        ldnMessage.setQueueTimeout(new Date());
+
+        appendGeneratedMessage(ldn, ldnMessage, pattern);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+        ldnMessage.setType(StringUtils.joinWith(",", notification.getType()));
+
+        ArrayList<String> notificationTypeArrayList = new ArrayList<String>(notification.getType());
+        // sorting the list
+        Collections.sort(notificationTypeArrayList);
+        ldnMessage.setActivityStreamType(notificationTypeArrayList.get(0));
+        ldnMessage.setCoarNotifyType(notificationTypeArrayList.get(1));
+
+        ldnMessageService.update(context, ldnMessage);
+    }
+
+    private LDN getLDNMessage(String pattern) {
+        try {
+            return LDN.getLDNMessage(I18nUtil.getLDNFilename(Locale.getDefault(), pattern));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void appendGeneratedMessage(LDN ldn, LDNMessageEntity ldnMessage, String pattern) {
+        Item item = (Item) ldnMessage.getObject();
+        ldn.addArgument(getUiUrl());
+        ldn.addArgument(configurationService.getProperty("ldn.notify.inbox"));
+        ldn.addArgument(configurationService.getProperty("dspace.name"));
+        ldn.addArgument(Objects.requireNonNullElse(ldnMessage.getTarget().getUrl(), ""));
+        ldn.addArgument(Objects.requireNonNullElse(ldnMessage.getTarget().getLdnUrl(), ""));
+        ldn.addArgument(getUiUrl() + "/handle/" + ldnMessage.getObject().getHandle());
+        ldn.addArgument(getIdentifierUri(item));
+        ldn.addArgument(generateBitstreamDownloadUrl(item));
+        ldn.addArgument(getBitstreamMimeType(findPrimaryBitstream(item)));
+        ldn.addArgument(ldnMessage.getID());
+        ldn.addArgument(getRelationUri(item));
+        ldn.addArgument("http://purl.org/vocab/frbr/core#supplement");
+        ldn.addArgument(format("urn:uuid:%s", UUID.randomUUID()));
+
+        ldnMessage.setMessage(ldn.generateLDNMessage());
+    }
+
+    private String getUiUrl() {
+        return configurationService.getProperty("dspace.ui.url");
+    }
+
+    private String getIdentifierUri(Item item) {
+        return itemService.getMetadataByMetadataString(item, "dc.identifier.uri")
+                          .stream()
+                          .findFirst()
+                          .map(MetadataValue::getValue)
+                          .orElse("");
+    }
+
+    private String getRelationUri(Item item) {
+        String relationMetadata = configurationService.getProperty("ldn.notify.relation.metadata", "dc.relation");
+        return itemService.getMetadataByMetadataString(item, relationMetadata)
+                          .stream()
+                          .findFirst()
+                          .map(MetadataValue::getValue)
+                          .orElse("");
+    }
+
+    private String generateBitstreamDownloadUrl(Item item) {
+        String uiUrl = getUiUrl();
+        return findPrimaryBitstream(item)
+            .map(bs -> uiUrl + "/bitstreams/" + bs.getID() + "/download")
+            .orElse("");
+    }
+
+    private Optional<Bitstream> findPrimaryBitstream(Item item) {
+        List<Bundle> bundles = item.getBundles(Constants.CONTENT_BUNDLE_NAME);
+        return bundles.stream()
+                      .findFirst()
+                      .map(Bundle::getPrimaryBitstream)
+                      .or(() -> bundles.stream()
+                                       .findFirst()
+                                       .flatMap(bundle -> CollectionUtils.isNotEmpty(bundle.getBitstreams())
+                                           ? Optional.of(bundle.getBitstreams().get(0))
+                                           : Optional.empty()));
+    }
+
+    private String getBitstreamMimeType(Optional<Bitstream> bitstream) {
+        return bitstream.map(bs -> {
+            try {
+                Context context = ContextUtil.obtainCurrentRequestContext();
+                BitstreamFormat bitstreamFormat = bs.getFormat(context);
+                if (bitstreamFormat.getShortDescription().equals("Unknown")) {
+                    return getUserFormatMimeType(bs);
+                }
+                return bitstreamFormat.getMIMEType();
+            } catch (SQLException e) {
+                throw new RuntimeException(e);
+            }
+        }).orElse("");
+    }
+
+    private String getUserFormatMimeType(Bitstream bitstream) {
+        return bitstreamService.getMetadataFirstValue(bitstream,
+            "dc", "format", "mimetype", Item.ANY);
+    }
+
+    @Override
+    public void end(Context ctx) throws Exception {
+
+    }
+
+    @Override
+    public void finish(Context ctx) throws Exception {
+
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageEntity.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageEntity.java
new file mode 100644
index 0000000000..27257455e0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageEntity.java
@@ -0,0 +1,319 @@
+/**
+ * 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.ldn;
+
+import java.lang.reflect.Field;
+import java.util.Date;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import org.dspace.content.DSpaceObject;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Class representing ldnMessages stored in the DSpace system and, when locally resolvable,
+ * some information are stored as dedicated attributes.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "ldn_message")
+public class LDNMessageEntity implements ReloadableEntity<String> {
+
+    /**
+     * LDN messages interact with a fictitious queue. Scheduled tasks manage the queue.
+     */
+
+    /*
+     * Notification Type constants
+     */
+    public static final String TYPE_INCOMING = "Incoming";
+    public static final String TYPE_OUTGOING = "Outgoing";
+
+    /**
+     * Message must not be processed.
+     */
+    public static final Integer QUEUE_STATUS_UNTRUSTED_IP = 0;
+
+    /**
+    * Message queued, it has to be elaborated.
+    */
+    public static final Integer QUEUE_STATUS_QUEUED = 1;
+
+    /**
+     * Message has been taken from the queue and it's elaboration is in progress.
+     */
+    public static final Integer QUEUE_STATUS_PROCESSING = 2;
+
+    /**
+     * Message has been correctly elaborated.
+     */
+    public static final Integer QUEUE_STATUS_PROCESSED = 3;
+
+    /**
+     * Message has not been correctly elaborated - despite more than "ldn.processor.max.attempts" retryies
+     */
+    public static final Integer QUEUE_STATUS_FAILED = 4;
+
+    /**
+     * Message must not be processed
+     */
+    public static final Integer QUEUE_STATUS_UNTRUSTED = 5;
+
+    /**
+     * Message is not processed since action is not mapped
+     */
+    public static final Integer QUEUE_STATUS_UNMAPPED_ACTION = 6;
+
+    /**
+     * Message queued for retry, it has to be elaborated.
+     */
+    public static final Integer QUEUE_STATUS_QUEUED_FOR_RETRY = 7;
+
+    @Id
+    private String id;
+
+    @ManyToOne
+    @JoinColumn(name = "object", referencedColumnName = "uuid")
+    private DSpaceObject object;
+
+    @Column(name = "message", columnDefinition = "text")
+    private String message;
+
+    @Column(name = "type")
+    private String type;
+
+    @Column(name = "queue_status")
+    private Integer queueStatus;
+
+    @Column(name = "queue_attempts")
+    private Integer queueAttempts = 0;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "queue_last_start_time")
+    private Date queueLastStartTime = null;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "queue_timeout")
+    private Date queueTimeout = null;
+
+    @ManyToOne
+    @JoinColumn(name = "origin", referencedColumnName = "id")
+    private NotifyServiceEntity origin;
+
+    @ManyToOne
+    @JoinColumn(name = "target", referencedColumnName = "id")
+    private NotifyServiceEntity target;
+
+    @ManyToOne
+    @JoinColumn(name = "inReplyTo", referencedColumnName = "id")
+    private LDNMessageEntity inReplyTo;
+
+    @ManyToOne
+    @JoinColumn(name = "context", referencedColumnName = "uuid")
+    private DSpaceObject context;
+
+    @Column(name = "activity_stream_type")
+    private String activityStreamType;
+
+    @Column(name = "coar_notify_type")
+    private String coarNotifyType;
+
+    @Column(name = "source_ip")
+    private String sourceIp;
+
+    protected LDNMessageEntity() {
+
+    }
+
+    public LDNMessageEntity(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getID() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * 
+     * @return the DSpace item related to this message
+     */
+    public DSpaceObject getObject() {
+        return object;
+    }
+
+    public void setObject(DSpaceObject object) {
+        this.object = object;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getActivityStreamType() {
+        return activityStreamType;
+    }
+
+    public void setActivityStreamType(String activityStreamType) {
+        this.activityStreamType = activityStreamType;
+    }
+
+    public String getCoarNotifyType() {
+        return coarNotifyType;
+    }
+
+    public void setCoarNotifyType(String coarNotifyType) {
+        this.coarNotifyType = coarNotifyType;
+    }
+
+    /**
+     * 
+     * @return The originator of the activity, typically the service responsible for sending the notification
+     */
+    public NotifyServiceEntity getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(NotifyServiceEntity origin) {
+        this.origin = origin;
+    }
+
+    /**
+     * 
+     * @return The intended destination of the activity, typically the service which consumes the notification
+     */
+    public NotifyServiceEntity getTarget() {
+        return target;
+    }
+
+    public void setTarget(NotifyServiceEntity target) {
+        this.target = target;
+    }
+
+    /**
+     * 
+     * @return This property is used when the notification is a direct response to a previous notification;
+     * contains an {@link org.dspace.app.ldn.LDNMessageEntity#inReplyTo id}
+     */
+    public LDNMessageEntity getInReplyTo() {
+        return inReplyTo;
+    }
+
+    public void setInReplyTo(LDNMessageEntity inReplyTo) {
+        this.inReplyTo = inReplyTo;
+    }
+
+    /**
+     * 
+     * @return This identifies another resource which is relevant to understanding the notification
+     */
+    public DSpaceObject getContext() {
+        return context;
+    }
+
+    public void setContext(DSpaceObject context) {
+        this.context = context;
+    }
+
+    public Integer getQueueStatus() {
+        return queueStatus;
+    }
+
+    public void setQueueStatus(Integer queueStatus) {
+        this.queueStatus = queueStatus;
+    }
+
+    public Integer getQueueAttempts() {
+        return queueAttempts;
+    }
+
+    public void setQueueAttempts(Integer queueAttempts) {
+        this.queueAttempts = queueAttempts;
+    }
+
+    public Date getQueueLastStartTime() {
+        return queueLastStartTime;
+    }
+
+    public void setQueueLastStartTime(Date queueLastStartTime) {
+        this.queueLastStartTime = queueLastStartTime;
+    }
+
+    public Date getQueueTimeout() {
+        return queueTimeout;
+    }
+
+    public void setQueueTimeout(Date queueTimeout) {
+        this.queueTimeout = queueTimeout;
+    }
+
+    public String getSourceIp() {
+        return sourceIp;
+    }
+
+    public void setSourceIp(String sourceIp) {
+        this.sourceIp = sourceIp;
+    }
+
+    @Override
+    public String toString() {
+        return "LDNMessage id:" + this.getID() + " typed:" + this.getType();
+    }
+
+    public static String getNotificationType(LDNMessageEntity ldnMessage) {
+        if (ldnMessage.getInReplyTo() != null || ldnMessage.getOrigin() != null) {
+            return TYPE_INCOMING;
+        }
+        return TYPE_OUTGOING;
+    }
+
+    public static String getServiceNameForNotifyServ(NotifyServiceEntity serviceEntity) {
+        if (serviceEntity != null) {
+            return serviceEntity.getName();
+        }
+        return "self";
+    }
+
+    public static String getQueueStatus(LDNMessageEntity ldnMessage) {
+        Class<LDNMessageEntity> cl = LDNMessageEntity.class;
+        try {
+            for (Field f : cl.getDeclaredFields()) {
+                String fieldName = f.getName();
+                if (fieldName.startsWith("QUEUE_") && (f.get(null) == ldnMessage.getQueueStatus())) {
+                    return fieldName;
+                }
+            }
+        } catch (IllegalArgumentException | IllegalAccessException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+}
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/servlet/package-info.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageQueueStatus.java
similarity index 52%
rename from dspace-services/src/main/java/org/dspace/servicemanager/servlet/package-info.java
rename to dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageQueueStatus.java
index 652c887e04..ad3dd36e69 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/servlet/package-info.java
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMessageQueueStatus.java
@@ -5,10 +5,12 @@
  *
  * http://www.dspace.org/license/
  */
+package org.dspace.app.ldn;
 
-/**
- * Support for using DSpace Services in a servlet context.  This is how the
- * kernel and services get started by the servlet container.
- */
+public enum LDNMessageQueueStatus {
 
-package org.dspace.servicemanager.servlet;
+    /**
+     * Resulting processing status of an LDN Message (aka queue management)
+     */
+    QUEUED, PROCESSING, PROCESSED, FAILED;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/LDNMetadataFields.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMetadataFields.java
new file mode 100644
index 0000000000..67a87c144c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNMetadataFields.java
@@ -0,0 +1,38 @@
+/**
+ * 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.ldn;
+
+/**
+ * Constants for LDN metadata fields
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public final class LDNMetadataFields {
+
+    // schema and element are the same for each metadata of LDN coar-notify
+    public static final String SCHEMA = "coar";
+    public static final String ELEMENT = "notify";
+
+    // qualifiers
+    public static final String INITIALIZE = "initialize";
+    public static final String REQUEST_REVIEW = "requestreview";
+    public static final String REQUEST_ENDORSEMENT = "requestendorsement";
+    public static final String EXAMINATION = "examination";
+    public static final String REFUSED = "refused";
+    public static final String REVIEW = "review";
+    public static final String ENDORSMENT = "endorsement";
+    public static final String RELEASE = "release";
+
+    /**
+     * 
+     */
+    private LDNMetadataFields() {
+
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueExtractor.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueExtractor.java
new file mode 100644
index 0000000000..57a7cdfb07
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueExtractor.java
@@ -0,0 +1,54 @@
+/**
+ * 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.ldn;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.factory.LDNMessageServiceFactory;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.core.Context;
+
+/**
+ * LDN Message manager: scheduled task invoking extractAndProcessMessageFromQueue() of {@link LDNMessageService}
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class LDNQueueExtractor {
+
+    private static final LDNMessageService ldnMessageService = LDNMessageServiceFactory.getInstance()
+        .getLDNMessageService();
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNQueueExtractor.class);
+
+    /**
+     * Default constructor
+     */
+    private LDNQueueExtractor() {
+    }
+
+    /**
+     * invokes
+     * @see org.dspace.app.ldn.service.impl.LDNMessageServiceImpl#extractAndProcessMessageFromQueue(Context)
+     * to process the oldest ldn messages from the queue. An LdnMessage is processed when is routed to a
+     * @see org.dspace.app.ldn.processor.LDNProcessor
+     * Also a +1 is added to the ldnMessage entity
+     * @see org.dspace.app.ldn.LDNMessageEntity#getQueueAttempts()
+     * @return the number of processed ldnMessages.
+     * @throws SQLException
+     */
+    public static int extractMessageFromQueue() throws SQLException {
+        Context context = new Context(Context.Mode.READ_WRITE);
+        int processed_messages = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        if (processed_messages > 0) {
+            log.info("Processed Messages x" + processed_messages);
+        }
+        context.complete();
+        return processed_messages;
+    }
+
+};
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueTimeoutChecker.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueTimeoutChecker.java
new file mode 100644
index 0000000000..36a927d672
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNQueueTimeoutChecker.java
@@ -0,0 +1,53 @@
+/**
+ * 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.ldn;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.factory.LDNMessageServiceFactory;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.core.Context;
+
+/**
+ * LDN Message manager: scheduled task invoking checkQueueMessageTimeout() of {@link LDNMessageService}
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class LDNQueueTimeoutChecker {
+
+    private static final LDNMessageService ldnMessageService = LDNMessageServiceFactory.getInstance()
+        .getLDNMessageService();
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNQueueTimeoutChecker.class);
+
+    /**
+     * Default constructor
+     */
+    private LDNQueueTimeoutChecker() {
+    }
+
+    /**
+     * invokes
+     * @see org.dspace.app.ldn.service.impl.LDNMessageServiceImpl#checkQueueMessageTimeout(Context)
+     * to refresh the queue status of timed-out and in progressing status ldn messages:
+     * according to their attempts put them back in queue or set their status as failed if maxAttempts
+     * reached.
+     * @return the number of managed ldnMessages.
+     * @throws SQLException
+     */
+    public static int checkQueueMessageTimeout() throws SQLException {
+        Context context = new Context(Context.Mode.READ_WRITE);
+        int fixed_messages = 0;
+        fixed_messages = ldnMessageService.checkQueueMessageTimeout(context);
+        if (fixed_messages > 0) {
+            log.info("Managed Messages x" + fixed_messages);
+        }
+        context.complete();
+        return fixed_messages;
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/LDNRouter.java b/dspace-api/src/main/java/org/dspace/app/ldn/LDNRouter.java
new file mode 100644
index 0000000000..14957aa503
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/LDNRouter.java
@@ -0,0 +1,91 @@
+/**
+ * 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.ldn;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.processor.LDNProcessor;
+
+/**
+ * Linked Data Notification router.
+ */
+public class LDNRouter {
+
+    private Map<Set<String>, LDNProcessor> incomingProcessors = new HashMap<>();
+    private Map<Set<String>, LDNProcessor> outcomingProcessors = new HashMap<>();
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNRouter.class);
+
+    /**
+     * Route notification to processor
+     * 
+     * @return LDNProcessor processor to process notification, can be null
+     */
+    public LDNProcessor route(LDNMessageEntity ldnMessage) {
+        if (ldnMessage == null) {
+            log.warn("A null LDNMessage was received and could not be routed.");
+            return null;
+        }
+        if (StringUtils.isEmpty(ldnMessage.getType())) {
+            log.warn("LDNMessage " + ldnMessage + " was received. It has no type, so it couldn't be routed.");
+            return null;
+        }
+        Set<String> ldnMessageTypeSet = new HashSet<String>();
+        ldnMessageTypeSet.add(ldnMessage.getActivityStreamType());
+        ldnMessageTypeSet.add(ldnMessage.getCoarNotifyType());
+
+        LDNProcessor processor = null;
+        if (ldnMessage.getTarget() == null) {
+            processor = incomingProcessors.get(ldnMessageTypeSet);
+        } else if (ldnMessage.getOrigin() == null) {
+            processor = outcomingProcessors.get(ldnMessageTypeSet);
+        }
+
+        return processor;
+    }
+
+    /**
+     * Get all incoming routes.
+     *
+     * @return Map<Set<String>, LDNProcessor>
+     */
+    public Map<Set<String>, LDNProcessor> getIncomingProcessors() {
+        return incomingProcessors;
+    }
+
+    /**
+     * Set all incoming routes.
+     *
+     * @param incomingProcessors
+     */
+    public void setIncomingProcessors(Map<Set<String>, LDNProcessor> incomingProcessors) {
+        this.incomingProcessors = incomingProcessors;
+    }
+
+    /**
+     * Get all outcoming routes.
+     *
+     * @return Map<Set<String>, LDNProcessor>
+     */
+    public Map<Set<String>, LDNProcessor> getOutcomingProcessors() {
+        return outcomingProcessors;
+    }
+
+    /**
+     * Set all outcoming routes.
+     *
+     * @param outcomingProcessors
+     */
+    public void setOutcomingProcessors(Map<Set<String>, LDNProcessor> outcomingProcessors) {
+        this.outcomingProcessors = outcomingProcessors;
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/NotifyPatternToTrigger.java b/dspace-api/src/main/java/org/dspace/app/ldn/NotifyPatternToTrigger.java
new file mode 100644
index 0000000000..da23471a1c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/NotifyPatternToTrigger.java
@@ -0,0 +1,82 @@
+/**
+ * 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.ldn;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.dspace.content.Item;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database object representing notify patterns to be triggered
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "notifypatterns_to_trigger")
+public class NotifyPatternToTrigger implements ReloadableEntity<Integer> {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notifypatterns_to_trigger_id_seq")
+    @SequenceGenerator(name = "notifypatterns_to_trigger_id_seq",
+        sequenceName = "notifypatterns_to_trigger_id_seq",
+        allocationSize = 1)
+    private Integer id;
+
+    @ManyToOne
+    @JoinColumn(name = "item_id", referencedColumnName = "uuid")
+    private Item item;
+
+    @ManyToOne
+    @JoinColumn(name = "service_id", referencedColumnName = "id")
+    private NotifyServiceEntity notifyService;
+
+    @Column(name = "pattern")
+    private String pattern;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public void setItem(Item item) {
+        this.item = item;
+    }
+
+    public NotifyServiceEntity getNotifyService() {
+        return notifyService;
+    }
+
+    public void setNotifyService(NotifyServiceEntity notifyService) {
+        this.notifyService = notifyService;
+    }
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceEntity.java b/dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceEntity.java
new file mode 100644
index 0000000000..c939256b52
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceEntity.java
@@ -0,0 +1,156 @@
+/**
+ * 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.ldn;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database object representing notify services
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "notifyservice")
+public class NotifyServiceEntity implements ReloadableEntity<Integer> {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notifyservice_id_seq")
+    @SequenceGenerator(name = "notifyservice_id_seq", sequenceName = "notifyservice_id_seq",
+        allocationSize = 1)
+    private Integer id;
+
+    @Column(name = "name", nullable = false)
+    private String name;
+
+    @Column(name = "description", columnDefinition = "text")
+    private String description;
+
+    @Column(name = "url")
+    private String url;
+
+    @Column(name = "ldn_url")
+    private String ldnUrl;
+
+    @OneToMany(mappedBy = "notifyService")
+    private List<NotifyServiceInboundPattern> inboundPatterns;
+
+    @Column(name = "enabled")
+    private boolean enabled = false;
+
+    @Column(name = "score")
+    private BigDecimal score;
+
+    @Column(name = "lower_ip")
+    private String lowerIp;
+
+    @Column(name = "upper_ip")
+    private String upperIp;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    /**
+     * @return URL of an informative website
+     */
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    /**
+     * @return URL of the LDN InBox
+     */
+    public String getLdnUrl() {
+        return ldnUrl;
+    }
+
+    public void setLdnUrl(String ldnUrl) {
+        this.ldnUrl = ldnUrl;
+    }
+
+    /**
+     * @return The list of the inbound patterns configuration supported by the service
+     */
+    public List<NotifyServiceInboundPattern> getInboundPatterns() {
+        return inboundPatterns;
+    }
+
+    public void setInboundPatterns(List<NotifyServiceInboundPattern> inboundPatterns) {
+        this.inboundPatterns = inboundPatterns;
+    }
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    public String getLowerIp() {
+        return lowerIp;
+    }
+
+    public void setLowerIp(String lowerIp) {
+        this.lowerIp = lowerIp;
+    }
+
+    public String getUpperIp() {
+        return upperIp;
+    }
+
+    public void setUpperIp(String upperIp) {
+        this.upperIp = upperIp;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceInboundPattern.java b/dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceInboundPattern.java
new file mode 100644
index 0000000000..329d6cb11c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/NotifyServiceInboundPattern.java
@@ -0,0 +1,103 @@
+/**
+ * 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.ldn;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import org.dspace.core.ReloadableEntity;
+
+/**
+ * Database object representing notify service inbound patterns. Every {@link org.dspace.app.ldn.NotifyServiceEntity}
+ * may have inbounds and outbounds. Inbounds are to be sent to the external service.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Entity
+@Table(name = "notifyservice_inbound_pattern")
+public class NotifyServiceInboundPattern implements ReloadableEntity<Integer> {
+
+    @Id
+    @Column(name = "id")
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "notifyservice_inbound_pattern_id_seq")
+    @SequenceGenerator(name = "notifyservice_inbound_pattern_id_seq",
+        sequenceName = "notifyservice_inbound_pattern_id_seq",
+        allocationSize = 1)
+    private Integer id;
+
+    @ManyToOne
+    @JoinColumn(name = "service_id", referencedColumnName = "id")
+    private NotifyServiceEntity notifyService;
+
+    @Column(name = "pattern")
+    private String pattern;
+
+    @Column(name = "constraint_name")
+    private String constraint;
+
+    @Column(name = "automatic")
+    private boolean automatic;
+
+    @Override
+    public Integer getID() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public NotifyServiceEntity getNotifyService() {
+        return notifyService;
+    }
+
+    public void setNotifyService(NotifyServiceEntity notifyService) {
+        this.notifyService = notifyService;
+    }
+
+    /**
+     * @see <a href="https://notify.coar-repositories.org/patterns">coar documentation</a>
+     * @return pattern of the inbound notification
+     */
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    /**
+     * @return the condition checked for automatic evaluation
+     */
+    public String getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(String constraint) {
+        this.constraint = constraint;
+    }
+
+    /**
+     * when true - the notification is automatically when constraints are respected.
+     * @return the automatic flag
+     */
+    public boolean isAutomatic() {
+        return automatic;
+    }
+
+    public void setAutomatic(boolean automatic) {
+        this.automatic = automatic;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNAction.java b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNAction.java
new file mode 100644
index 0000000000..b0c895de99
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNAction.java
@@ -0,0 +1,31 @@
+/**
+ * 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.ldn.action;
+
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * An action that is run after a notification has been processed.
+ */
+public interface LDNAction {
+
+    /**
+     * Execute action for provided notification and item corresponding to the
+     * notification context.
+     *
+     *@param context  the context
+     * @param notification the processed notification to perform action against
+     * @param item         the item corresponding to the notification context
+     * @return ActionStatus the resulting status of the action
+     * @throws Exception general exception that can be thrown while executing action
+     */
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception;
+
+}
\ No newline at end of file
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterList.java b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNActionStatus.java
similarity index 60%
rename from dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterList.java
rename to dspace-api/src/main/java/org/dspace/app/ldn/action/LDNActionStatus.java
index f6590e36f8..86f56ed9ba 100644
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterList.java
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNActionStatus.java
@@ -5,8 +5,11 @@
  *
  * http://www.dspace.org/license/
  */
-package org.dspace.rest.filter;
+package org.dspace.app.ldn.action;
 
-public interface ItemFilterList {
-    public ItemFilterTest[] getFilters();
-}
+/**
+ * Resulting status of an execution of an action.
+ */
+public enum LDNActionStatus {
+    CONTINUE, ABORT;
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNCorrectionAction.java b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNCorrectionAction.java
new file mode 100644
index 0000000000..5ce3804bce
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNCorrectionAction.java
@@ -0,0 +1,108 @@
+/**
+ * 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.ldn.action;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Implementation for LDN Correction Action. It creates a QA Event according to the LDN Message received *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class LDNCorrectionAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(LDNEmailAction.class);
+
+    private String qaEventTopic;
+
+    @Autowired
+    private ConfigurationService configurationService;
+    @Autowired
+    protected ItemService itemService;
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private LDNMessageService ldnMessageService;
+    @Autowired
+    private HandleService handleService;
+
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        String itemName = itemService.getName(item);
+        QAEvent qaEvent = null;
+        if (notification.getObject() != null) {
+            String citeAs = notification.getObject().getIetfCiteAs();
+            if (citeAs == null || citeAs.isEmpty()) {
+                citeAs = notification.getObject().getId();
+            }
+            NotifyMessageDTO message = new NotifyMessageDTO();
+            message.setHref(citeAs);
+            message.setRelationship(notification.getObject().getAsRelationship());
+            if (notification.getOrigin() != null) {
+                message.setServiceId(notification.getOrigin().getId());
+                message.setServiceName(notification.getOrigin().getInbox());
+            }
+            BigDecimal score = getScore(context, notification);
+            double doubleScoreValue = score != null ? score.doubleValue() : 0d;
+            ObjectMapper mapper = new ObjectMapper();
+            qaEvent = new QAEvent(QAEvent.COAR_NOTIFY_SOURCE,
+                handleService.findHandle(context, item), item.getID().toString(), itemName,
+                this.getQaEventTopic(), doubleScoreValue,
+                mapper.writeValueAsString(message),
+                new Date());
+            qaEventService.store(context, qaEvent);
+            result = LDNActionStatus.CONTINUE;
+        }
+
+        return result;
+    }
+
+    private BigDecimal getScore(Context context, Notification notification) throws SQLException {
+
+        if (notification.getOrigin() == null) {
+            return BigDecimal.ZERO;
+        }
+
+        NotifyServiceEntity service = ldnMessageService.findNotifyService(context, notification.getOrigin());
+
+        if (service == null) {
+            return BigDecimal.ZERO;
+        }
+
+        return service.getScore();
+    }
+
+    public String getQaEventTopic() {
+        return qaEventTopic;
+    }
+
+    public void setQaEventTopic(String qaEventTopic) {
+        this.qaEventTopic = qaEventTopic;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNEmailAction.java b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNEmailAction.java
new file mode 100644
index 0000000000..32b115bd07
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNEmailAction.java
@@ -0,0 +1,155 @@
+/**
+ * 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.ldn.action;
+
+import static java.lang.String.format;
+
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Action to send email to recipients provided in actionSendFilter. The email
+ * body will be result of templating actionSendFilter.
+ */
+public class LDNEmailAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(LDNEmailAction.class);
+
+    private final static String DATE_PATTERN = "dd-MM-yyyy HH:mm:ss";
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    /*
+     * Supported for actionSendFilter are:
+     * - <single email>
+     * - GROUP:<group_name>
+     * - SUBMITTER
+     */
+    private String actionSendFilter;
+
+    // The file name for the requested email
+    private String actionSendEmailTextFile;
+
+    /**
+     * Execute sending an email.
+     *
+     * Template context parameters:
+     *
+     * {0} Service Name
+     * {1} Item Name
+     * {2} Service URL
+     * {3} Item URL
+     * {4} Submitter's Name
+     * {5} Date of the received LDN notification
+     * {6} LDN notification
+     * {7} Item
+     *
+     * @param notification
+     * @param item
+     * @return ActionStatus
+     * @throws Exception
+     */
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        try {
+            Locale supportedLocale = I18nUtil.getEPersonLocale(context.getCurrentUser());
+            Email email = Email.getEmail(I18nUtil.getEmailFilename(supportedLocale, actionSendEmailTextFile));
+
+            // Setting recipients email
+            for (String recipient : retrieveRecipientsEmail(item)) {
+                email.addRecipient(recipient);
+            }
+
+            String date = new SimpleDateFormat(DATE_PATTERN).format(Calendar.getInstance().getTime());
+
+            email.addArgument(notification.getActor().getName());
+            email.addArgument(item.getName());
+            email.addArgument(notification.getActor().getId());
+            email.addArgument(notification.getContext() != null ?
+                notification.getContext().getId() : notification.getObject().getId());
+            email.addArgument(item.getSubmitter().getFullName());
+            email.addArgument(date);
+            email.addArgument(notification);
+            email.addArgument(item);
+
+            email.send();
+        } catch (Exception e) {
+            log.error("An Error Occurred while sending a notification email", e);
+        }
+
+        return LDNActionStatus.CONTINUE;
+    }
+
+    /**
+     * @return String
+     */
+    public String getActionSendFilter() {
+        return actionSendFilter;
+    }
+
+    /**
+     * @param actionSendFilter
+     */
+    public void setActionSendFilter(String actionSendFilter) {
+        this.actionSendFilter = actionSendFilter;
+    }
+
+    /**
+     * @return String
+     */
+    public String getActionSendEmailTextFile() {
+        return actionSendEmailTextFile;
+    }
+
+    /**
+     * @param actionSendEmailTextFile
+     */
+    public void setActionSendEmailTextFile(String actionSendEmailTextFile) {
+        this.actionSendEmailTextFile = actionSendEmailTextFile;
+    }
+
+    /**
+     * Parses actionSendFilter for reserved tokens and returns list of email
+     * recipients.
+     *
+     * @param item the item which to get submitter email
+     * @return List<String> list of email recipients
+     */
+    private List<String> retrieveRecipientsEmail(Item item) {
+        List<String> recipients = new LinkedList<String>();
+
+        if (actionSendFilter.startsWith("SUBMITTER")) {
+            recipients.add(item.getSubmitter().getEmail());
+        } else if (actionSendFilter.startsWith("GROUP:")) {
+            String groupName = actionSendFilter.replace("GROUP:", "");
+            String property = format("email.%s.list", groupName);
+            String[] groupEmails = configurationService.getArrayProperty(property);
+            recipients = Arrays.asList(groupEmails);
+        } else {
+            recipients.add(actionSendFilter);
+        }
+
+        return recipients;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNRelationCorrectionAction.java b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNRelationCorrectionAction.java
new file mode 100644
index 0000000000..f11a42ab2f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/action/LDNRelationCorrectionAction.java
@@ -0,0 +1,110 @@
+/**
+ * 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.ldn.action;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.Set;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Implementation for LDN Correction Action. It creates a QA Event according to the LDN Message received *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class LDNRelationCorrectionAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(LDNEmailAction.class);
+
+    private String qaEventTopic;
+
+    @Autowired
+    private ConfigurationService configurationService;
+    @Autowired
+    protected ItemService itemService;
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private LDNMessageService ldnMessageService;
+    @Autowired
+    private HandleService handleService;
+
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        String itemName = itemService.getName(item);
+        QAEvent qaEvent = null;
+        if (notification.getObject() != null) {
+            NotifyMessageDTO message = new NotifyMessageDTO();
+            if (notification.getType().containsAll(Set.of("Announce",
+                "coar-notify:RelationshipAction"))) {
+                message.setHref(notification.getObject().getAsSubject());
+            } else {
+                message.setHref(notification.getObject().getAsObject());
+            }
+            message.setRelationship(notification.getObject().getAsRelationship());
+            if (notification.getOrigin() != null) {
+                message.setServiceId(notification.getOrigin().getId());
+                message.setServiceName(notification.getOrigin().getInbox());
+            }
+            BigDecimal score = getScore(context, notification);
+            double doubleScoreValue = score != null ? score.doubleValue() : 0d;
+            ObjectMapper mapper = new ObjectMapper();
+            qaEvent = new QAEvent(QAEvent.COAR_NOTIFY_SOURCE,
+                handleService.findHandle(context, item), item.getID().toString(), itemName,
+                this.getQaEventTopic(), doubleScoreValue,
+                mapper.writeValueAsString(message),
+                new Date());
+            qaEventService.store(context, qaEvent);
+            result = LDNActionStatus.CONTINUE;
+        }
+
+        return result;
+    }
+
+    private BigDecimal getScore(Context context, Notification notification) throws SQLException {
+
+        if (notification.getOrigin() == null) {
+            return BigDecimal.ZERO;
+        }
+
+        NotifyServiceEntity service = ldnMessageService.findNotifyService(context, notification.getOrigin());
+
+        if (service == null) {
+            return BigDecimal.ZERO;
+        }
+
+        return service.getScore();
+    }
+
+    public String getQaEventTopic() {
+        return qaEventTopic;
+    }
+
+    public void setQaEventTopic(String qaEventTopic) {
+        this.qaEventTopic = qaEventTopic;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/action/SendLDNMessageAction.java b/dspace-api/src/main/java/org/dspace/app/ldn/action/SendLDNMessageAction.java
new file mode 100644
index 0000000000..c0ecf04304
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/action/SendLDNMessageAction.java
@@ -0,0 +1,118 @@
+/**
+ * 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.ldn.action;
+
+import java.net.URI;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.http.Header;
+import org.apache.http.HttpException;
+import org.apache.http.HttpHeaders;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Action to send LDN Message
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class SendLDNMessageAction implements LDNAction {
+
+    private static final Logger log = LogManager.getLogger(SendLDNMessageAction.class);
+
+    private CloseableHttpClient client = null;
+
+    public SendLDNMessageAction() {
+        HttpClientBuilder builder = HttpClientBuilder.create();
+        client = builder
+            .disableAutomaticRetries()
+            .setMaxConnTotal(5)
+            .build();
+    }
+
+    public SendLDNMessageAction(CloseableHttpClient client) {
+        this();
+        if (client != null) {
+            this.client = client;
+        }
+    }
+
+    @Override
+    public LDNActionStatus execute(Context context, Notification notification, Item item) throws Exception {
+        //TODO authorization with Bearer token should be supported.
+
+        String url = notification.getTarget().getInbox();
+
+        HttpPost httpPost = new HttpPost(url);
+        httpPost.addHeader("Content-Type", "application/ld+json");
+        ObjectMapper mapper = new ObjectMapper();
+        httpPost.setEntity(new StringEntity(mapper.writeValueAsString(notification), "UTF-8"));
+
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        // NOTE: Github believes there is a "Potential server-side request forgery due to a user-provided value"
+        // This is a false positive because the LDN Service URL is configured by the user from DSpace.
+        // See the frontend configuration at [dspace.ui.url]/admin/ldn/services
+        try (
+            CloseableHttpResponse response = client.execute(httpPost);
+            ) {
+            if (isSuccessful(response.getStatusLine().getStatusCode())) {
+                result = LDNActionStatus.CONTINUE;
+            } else if (isRedirect(response.getStatusLine().getStatusCode())) {
+                result = handleRedirect(response, httpPost);
+            }
+        } catch (Exception e) {
+            log.error(e);
+        }
+        return result;
+    }
+
+    private boolean isSuccessful(int statusCode) {
+        return statusCode == HttpStatus.SC_ACCEPTED ||
+            statusCode == HttpStatus.SC_CREATED;
+    }
+
+    private boolean isRedirect(int statusCode) {
+        //org.apache.http.HttpStatus has no enum value for 308!
+        return statusCode == (HttpStatus.SC_TEMPORARY_REDIRECT + 1) ||
+            statusCode == HttpStatus.SC_TEMPORARY_REDIRECT;
+    }
+
+    private LDNActionStatus handleRedirect(CloseableHttpResponse oldresponse,
+                                        HttpPost request) throws HttpException {
+        Header[] urls = oldresponse.getHeaders(HttpHeaders.LOCATION);
+        String url = urls.length > 0 && urls[0] != null ? urls[0].getValue() : null;
+        if (url == null) {
+            throw new HttpException("Error following redirect, unable to reach"
+                + " the correct url.");
+        }
+        LDNActionStatus result = LDNActionStatus.ABORT;
+        try {
+            request.setURI(new URI(url));
+            try (
+                CloseableHttpResponse response = client.execute(request);
+                ) {
+                if (isSuccessful(response.getStatusLine().getStatusCode())) {
+                    return LDNActionStatus.CONTINUE;
+                }
+            }
+        } catch (Exception e) {
+            log.error("Error following redirect:", e);
+        }
+
+        return LDNActionStatus.ABORT;
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/LDNMessageDao.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/LDNMessageDao.java
new file mode 100644
index 0000000000..fcbb485aca
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/LDNMessageDao.java
@@ -0,0 +1,76 @@
+/**
+ * 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.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * Database Access Object interface class for the LDNMessage object.
+ *
+ * The implementation of this class is responsible for all database calls for
+ * the LDNMessage object and is autowired by spring
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface LDNMessageDao extends GenericDAO<LDNMessageEntity> {
+
+    /**
+     * load the oldest ldn messages considering their {@link org.dspace.app.ldn.LDNMessageEntity#queueLastStartTime}
+     * @param context
+     * @param max_attempts consider ldn_message entity with queue_attempts <= max_attempts
+     * @return ldn message entities to be routed
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findOldestMessageToProcess(Context context, int max_attempts) throws SQLException;
+
+    /**
+     * find ldn message entties in processing status and already timed out.
+     * @param context
+     * @param max_attempts consider ldn_message entity with queue_attempts <= max_attempts
+     * @return ldn message entities
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context, int max_attempts) throws SQLException;
+
+    /**
+     * find all ldn messages related to an item
+     * @param context
+     * @param item item related to the returned ldn messages
+     * @param activities involves only this specific group of activities
+     * @return all ldn messages related to the given item
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findAllMessagesByItem(
+        Context context, Item item, String... activities) throws SQLException;
+
+    /**
+     * find all ldn messages related to an item and to a specific ldn message
+     * @param context
+     * @param msg the referring ldn message
+     * @param item the referring repository item
+     * @param relatedTypes filter for @see org.dspace.app.ldn.LDNMessageEntity#activityStreamType
+     * @return all related ldn messages
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findAllRelatedMessagesByItem(
+        Context context, LDNMessageEntity msg, Item item, String... relatedTypes) throws SQLException;
+
+    /**
+     *
+     * @param context
+     * @return the list of messages in need to be reprocessed - with queue_status as QUEUE_STATUS_QUEUED_FOR_RETRY
+     * @throws SQLException
+     */
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyPatternToTriggerDao.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyPatternToTriggerDao.java
new file mode 100644
index 0000000000..9ecd1b728a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyPatternToTriggerDao.java
@@ -0,0 +1,49 @@
+/**
+ * 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.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * This is the Data Access Object for the {@link NotifyPatternToTrigger} object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyPatternToTriggerDao extends GenericDAO<NotifyPatternToTrigger> {
+
+    /**
+     * find the NotifyPatternToTrigger matched with the provided item
+     *
+     * @param context the context
+     * @param item the item
+     * @return the NotifyPatternToTrigger matched the provided item
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item) throws SQLException;
+
+    /**
+     * find the NotifyPatternToTrigger matched with the provided
+     * item and pattern
+     *
+     * @param context the context
+     * @param item the item
+     * @param pattern the pattern
+     * @return the NotifyPatternToTrigger matched the provided
+     * item and pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException;
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceDao.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceDao.java
new file mode 100644
index 0000000000..9751b30382
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceDao.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.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * This is the Data Access Object for the {@link NotifyServiceEntity} object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyServiceDao extends GenericDAO<NotifyServiceEntity> {
+    /**
+     * find the NotifyServiceEntity matched with the provided ldnUrl
+     *
+     * @param context the context
+     * @param ldnUrl the ldnUrl
+     * @return the NotifyServiceEntity matched the provided ldnUrl
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException;
+
+    /**
+     * find all NotifyServiceEntity matched the provided inbound pattern
+     * from the related notifyServiceInboundPatterns
+     * also with 'automatic' equals to false
+     *
+     * @param context the context
+     * @param pattern the ldnUrl
+     * @return all NotifyServiceEntity matched the provided pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceInboundPatternDao.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceInboundPatternDao.java
new file mode 100644
index 0000000000..194d30e795
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/NotifyServiceInboundPatternDao.java
@@ -0,0 +1,47 @@
+/**
+ * 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.ldn.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+
+/**
+ * This is the Data Access Object for the {@link NotifyServiceInboundPattern} object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyServiceInboundPatternDao extends GenericDAO<NotifyServiceInboundPattern> {
+
+    /**
+     * find all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @param pattern the pattern
+     * @return all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     * @throws SQLException if database error
+     */
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context,
+                                                               NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException;
+    /**
+     * find all automatic notifyServiceInboundPatterns
+     *
+     * @param context the context
+     * @return all automatic notifyServiceInboundPatterns
+     * @throws SQLException if database error
+     */
+    List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/LDNMessageDaoImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/LDNMessageDaoImpl.java
new file mode 100644
index 0000000000..d811f6d39f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/LDNMessageDaoImpl.java
@@ -0,0 +1,169 @@
+/**
+ * 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.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.LDNMessageEntity_;
+import org.dspace.app.ldn.dao.LDNMessageDao;
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Hibernate implementation of the Database Access Object interface class for
+ * the LDNMessage object. This class is responsible for all database calls for
+ * the LDNMessage object and is autowired by spring
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageDaoImpl extends AbstractHibernateDAO<LDNMessageEntity> implements LDNMessageDao {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNMessageDaoImpl.class);
+
+    @Override
+    public List<LDNMessageEntity> findOldestMessageToProcess(Context context, int max_attempts) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>(3);
+        andPredicates
+            .add(criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_QUEUED));
+        andPredicates.add(criteriaBuilder.lessThan(root.get(LDNMessageEntity_.queueAttempts), max_attempts));
+        andPredicates.add(criteriaBuilder.lessThan(root.get(LDNMessageEntity_.queueTimeout), new Date()));
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException {
+        // looking for LDN Messages to be reprocessed message
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>(1);
+        andPredicates
+            .add(criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus),
+                LDNMessageEntity.QUEUE_STATUS_QUEUED_FOR_RETRY));
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context, int max_attempts)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>(3);
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_PROCESSING));
+        andPredicates.add(criteriaBuilder.lessThanOrEqualTo(root.get(LDNMessageEntity_.queueAttempts), max_attempts));
+        andPredicates.add(criteriaBuilder.lessThan(root.get(LDNMessageEntity_.queueTimeout), new Date()));
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findAllRelatedMessagesByItem(
+        Context context, LDNMessageEntity msg, Item item, String... relatedTypes) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>();
+        Predicate relatedtypePredicate = null;
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_PROCESSED));
+        andPredicates.add(
+            criteriaBuilder.isNull(root.get(LDNMessageEntity_.target)));
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.inReplyTo), msg));
+        if (relatedTypes != null && relatedTypes.length > 0) {
+            relatedtypePredicate = root.get(LDNMessageEntity_.activityStreamType).in(relatedTypes);
+            andPredicates.add(relatedtypePredicate);
+        }
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages ACK found to be processed");
+        }
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findAllMessagesByItem(
+        Context context, Item item, String... activities) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<LDNMessageEntity> criteriaQuery = getCriteriaQuery(criteriaBuilder, LDNMessageEntity.class);
+        Root<LDNMessageEntity> root = criteriaQuery.from(LDNMessageEntity.class);
+        criteriaQuery.select(root);
+        List<Predicate> andPredicates = new ArrayList<>();
+        Predicate activityPredicate = null;
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.queueStatus), LDNMessageEntity.QUEUE_STATUS_PROCESSED));
+        andPredicates.add(
+            criteriaBuilder.equal(root.get(LDNMessageEntity_.object), item));
+        if (activities != null && activities.length > 0) {
+            activityPredicate = root.get(LDNMessageEntity_.activityStreamType).in(activities);
+            andPredicates.add(activityPredicate);
+        }
+        criteriaQuery.where(criteriaBuilder.and(andPredicates.toArray(new Predicate[] {})));
+        List<Order> orderList = new LinkedList<>();
+        orderList.add(criteriaBuilder.asc(root.get(LDNMessageEntity_.queueLastStartTime)));
+        orderList.add(criteriaBuilder.desc(root.get(LDNMessageEntity_.queueAttempts)));
+        criteriaQuery.orderBy(orderList);
+        List<LDNMessageEntity> result = list(context, criteriaQuery, false, LDNMessageEntity.class, -1, -1);
+        if (result == null || result.isEmpty()) {
+            log.debug("No LDN messages found");
+        }
+        return result;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyPatternToTriggerDaoImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyPatternToTriggerDaoImpl.java
new file mode 100644
index 0000000000..53cbeabe00
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyPatternToTriggerDaoImpl.java
@@ -0,0 +1,58 @@
+/**
+ * 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.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyPatternToTrigger_;
+import org.dspace.app.ldn.dao.NotifyPatternToTriggerDao;
+import org.dspace.content.Item;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Implementation of {@link NotifyPatternToTriggerDao}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyPatternToTriggerDaoImpl extends AbstractHibernateDAO<NotifyPatternToTrigger>
+    implements NotifyPatternToTriggerDao {
+
+    @Override
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyPatternToTrigger.class);
+        Root<NotifyPatternToTrigger> notifyServiceEntityRoot = criteriaQuery.from(NotifyPatternToTrigger.class);
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.equal(
+            notifyServiceEntityRoot.get(NotifyPatternToTrigger_.item), item));
+        return list(context, criteriaQuery, false, NotifyPatternToTrigger.class, -1, -1);
+    }
+    @Override
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyPatternToTrigger.class);
+        Root<NotifyPatternToTrigger> notifyServiceEntityRoot = criteriaQuery.from(NotifyPatternToTrigger.class);
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.and(
+            criteriaBuilder.equal(
+            notifyServiceEntityRoot.get(NotifyPatternToTrigger_.item), item),
+            criteriaBuilder.equal(
+                notifyServiceEntityRoot.get(NotifyPatternToTrigger_.pattern), pattern)
+            ));
+        return list(context, criteriaQuery, false, NotifyPatternToTrigger.class, -1, -1);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceDaoImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceDaoImpl.java
new file mode 100644
index 0000000000..bb4cf791da
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceDaoImpl.java
@@ -0,0 +1,62 @@
+/**
+ * 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.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceEntity_;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.NotifyServiceInboundPattern_;
+import org.dspace.app.ldn.dao.NotifyServiceDao;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Implementation of {@link NotifyServiceDao}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceDaoImpl extends AbstractHibernateDAO<NotifyServiceEntity> implements NotifyServiceDao {
+
+    @Override
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceEntity.class);
+        Root<NotifyServiceEntity> notifyServiceEntityRoot = criteriaQuery.from(NotifyServiceEntity.class);
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.equal(
+            notifyServiceEntityRoot.get(NotifyServiceEntity_.ldnUrl), ldnUrl));
+        return uniqueResult(context, criteriaQuery, false, NotifyServiceEntity.class);
+    }
+
+    @Override
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceEntity.class);
+        Root<NotifyServiceEntity> notifyServiceEntityRoot = criteriaQuery.from(NotifyServiceEntity.class);
+
+        Join<NotifyServiceEntity, NotifyServiceInboundPattern> notifyServiceInboundPatternJoin =
+            notifyServiceEntityRoot.join(NotifyServiceEntity_.inboundPatterns);
+
+        criteriaQuery.select(notifyServiceEntityRoot);
+        criteriaQuery.where(criteriaBuilder.and(
+                criteriaBuilder.equal(
+                    notifyServiceInboundPatternJoin.get(NotifyServiceInboundPattern_.pattern), pattern),
+                criteriaBuilder.equal(
+                    notifyServiceInboundPatternJoin.get(NotifyServiceInboundPattern_.automatic), false)));
+
+        return list(context, criteriaQuery, false, NotifyServiceEntity.class, -1, -1);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceInboundPatternDaoImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceInboundPatternDaoImpl.java
new file mode 100644
index 0000000000..dc3dc1c744
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/dao/impl/NotifyServiceInboundPatternDaoImpl.java
@@ -0,0 +1,59 @@
+/**
+ * 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.ldn.dao.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.NotifyServiceInboundPattern_;
+import org.dspace.app.ldn.dao.NotifyServiceInboundPatternDao;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+
+/**
+ * Implementation of {@link NotifyServiceInboundPatternDao}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceInboundPatternDaoImpl
+    extends AbstractHibernateDAO<NotifyServiceInboundPattern> implements NotifyServiceInboundPatternDao {
+
+    @Override
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context, NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceInboundPattern.class);
+        Root<NotifyServiceInboundPattern> inboundPatternRoot = criteriaQuery.from(NotifyServiceInboundPattern.class);
+        criteriaQuery.select(inboundPatternRoot);
+        criteriaQuery.where(criteriaBuilder.and(
+            criteriaBuilder.equal(
+                inboundPatternRoot.get(NotifyServiceInboundPattern_.notifyService), notifyServiceEntity),
+            criteriaBuilder.equal(
+                inboundPatternRoot.get(NotifyServiceInboundPattern_.pattern), pattern)
+        ));
+        return uniqueResult(context, criteriaQuery, false, NotifyServiceInboundPattern.class);
+    }
+
+    @Override
+    public List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, NotifyServiceInboundPattern.class);
+        Root<NotifyServiceInboundPattern> inboundPatternRoot = criteriaQuery.from(NotifyServiceInboundPattern.class);
+        criteriaQuery.select(inboundPatternRoot);
+        criteriaQuery.where(
+            criteriaBuilder.equal(
+                inboundPatternRoot.get(NotifyServiceInboundPattern_.automatic), true)
+        );
+        return list(context, criteriaQuery, false, NotifyServiceInboundPattern.class, -1, -1);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactory.java b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactory.java
new file mode 100644
index 0000000000..bbf521123b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactory.java
@@ -0,0 +1,29 @@
+/**
+ * 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.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the NotifyService package,
+ * use NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public abstract class LDNMessageServiceFactory {
+
+    public abstract LDNMessageService getLDNMessageService();
+
+    public static LDNMessageServiceFactory getInstance() {
+        return DSpaceServicesFactory.getInstance()
+                .getServiceManager()
+                .getServiceByName("ldnMessageServiceFactory",
+                    LDNMessageServiceFactory.class);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactoryImpl.java
new file mode 100644
index 0000000000..a001ece040
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNMessageServiceFactoryImpl.java
@@ -0,0 +1,29 @@
+/**
+ * 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.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation to get services for the notifyservices package, use
+ * NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public class LDNMessageServiceFactoryImpl extends LDNMessageServiceFactory {
+
+    @Autowired(required = true)
+    private LDNMessageService ldnMessageService;
+
+    @Override
+    public LDNMessageService getLDNMessageService() {
+        return ldnMessageService;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactory.java b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactory.java
new file mode 100644
index 0000000000..4b0f107d24
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactory.java
@@ -0,0 +1,29 @@
+/**
+ * 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.ldn.factory;
+
+import org.dspace.app.ldn.LDNRouter;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the ldn package, use
+ * LDNRouterFactory.getInstance() to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public abstract class LDNRouterFactory {
+
+    public abstract LDNRouter getLDNRouter();
+
+    public static LDNRouterFactory getInstance() {
+        return DSpaceServicesFactory.getInstance()
+            .getServiceManager()
+            .getServiceByName("ldnRouter",
+                LDNRouterFactory.class);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactoryImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactoryImpl.java
new file mode 100644
index 0000000000..f411b9d935
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/factory/LDNRouterFactoryImpl.java
@@ -0,0 +1,28 @@
+/**
+ * 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.ldn.factory;
+
+import org.dspace.app.ldn.LDNRouter;
+import org.springframework.beans.factory.annotation.Autowired;
+/**
+ * Factory implementation to get services for the ldn package,
+ * use ldnRouter spring bean instance to retrieve an implementation
+ *
+ * @author Francesco Bacchelli (mohamed.eskander at 4science.com)
+ */
+public class LDNRouterFactoryImpl extends LDNRouterFactory {
+
+    @Autowired(required = true)
+    private LDNRouter ldnRouter;
+
+    @Override
+    public LDNRouter getLDNRouter() {
+        return ldnRouter;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactory.java b/dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactory.java
new file mode 100644
index 0000000000..ea488ca250
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactory.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.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Abstract factory to get services for the NotifyService package,
+ * use NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public abstract class NotifyServiceFactory {
+
+    public abstract NotifyService getNotifyService();
+
+    public abstract NotifyServiceInboundPatternService getNotifyServiceInboundPatternService();
+
+    public abstract NotifyPatternToTriggerService getNotifyPatternToTriggerService();
+
+    public abstract LDNMessageService getLDNMessageService();
+
+    public static NotifyServiceFactory getInstance() {
+        return DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
+            "notifyServiceFactory", NotifyServiceFactory.class);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactoryImpl.java
new file mode 100644
index 0000000000..84e15ee261
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/factory/NotifyServiceFactoryImpl.java
@@ -0,0 +1,56 @@
+/**
+ * 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.ldn.factory;
+
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation to get services for the notifyservices package,
+ * use NotifyServiceFactory.getInstance() to retrieve an implementation
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceFactoryImpl extends NotifyServiceFactory {
+
+    @Autowired(required = true)
+    private NotifyService notifyService;
+
+    @Autowired(required = true)
+    private NotifyServiceInboundPatternService notifyServiceInboundPatternService;
+
+    @Autowired(required = true)
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    @Autowired(required = true)
+    private LDNMessageService ldnMessageService;
+
+    @Override
+    public NotifyService getNotifyService() {
+        return notifyService;
+    }
+
+    @Override
+    public NotifyServiceInboundPatternService getNotifyServiceInboundPatternService() {
+        return notifyServiceInboundPatternService;
+    }
+
+    @Override
+    public NotifyPatternToTriggerService getNotifyPatternToTriggerService() {
+        return notifyPatternToTriggerService;
+    }
+
+    @Override
+    public LDNMessageService getLDNMessageService() {
+        return ldnMessageService;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Actor.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Actor.java
new file mode 100644
index 0000000000..a81cc3f800
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Actor.java
@@ -0,0 +1,41 @@
+/**
+ * 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.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Actor extends Base {
+
+    @JsonProperty("name")
+    private String name;
+
+    /**
+     * 
+     */
+    public Actor() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * @param name
+     */
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Base.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Base.java
new file mode 100644
index 0000000000..6ddaae110e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Base.java
@@ -0,0 +1,115 @@
+/**
+ * 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.ldn.model;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+@JsonInclude(Include.NON_EMPTY)
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Base {
+
+    @JsonProperty("id")
+    private String id;
+
+    @JsonProperty("type")
+    private Set<String> type;
+
+    /**
+     * 
+     */
+    public Base() {
+        type = new HashSet<>();
+    }
+
+    /**
+     * @return String
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * @return Set<String>
+     */
+    public Set<String> getType() {
+        return type;
+    }
+
+    /**
+     * @param type
+     */
+    public void setType(java.lang.Object type) {
+        if (type instanceof String) {
+            this.type.add((String) type);
+        } else if (type instanceof Collection) {
+            this.type.addAll((Collection) type);
+        }
+    }
+
+    /**
+     * @param type
+     */
+    public void addType(String type) {
+        this.type.add(type);
+    }
+
+    /**
+     * @return int
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    /**
+     * @param obj
+     * @return boolean
+     */
+    @Override
+    public boolean equals(java.lang.Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        Base other = (Base) obj;
+        if (id == null) {
+            if (other.id != null) {
+                return false;
+            }
+        } else if (!id.equals(other.id)) {
+            return false;
+        }
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Citation.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Citation.java
new file mode 100644
index 0000000000..7abe5c8ef4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Citation.java
@@ -0,0 +1,59 @@
+/**
+ * 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.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Citation extends Base {
+
+    @JsonProperty("ietf:cite-as")
+    private String ietfCiteAs;
+
+    @JsonProperty("ietf:item")
+    private Url url;
+
+    /**
+     * 
+     */
+    public Citation() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getIetfCiteAs() {
+        return ietfCiteAs;
+    }
+
+    /**
+     * @param ietfCiteAs
+     */
+    public void setIetfCiteAs(String ietfCiteAs) {
+        this.ietfCiteAs = ietfCiteAs;
+    }
+
+    /**
+     * @return Url
+     */
+    public Url getUrl() {
+        return url;
+    }
+
+    /**
+     * @param url
+     */
+    public void setUrl(Url url) {
+        this.url = url;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Context.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Context.java
new file mode 100644
index 0000000000..78fe373416
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Context.java
@@ -0,0 +1,61 @@
+/**
+ * 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.ldn.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Context extends Citation {
+
+    @JsonProperty("IsSupplementedBy")
+    private List<Context> isSupplementedBy;
+
+    @JsonProperty("IsSupplementTo")
+    private List<Context> isSupplementTo;
+
+    /**
+     * 
+     */
+    public Context() {
+        super();
+    }
+
+    /**
+     * @return List<Context>
+     */
+    public List<Context> getIsSupplementedBy() {
+        return isSupplementedBy;
+    }
+
+    /**
+     * @param isSupplementedBy
+     */
+    public void setIsSupplementedBy(List<Context> isSupplementedBy) {
+        this.isSupplementedBy = isSupplementedBy;
+    }
+
+    /**
+     * @return List<Context>
+     */
+    public List<Context> getIsSupplementTo() {
+        return isSupplementTo;
+    }
+
+    /**
+     * @param isSupplementTo
+     */
+    public void setIsSupplementTo(List<Context> isSupplementTo) {
+        this.isSupplementTo = isSupplementTo;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Notification.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Notification.java
new file mode 100644
index 0000000000..52bc9840f4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Notification.java
@@ -0,0 +1,159 @@
+/**
+ * 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.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * the json object from witch @see org.dspace.app.ldn.LDNMessageEntity are created.
+ * <a href="https://notify.coar-repositories.org/patterns/">see official coar doc</a>
+ */
+@JsonPropertyOrder(value = {
+    "@context",
+    "id",
+    "type",
+    "actor",
+    "context",
+    "object",
+    "origin",
+    "target",
+    "inReplyTo"
+})
+public class Notification extends Base {
+
+    @JsonProperty("@context")
+    private String[] c = new String[] {
+        "https://purl.org/coar/notify",
+        "https://www.w3.org/ns/activitystreams"
+    };
+
+    @JsonProperty("actor")
+    private Actor actor;
+
+    @JsonProperty("context")
+    private Context context;
+
+    @JsonProperty("object")
+    private Object object;
+
+    @JsonProperty("origin")
+    private Service origin;
+
+    @JsonProperty("target")
+    private Service target;
+
+    @JsonProperty("inReplyTo")
+    private String inReplyTo;
+
+    /**
+     * 
+     */
+    public Notification() {
+        super();
+    }
+
+    /**
+     * @return String[]
+     */
+    public String[] getC() {
+        return c;
+    }
+
+    /**
+     * @param c
+     */
+    public void setC(String[] c) {
+        this.c = c;
+    }
+
+    /**
+     * @return Actor
+     */
+    public Actor getActor() {
+        return actor;
+    }
+
+    /**
+     * @param actor
+     */
+    public void setActor(Actor actor) {
+        this.actor = actor;
+    }
+
+    /**
+     * @return Context
+     */
+    public Context getContext() {
+        return context;
+    }
+
+    /**
+     * @param context
+     */
+    public void setContext(Context context) {
+        this.context = context;
+    }
+
+    /**
+     * @return Object
+     */
+    public Object getObject() {
+        return object;
+    }
+
+    /**
+     * @param object
+     */
+    public void setObject(Object object) {
+        this.object = object;
+    }
+
+    /**
+     * @return Service
+     */
+    public Service getOrigin() {
+        return origin;
+    }
+
+    /**
+     * @param origin
+     */
+    public void setOrigin(Service origin) {
+        this.origin = origin;
+    }
+
+    /**
+     * @return Service
+     */
+    public Service getTarget() {
+        return target;
+    }
+
+    /**
+     * @param target
+     */
+    public void setTarget(Service target) {
+        this.target = target;
+    }
+
+    /**
+     * @return String
+     */
+    public String getInReplyTo() {
+        return inReplyTo;
+    }
+
+    /**
+     * @param inReplyTo
+     */
+    public void setInReplyTo(String inReplyTo) {
+        this.inReplyTo = inReplyTo;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatus.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatus.java
new file mode 100644
index 0000000000..8333eae910
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatus.java
@@ -0,0 +1,63 @@
+/**
+ * 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.ldn.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+@JsonPropertyOrder(value = {
+    "itemuuid",
+    "notifyStatus"
+})
+
+/**
+ * item requests of LDN messages of type
+ *
+ *    "Offer", "coar-notify:EndorsementAction"
+ *    "Offer", "coar-notify:IngestAction"
+ *    "Offer", "coar-notify:ReviewAction"
+ * 
+ * and their acknowledgements - if any
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class NotifyRequestStatus extends Base {
+
+    private UUID itemUuid;
+
+    private List<RequestStatus> notifyStatus;
+
+    public NotifyRequestStatus() {
+        super();
+        this.notifyStatus = new ArrayList<RequestStatus>();
+    }
+
+    public UUID getItemUuid() {
+        return itemUuid;
+    }
+
+    public void setItemUuid(UUID itemUuid) {
+        this.itemUuid = itemUuid;
+    }
+
+    public void addRequestStatus(RequestStatus rs) {
+        this.notifyStatus.add(rs);
+    }
+
+    public List<RequestStatus> getNotifyStatus() {
+        return notifyStatus;
+    }
+
+    public void setNotifyStatus(List<RequestStatus> notifyStatus) {
+        this.notifyStatus = notifyStatus;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatusEnum.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatusEnum.java
new file mode 100644
index 0000000000..437c624f84
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/NotifyRequestStatusEnum.java
@@ -0,0 +1,18 @@
+/**
+ * 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.ldn.model;
+/**
+ * REQUESTED means acknowledgements not received yet
+ * ACCEPTED means acknowledgements of "Accept" type received
+ * REJECTED means ack of "TentativeReject" type received
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public enum NotifyRequestStatusEnum {
+    REJECTED, ACCEPTED, REQUESTED
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Object.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Object.java
new file mode 100644
index 0000000000..8913af47da
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Object.java
@@ -0,0 +1,74 @@
+/**
+ * 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.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Object extends Citation {
+
+    @JsonProperty("as:object")
+    private String asObject;
+
+    @JsonProperty("as:relationship")
+    private String asRelationship;
+
+    @JsonProperty("as:subject")
+    private String asSubject;
+
+    @JsonProperty("sorg:name")
+    private String title;
+
+    /**
+     * 
+     */
+    public Object() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * @param title
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getAsObject() {
+        return asObject;
+    }
+
+    public void setAsObject(String asObject) {
+        this.asObject = asObject;
+    }
+
+    public String getAsRelationship() {
+        return asRelationship;
+    }
+
+    public void setAsRelationship(String asRelationship) {
+        this.asRelationship = asRelationship;
+    }
+
+    public String getAsSubject() {
+        return asSubject;
+    }
+
+    public void setAsSubject(String asSubject) {
+        this.asSubject = asSubject;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/RequestStatus.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/RequestStatus.java
new file mode 100644
index 0000000000..e33bc3eeb7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/RequestStatus.java
@@ -0,0 +1,47 @@
+/**
+ * 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.ldn.model;
+
+/**
+ * Information about the Offer and Acknowledgements targeting a specified Item
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ */
+public class RequestStatus {
+
+    private String serviceName;
+    private String serviceUrl;
+    private String offerType;
+    private NotifyRequestStatusEnum status;
+
+    public String getServiceName() {
+        return serviceName;
+    }
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+    public String getServiceUrl() {
+        return serviceUrl;
+    }
+    public void setServiceUrl(String serviceUrl) {
+        this.serviceUrl = serviceUrl;
+    }
+    public NotifyRequestStatusEnum getStatus() {
+        return status;
+    }
+    public void setStatus(NotifyRequestStatusEnum status) {
+        this.status = status;
+    }
+    public String getOfferType() {
+        return offerType;
+    }
+    public void setOfferType(String offerType) {
+        this.offerType = offerType;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Service.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Service.java
new file mode 100644
index 0000000000..cdd3ba5bb5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Service.java
@@ -0,0 +1,41 @@
+/**
+ * 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.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Notification
+ */
+public class Service extends Base {
+
+    @JsonProperty("inbox")
+    private String inbox;
+
+    /**
+     * 
+     */
+    public Service() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getInbox() {
+        return inbox;
+    }
+
+    /**
+     * @param inbox
+     */
+    public void setInbox(String inbox) {
+        this.inbox = inbox;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/model/Url.java b/dspace-api/src/main/java/org/dspace/app/ldn/model/Url.java
new file mode 100644
index 0000000000..47093e02e4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/model/Url.java
@@ -0,0 +1,41 @@
+/**
+ * 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.ldn.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * used to map @see org.dspace.app.ldn.model.Citation
+ */
+public class Url extends Base {
+
+    @JsonProperty("mediaType")
+    private String mediaType;
+
+    /**
+     * 
+     */
+    public Url() {
+        super();
+    }
+
+    /**
+     * @return String
+     */
+    public String getMediaType() {
+        return mediaType;
+    }
+
+    /**
+     * @param mediaType
+     */
+    public void setMediaType(String mediaType) {
+        this.mediaType = mediaType;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNContextRepeater.java b/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNContextRepeater.java
new file mode 100644
index 0000000000..a5ef0957ff
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNContextRepeater.java
@@ -0,0 +1,141 @@
+/**
+ * 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.ldn.processor;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Objects;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.model.Context;
+import org.dspace.app.ldn.model.Notification;
+
+/**
+ * Context repeater to iterate over array context properties of a received
+ * notification. The returned notification iterator is a notification with
+ * context array elements hoisted onto the root of the notification context.
+ */
+public class LDNContextRepeater {
+
+    private final static Logger log = LogManager.getLogger(LDNContextRepeater.class);
+
+    private final static String CONTEXT = "context";
+
+    private String repeatOver;
+
+    /**
+     * @return String
+     */
+    public String getRepeatOver() {
+        return repeatOver;
+    }
+
+    /**
+     * @param repeatOver
+     */
+    public void setRepeatOver(String repeatOver) {
+        this.repeatOver = repeatOver;
+    }
+
+    /**
+     * @param  notification
+     * @return Iterator<Notification>
+     */
+    public Iterator<Notification> iterator(Notification notification) {
+        return new NotificationIterator(notification, repeatOver);
+    }
+
+    /**
+     * Private inner class defining the notification iterator.
+     */
+    private class NotificationIterator implements Iterator<Notification> {
+
+        private final List<Notification> notifications;
+
+        /**
+         * Convert notification to JsonNode in order to clone for each context array
+         * element. Each element is then hoisted to the root of the cloned notification
+         * context.
+         *
+         * @param notification received notification
+         * @param repeatOver   which context property to repeat over
+         */
+        private NotificationIterator(Notification notification, String repeatOver) {
+            this.notifications = new ArrayList<>();
+
+            if (Objects.nonNull(repeatOver)) {
+                ObjectMapper objectMapper = new ObjectMapper();
+
+                JsonNode notificationNode = objectMapper.valueToTree(notification);
+
+                log.debug("Notification {}", notificationNode);
+
+                JsonNode topContextNode = notificationNode.get(CONTEXT);
+                if (topContextNode.isNull()) {
+                    log.warn("Notification is missing context");
+                    return;
+                }
+
+                JsonNode contextArrayNode = topContextNode.get(repeatOver);
+                if (contextArrayNode == null || contextArrayNode.isNull()) {
+                    log.error("Notification context {} is not defined", repeatOver);
+                    return;
+                }
+
+                if (contextArrayNode.isArray()) {
+
+                    for (JsonNode contextNode : ((ArrayNode) contextArrayNode)) {
+
+                        try {
+                            Context context = objectMapper.treeToValue(contextNode, Context.class);
+
+                            Notification copy = objectMapper.treeToValue(notificationNode, Notification.class);
+
+                            copy.setContext(context);
+
+                            this.notifications.add(copy);
+                        } catch (JsonProcessingException e) {
+                            log.error("Failed to copy notification");
+                        }
+
+                    }
+
+                } else {
+                    log.error("Notification context {} is not an array", repeatOver);
+                }
+
+            } else {
+                this.notifications.add(notification);
+            }
+        }
+
+        /**
+         * @return boolean
+         */
+        @Override
+        public boolean hasNext() {
+            return !this.notifications.isEmpty();
+        }
+
+        /**
+         * @return Notification
+         */
+        @Override
+        public Notification next() {
+            return this.notifications.remove(0);
+        }
+
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNMetadataProcessor.java b/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNMetadataProcessor.java
new file mode 100644
index 0000000000..9782e25045
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNMetadataProcessor.java
@@ -0,0 +1,231 @@
+/**
+ * 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.ldn.processor;
+
+import static java.lang.String.format;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.UUID;
+
+import org.apache.http.HttpStatus;
+import org.apache.http.client.HttpResponseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.action.LDNAction;
+import org.dspace.app.ldn.action.LDNActionStatus;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.utility.LDNUtils;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Linked Data Notification metadata processor for consuming notifications. The
+ * storage of notification details are within item metadata.
+ */
+public class LDNMetadataProcessor implements LDNProcessor {
+
+    private final static Logger log = LogManager.getLogger(LDNMetadataProcessor.class);
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private static final Set<String> OBJECT_SUBJECT_ITEM_TYPES = Set.of(
+        "Announce",
+        "coar-notify:RelationshipAction");
+
+    private static final Set<String> CONTEXT_ID_ITEM_TYPES = Set.of(
+        "Announce",
+        "TentativeReject",
+        "Accept",
+        "coar-notify:ReviewAction",
+        "coar-notify:IngestAction",
+        "coar-notify:EndorsementAction");
+
+    private static final Set<String> OBJECT_ID_ITEM_TYPES = Set.of(
+        "Offer",
+        "coar-notify:ReviewAction",
+        "coar-notify:EndorsementAction",
+        "coar-notify:IngestAction");
+
+    @Autowired
+    private HandleService handleService;
+
+    private LDNContextRepeater repeater = new LDNContextRepeater();
+
+    private List<LDNAction> actions = new ArrayList<>();
+
+    /**
+     * Initialize velocity engine for templating.
+     */
+    private LDNMetadataProcessor() {
+
+    }
+
+    /**
+     * Process notification by repeating over context, processing each context
+     * notification, and running actions post processing.
+     *
+     * @param notification received notification
+     * @throws Exception something went wrong processing the notification
+     */
+    @Override
+    public void process(Context context, Notification notification) throws Exception {
+        Item item = lookupItem(context, notification);
+        runActions(context, notification, item);
+    }
+
+    /**
+     * Run all actions defined for the processor.
+     *
+     * @param notification current context notification
+     * @param item         associated item
+     *
+     * @return ActionStatus result status of running the action
+     *
+     * @throws Exception failed execute the action
+     */
+    private LDNActionStatus runActions(Context context, Notification notification, Item item) throws Exception {
+        LDNActionStatus operation = LDNActionStatus.CONTINUE;
+        for (LDNAction action : actions) {
+            log.info("Running action {} for notification {} {}",
+                    action.getClass().getSimpleName(),
+                    notification.getId(),
+                    notification.getType());
+
+            operation = action.execute(context, notification, item);
+            if (operation == LDNActionStatus.ABORT) {
+                break;
+            }
+        }
+
+        return operation;
+    }
+
+    /**
+     * @return LDNContextRepeater
+     */
+    public LDNContextRepeater getRepeater() {
+        return repeater;
+    }
+
+    /**
+     * @param repeater
+     */
+    public void setRepeater(LDNContextRepeater repeater) {
+        this.repeater = repeater;
+    }
+
+    /**
+     * @return List<LDNAction>
+     */
+    public List<LDNAction> getActions() {
+        return actions;
+    }
+
+    /**
+     * @param actions
+     */
+    public void setActions(List<LDNAction> actions) {
+        this.actions = actions;
+    }
+
+    /**
+     * Lookup associated item to the notification context. If UUID in URL, lookup by
+     * UUID, else lookup by handle.
+     *
+     * @param context      current context
+     * @param notification current context notification
+     *
+     * @return Item associated item
+     *
+     * @throws SQLException failed to lookup item
+     * @throws HttpResponseException redirect failure
+     */
+    private Item lookupItem(Context context, Notification notification) throws SQLException, HttpResponseException {
+        Item item = null;
+        String url = null;
+
+        if (CONTEXT_ID_ITEM_TYPES.containsAll(notification.getType())) {
+            url = notification.getContext().getId();
+        } else if (OBJECT_ID_ITEM_TYPES.containsAll(notification.getType())) {
+            url = notification.getObject().getId();
+        } else if (OBJECT_SUBJECT_ITEM_TYPES.containsAll(notification.getType())) {
+            // need to understand if we're sender or receiver
+            if (ldnMessageService.isTargetCurrent(notification)) {
+                // this means we're sending the notification
+                url = notification.getObject().getAsObject();
+                // use as:object for sender
+            } else {
+                // this means we're receiving the notification
+                url = notification.getObject().getAsSubject();
+                // use as:subject for receiver
+            }
+        }
+
+        log.info("Looking up item {}", url);
+
+        item = resolveItemByUrl(context, url, notification);
+
+        return item;
+    }
+
+    private Item resolveItemByUrl(Context context, String url, Notification notification)
+        throws SQLException, HttpResponseException {
+        Item item = null;
+        if (LDNUtils.hasUUIDInURL(url)) {
+            UUID uuid = LDNUtils.getUUIDFromURL(url);
+
+            item = itemService.find(context, uuid);
+
+            if (Objects.isNull(item)) {
+                throw new HttpResponseException(HttpStatus.SC_NOT_FOUND,
+                    format("Item with uuid %s not found", uuid));
+            }
+            return item;
+        }
+        String handle = handleService.resolveUrlToHandle(context, url);
+
+        if (Objects.isNull(handle)) {
+            throw new HttpResponseException(HttpStatus.SC_NOT_FOUND,
+                format("Handle not found for %s", url));
+        }
+
+        DSpaceObject object = handleService.resolveToObject(context, handle);
+
+        if (Objects.isNull(object)) {
+            throw new HttpResponseException(HttpStatus.SC_NOT_FOUND,
+                format("Item with handle %s not found", handle));
+        }
+
+        if (object.getType() == Constants.ITEM) {
+            item = (Item) object;
+        } else {
+            throw new HttpResponseException(HttpStatus.SC_UNPROCESSABLE_ENTITY,
+                format("Handle %s does not resolve to an item", handle));
+        }
+        return item;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNProcessor.java b/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNProcessor.java
new file mode 100644
index 0000000000..279ec5cedc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/processor/LDNProcessor.java
@@ -0,0 +1,25 @@
+/**
+ * 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.ldn.processor;
+
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.core.Context;
+
+/**
+ * Processor interface to allow for custom implementations of process.
+ */
+public interface LDNProcessor {
+
+    /**
+     * Process received notification.
+     *
+     * @param notification received notification
+     * @throws Exception something went wrong processing the notification
+     */
+    public void process(Context context, Notification notification) throws Exception;
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/LDNMessageService.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/LDNMessageService.java
new file mode 100644
index 0000000000..eb18c6a69a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/LDNMessageService.java
@@ -0,0 +1,165 @@
+/**
+ * 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.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.model.NotifyRequestStatus;
+import org.dspace.app.ldn.model.Service;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link LDNMessageEntity} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public interface LDNMessageService {
+
+    /**
+     * find the ldn message by id
+     *
+     * @param context the context
+     * @param id the uri
+     * @return the ldn message by id
+     * @throws SQLException If something goes wrong in the database
+     */
+    public LDNMessageEntity find(Context context, String id) throws SQLException;
+
+    /**
+     * find all ldn messages
+     *
+     * @param context the context
+     * @return all ldn messages by id
+     * @throws SQLException If something goes wrong in the database
+     */
+    public List<LDNMessageEntity> findAll(Context context) throws SQLException;
+
+    /**
+     * Creates a new LDNMessage
+     *
+     * @param context The DSpace context
+     * @param id the uri
+     * @return the created LDN Message
+     * @throws SQLException If something goes wrong in the database
+     */
+    public LDNMessageEntity create(Context context, String id) throws SQLException;
+
+    /**
+     * Creates a new LDNMessage
+     *
+     * @param context The DSpace context
+     * @param notification the requested notification
+     * @param sourceIp the source ip
+     * @return the created LDN Message
+     * @throws SQLException If something goes wrong in the database
+     */
+    public LDNMessageEntity create(Context context, Notification notification, String sourceIp) throws SQLException;
+
+    /**
+     * Update the provided LDNMessage
+     *
+     * @param context The DSpace context
+     * @param ldnMessage the LDNMessage
+     * @throws SQLException If something goes wrong in the database
+     */
+    public void update(Context context, LDNMessageEntity ldnMessage) throws SQLException;
+
+    /**
+     * Find the oldest queued LDNMessages that still can be elaborated
+     *
+     * @return list of LDN messages
+     * @param context The DSpace context
+     * @throws SQLException If something goes wrong in the database
+     */
+    public List<LDNMessageEntity> findOldestMessagesToProcess(Context context) throws SQLException;
+
+    /**
+     * Find all messages in the queue with the Processing status but timed-out
+     * 
+     * @return all the LDN Messages to be fixed on their queue_ attributes
+     * @param context The DSpace context
+     * @throws SQLException If something goes wrong in the database
+     */
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context) throws SQLException;
+
+    /**
+     * Find all messages in the queue with the Processing status but timed-out and modify their queue_status
+     * considering the queue_attempts
+     * 
+     * @return number of messages fixed
+     * @param context The DSpace context
+     * @throws SQLException
+     */
+    public int checkQueueMessageTimeout(Context context) throws SQLException;
+
+    /**
+     * Elaborates the oldest enqueued message
+     * 
+     * @return number of messages fixed
+     * @param context The DSpace context
+     */
+    public int extractAndProcessMessageFromQueue(Context context) throws SQLException;
+
+    /**
+     * find the related notify service entity
+     *
+     * @param context the context
+     * @param service the service
+     * @return the NotifyServiceEntity
+     * @throws SQLException if something goes wrong
+     */
+    public NotifyServiceEntity findNotifyService(Context context, Service service) throws SQLException;
+
+    /**
+     * find the ldn messages of Requests by item uuid
+     *
+     * @param context the context
+     * @param item the item
+     * @return the item requests object
+     * @throws SQLException If something goes wrong in the database
+     */
+    public NotifyRequestStatus findRequestsByItem(Context context, Item item) throws SQLException;
+
+    /**
+     * delete the provided ldn message
+     *
+     * @param context the context
+     * @param ldnMessage the ldn message
+     * @throws SQLException if something goes wrong
+     */
+    public void delete(Context context, LDNMessageEntity ldnMessage) throws SQLException;
+
+    /**
+     * find the ldn messages to be reprocessed
+     *
+     * @param context the context
+     * @throws SQLException if something goes wrong
+     */
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException;
+
+    /**
+     * check if IP number is included in the configured ip-range on the Notify
+     * Service
+     * 
+     * @param origin   the Notify Service entity
+     * @param sourceIp the ip to evaluate
+     */
+    public boolean isValidIp(NotifyServiceEntity origin, String sourceIp);
+
+    /**
+     * check if the notification is targeting the current system
+     * 
+     * @param notification   the LDN Message entity
+     */
+    boolean isTargetCurrent(Notification notification);
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyPatternToTriggerService.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyPatternToTriggerService.java
new file mode 100644
index 0000000000..c2c3de7e06
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyPatternToTriggerService.java
@@ -0,0 +1,84 @@
+/**
+ * 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.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link NotifyPatternToTrigger} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyPatternToTriggerService {
+
+    /**
+     * find all notify patterns to be triggered
+     *
+     * @param context the context
+     * @return all notify patterns to be trigger
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findAll(Context context) throws SQLException;
+
+    /**
+     * find list of Notify Patterns To be Triggered by item
+     *
+     * @param context the context
+     * @param item the item of NotifyPatternToTrigger
+     * @return the matched NotifyPatternToTrigger list by item
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item)
+        throws SQLException;
+
+    /**
+     * find list of Notify Patterns To be Triggered by item and pattern
+     *
+     * @param context the context
+     * @param item the item of NotifyPatternToTrigger
+     * @param pattern the pattern of NotifyPatternToTrigger
+     *
+     * @return the matched NotifyPatternToTrigger list by item and pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException;
+
+    /**
+     * create new notifyPatternToTrigger
+     *
+     * @param context the context
+     * @return the created NotifyPatternToTrigger
+     * @throws SQLException if database error
+     */
+    public NotifyPatternToTrigger create(Context context) throws SQLException;
+
+    /**
+     * update the provided notifyPatternToTrigger
+     *
+     * @param context the context
+     * @param notifyPatternToTrigger the notifyPatternToTrigger
+     * @throws SQLException if database error
+     */
+    public void update(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException;
+
+    /**
+     * delete the provided notifyPatternToTrigger
+     *
+     * @param context the context
+     * @param notifyPatternToTrigger the notifyPatternToTrigger
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException;
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyService.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyService.java
new file mode 100644
index 0000000000..e6ac0d63b4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyService.java
@@ -0,0 +1,92 @@
+/**
+ * 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.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link NotifyServiceEntity} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyService {
+
+    /**
+     * find all notify service entities
+     *
+     * @param context the context
+     * @return all notify service entities
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceEntity> findAll(Context context) throws SQLException;
+
+    /**
+     * find one NotifyServiceEntity by id
+     *
+     * @param context the context
+     * @param id the id of NotifyServiceEntity
+     * @return the matched NotifyServiceEntity by id
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity find(Context context, Integer id) throws SQLException;
+
+    /**
+     * create new notifyServiceEntity
+     *
+     * @param context the context
+     * @param name name of the service
+     * @return the created NotifyServiceEntity
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity create(Context context, String name) throws SQLException;
+
+    /**
+     * update the provided notifyServiceEntity
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @throws SQLException if database error
+     */
+    public void update(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException;
+
+    /**
+     * delete the provided notifyServiceEntity
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException;
+
+    /**
+     * find the NotifyServiceEntity matched with the provided ldnUrl
+     *
+     * @param context the context
+     * @param ldnUrl the ldnUrl
+     * @return the NotifyServiceEntity matched the provided ldnUrl
+     * @throws SQLException if database error
+     */
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException;
+
+    /**
+     * find all NotifyServiceEntity matched the provided inbound pattern
+     * from its related notifyServiceInboundPatterns
+     * also with 'automatic' equals to false
+     *
+     * @param context the context
+     * @param pattern the ldnUrl
+     * @return all NotifyServiceEntity matched the provided pattern
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyServiceInboundPatternService.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyServiceInboundPatternService.java
new file mode 100644
index 0000000000..8cd92d45dd
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/NotifyServiceInboundPatternService.java
@@ -0,0 +1,76 @@
+/**
+ * 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.ldn.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.core.Context;
+
+/**
+ * Service interface class for the {@link NotifyServiceInboundPattern} object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface NotifyServiceInboundPatternService {
+
+    /**
+     * find all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @param pattern the pattern
+     * @return all notifyServiceInboundPatterns matched with
+     * the provided notifyServiceEntity and pattern
+     * @throws SQLException if database error
+     */
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context,
+                                                               NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException;
+
+    /**
+     * find all automatic notifyServiceInboundPatterns
+     *
+     * @param context the context
+     * @return all automatic notifyServiceInboundPatterns
+     * @throws SQLException if database error
+     */
+    public List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException;
+
+    /**
+     * create new notifyServiceInboundPattern
+     *
+     * @param context the context
+     * @param notifyServiceEntity the notifyServiceEntity
+     * @return the created notifyServiceInboundPattern
+     * @throws SQLException if database error
+     */
+    public NotifyServiceInboundPattern create(Context context, NotifyServiceEntity notifyServiceEntity)
+        throws SQLException;
+
+    /**
+     * update the provided notifyServiceInboundPattern
+     *
+     * @param context the context
+     * @param inboundPattern the notifyServiceInboundPattern
+     * @throws SQLException if database error
+     */
+    public void update(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException;
+
+    /**
+     * delete the provided notifyServiceInboundPattern
+     *
+     * @param context the context
+     * @param inboundPattern the notifyServiceInboundPattern
+     * @throws SQLException if database error
+     */
+    public void delete(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
new file mode 100644
index 0000000000..15f07a5561
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
@@ -0,0 +1,404 @@
+/**
+ * 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.ldn.service.impl;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.JsonSyntaxException;
+import org.apache.commons.lang.time.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.LDNRouter;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.dao.LDNMessageDao;
+import org.dspace.app.ldn.dao.NotifyServiceDao;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.model.NotifyRequestStatus;
+import org.dspace.app.ldn.model.NotifyRequestStatusEnum;
+import org.dspace.app.ldn.model.RequestStatus;
+import org.dspace.app.ldn.model.Service;
+import org.dspace.app.ldn.processor.LDNProcessor;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.utility.LDNUtils;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.discovery.indexobject.IndexableLDNNotification;
+import org.dspace.event.Event;
+import org.dspace.handle.service.HandleService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Implementation of {@link LDNMessageService}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
+ */
+public class LDNMessageServiceImpl implements LDNMessageService {
+
+    @Autowired(required = true)
+    private LDNMessageDao ldnMessageDao;
+    @Autowired(required = true)
+    private NotifyServiceDao notifyServiceDao;
+    @Autowired(required = true)
+    private ConfigurationService configurationService;
+    @Autowired(required = true)
+    private HandleService handleService;
+    @Autowired(required = true)
+    private ItemService itemService;
+    @Autowired(required = true)
+    private LDNRouter ldnRouter;
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LDNMessageServiceImpl.class);
+    private static final String LDN_ID_PREFIX = "urn:uuid:";
+
+    protected LDNMessageServiceImpl() {
+
+    }
+
+    @Override
+    public LDNMessageEntity find(Context context, String id) throws SQLException {
+
+        if (id == null) {
+            return null;
+        }
+
+        id = id.startsWith(LDN_ID_PREFIX) ? id : LDN_ID_PREFIX + id;
+        return ldnMessageDao.findByID(context, LDNMessageEntity.class, id);
+    }
+
+    @Override
+    public List<LDNMessageEntity> findAll(Context context) throws SQLException {
+        return ldnMessageDao.findAll(context, LDNMessageEntity.class);
+    }
+
+    @Override
+    public LDNMessageEntity create(Context context, String id) throws SQLException {
+        LDNMessageEntity result = ldnMessageDao.findByID(context, LDNMessageEntity.class, id);
+        if (result != null) {
+            throw new SQLException("Duplicate LDN Message ID [" + id + "] detected. This message is rejected.");
+        }
+        return ldnMessageDao.create(context, new LDNMessageEntity(id));
+    }
+
+    @Override
+    public LDNMessageEntity create(Context context, Notification notification, String sourceIp) throws SQLException {
+        LDNMessageEntity ldnMessage = create(context, notification.getId());
+        DSpaceObject obj = findDspaceObjectByUrl(context, notification.getObject().getId());
+        if (obj == null) {
+            if (isTargetCurrent(notification)) {
+                // this means we're sending the notification
+                obj = findDspaceObjectByUrl(context, notification.getObject().getAsObject());
+                // use as:object for sender
+            } else {
+                // this means we're receiving the notification
+                obj = findDspaceObjectByUrl(context, notification.getObject().getAsSubject());
+                // use as:subject for receiver
+            }
+        }
+        ldnMessage.setObject(obj);
+        if (null != notification.getContext()) {
+            ldnMessage.setContext(findDspaceObjectByUrl(context, notification.getContext().getId()));
+        }
+        ldnMessage.setOrigin(findNotifyService(context, notification.getOrigin()));
+        ldnMessage.setInReplyTo(find(context, notification.getInReplyTo()));
+        ObjectMapper mapper = new ObjectMapper();
+        String message = null;
+        try {
+            message = mapper.writeValueAsString(notification);
+            ldnMessage.setMessage(message);
+        } catch (JsonProcessingException e) {
+            log.error("Notification json can't be correctly processed " +
+                "and stored inside the LDN Message Entity" + ldnMessage);
+            log.error(e);
+        }
+        ldnMessage.setType(StringUtils.joinWith(",", notification.getType()));
+        Set<String> notificationType = notification.getType();
+        if (notificationType == null) {
+            log.error("Notification has no notificationType attribute! " + notification);
+            return null;
+        }
+        ArrayList<String> notificationTypeArrayList = new ArrayList<String>(notificationType);
+        // sorting the list
+        Collections.sort(notificationTypeArrayList);
+        ldnMessage.setActivityStreamType(notificationTypeArrayList.get(0));
+        if (notificationTypeArrayList.size() > 1) {
+            ldnMessage.setCoarNotifyType(notificationTypeArrayList.get(1));
+        }
+        ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+        ldnMessage.setSourceIp(sourceIp);
+        if (ldnMessage.getOrigin() == null && !"Offer".equalsIgnoreCase(ldnMessage.getActivityStreamType())) {
+            ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_UNTRUSTED);
+        } else {
+
+            boolean ipCheckRangeEnabled = configurationService.getBooleanProperty("ldn.ip-range.enabled", true);
+            if (ipCheckRangeEnabled && !isValidIp(ldnMessage.getOrigin(), sourceIp)) {
+                ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_UNTRUSTED_IP);
+            }
+        }
+        ldnMessage.setQueueTimeout(new Date());
+
+        update(context, ldnMessage);
+        return ldnMessage;
+    }
+
+    @Override
+    public boolean isValidIp(NotifyServiceEntity origin, String sourceIp) {
+
+        String lowerIp = origin.getLowerIp();
+        String upperIp = origin.getUpperIp();
+
+        try {
+            InetAddress ip = InetAddress.getByName(sourceIp);
+            InetAddress lowerBoundAddress = InetAddress.getByName(lowerIp);
+            InetAddress upperBoundAddress = InetAddress.getByName(upperIp);
+
+            long ipLong = ipToLong(ip);
+            long lowerBoundLong = ipToLong(lowerBoundAddress);
+            long upperBoundLong = ipToLong(upperBoundAddress);
+
+            return ipLong >= lowerBoundLong && ipLong <= upperBoundLong;
+        } catch (UnknownHostException e) {
+            return false;
+        }
+    }
+
+    private long ipToLong(InetAddress ip) {
+        byte[] octets = ip.getAddress();
+        long result = 0;
+        for (byte octet : octets) {
+            result <<= 8;
+            result |= octet & 0xff;
+        }
+        return result;
+    }
+
+    @Override
+    public void update(Context context, LDNMessageEntity ldnMessage) throws SQLException {
+        // move the queue_status from UNTRUSTED to QUEUED if origin is a known NotifyService
+        if (ldnMessage.getOrigin() != null &&
+            LDNMessageEntity.QUEUE_STATUS_UNTRUSTED.compareTo(ldnMessage.getQueueStatus()) == 0) {
+            ldnMessage.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+        }
+        ldnMessageDao.save(context, ldnMessage);
+        UUID notificationUUID = UUID.fromString(ldnMessage.getID().replace(LDN_ID_PREFIX, ""));
+        ArrayList<String> identifiersList = new ArrayList<String>();
+        identifiersList.add(ldnMessage.getID());
+        context.addEvent(
+            new Event(Event.MODIFY, Constants.LDN_MESSAGE,
+                notificationUUID,
+                IndexableLDNNotification.TYPE, identifiersList));
+    }
+
+    private DSpaceObject findDspaceObjectByUrl(Context context, String url) throws SQLException {
+        String dspaceUrl = configurationService.getProperty("dspace.ui.url") + "/handle/";
+
+        if (StringUtils.startsWith(url, dspaceUrl)) {
+            return handleService.resolveToObject(context, url.substring(dspaceUrl.length()));
+        }
+
+        String handleResolver = configurationService.getProperty("handle.canonical.prefix", "https://hdl.handle.net/");
+        if (StringUtils.startsWith(url, handleResolver)) {
+            return handleService.resolveToObject(context, url.substring(handleResolver.length()));
+        }
+
+        dspaceUrl = configurationService.getProperty("dspace.ui.url") + "/items/";
+        if (StringUtils.startsWith(url, dspaceUrl)) {
+            return itemService.find(context, UUID.fromString(url.substring(dspaceUrl.length())));
+        }
+
+        return null;
+    }
+
+    public NotifyServiceEntity findNotifyService(Context context, Service service) throws SQLException {
+        return notifyServiceDao.findByLdnUrl(context, service.getInbox());
+    }
+
+    @Override
+    public List<LDNMessageEntity> findOldestMessagesToProcess(Context context) throws SQLException {
+        List<LDNMessageEntity> result = null;
+        int max_attempts = configurationService.getIntProperty("ldn.processor.max.attempts");
+        result = ldnMessageDao.findOldestMessageToProcess(context, max_attempts);
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findMessagesToBeReprocessed(Context context) throws SQLException {
+        List<LDNMessageEntity> result = null;
+        result = ldnMessageDao.findMessagesToBeReprocessed(context);
+        return result;
+    }
+
+    @Override
+    public List<LDNMessageEntity> findProcessingTimedoutMessages(Context context) throws SQLException {
+        List<LDNMessageEntity> result = null;
+        int max_attempts = configurationService.getIntProperty("ldn.processor.max.attempts");
+        result = ldnMessageDao.findProcessingTimedoutMessages(context, max_attempts);
+        return result;
+    }
+
+    @Override
+    public int extractAndProcessMessageFromQueue(Context context) throws SQLException {
+        int count = 0;
+        int timeoutInMinutes = configurationService.getIntProperty("ldn.processor.queue.msg.timeout", 60);
+
+        List<LDNMessageEntity> messages = findOldestMessagesToProcess(context);
+        messages.addAll(findMessagesToBeReprocessed(context));
+
+        Optional<LDNMessageEntity> msgOpt = getSingleMessageEntity(messages);
+
+        while (msgOpt.isPresent()) {
+            LDNProcessor processor = null;
+            LDNMessageEntity msg = msgOpt.get();
+            processor = ldnRouter.route(msg);
+            try {
+                boolean isServiceDisabled = !isServiceEnabled(msg);
+                if (processor == null || isServiceDisabled) {
+                    log.warn("No processor found for LDN message " + msg);
+                    Integer status = isServiceDisabled ? LDNMessageEntity.QUEUE_STATUS_UNTRUSTED
+                        : LDNMessageEntity.QUEUE_STATUS_UNMAPPED_ACTION;
+                    msg.setQueueStatus(status);
+                    msg.setQueueAttempts(msg.getQueueAttempts() + 1);
+                    update(context, msg);
+                } else {
+                    msg.setQueueLastStartTime(new Date());
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_PROCESSING);
+                    msg.setQueueTimeout(DateUtils.addMinutes(new Date(), timeoutInMinutes));
+                    update(context, msg);
+                    ObjectMapper mapper = new ObjectMapper();
+                    Notification notification = mapper.readValue(msg.getMessage(), Notification.class);
+                    processor.process(context, notification);
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_PROCESSED);
+                    count++;
+                }
+            } catch (JsonSyntaxException jse) {
+                log.error("Unable to read JSON notification from LdnMessage " + msg, jse);
+                msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_FAILED);
+            } catch (Exception e) {
+                log.error(e);
+                msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_FAILED);
+            } finally {
+                msg.setQueueAttempts(msg.getQueueAttempts() + 1);
+                update(context, msg);
+            }
+
+            messages = findOldestMessagesToProcess(context);
+            messages.addAll(findMessagesToBeReprocessed(context));
+            msgOpt = getSingleMessageEntity(messages);
+        }
+        return count;
+    }
+
+    private boolean isServiceEnabled(LDNMessageEntity msg) {
+        String localInboxUrl = configurationService.getProperty("ldn.notify.inbox");
+        if (msg.getTarget() == null || StringUtils.equals(msg.getTarget().getLdnUrl(), localInboxUrl)) {
+            return msg.getOrigin().isEnabled();
+        }
+        return msg.getTarget().isEnabled();
+    }
+
+    @Override
+    public int checkQueueMessageTimeout(Context context) throws SQLException {
+        int count = 0;
+        int maxAttempts = configurationService.getIntProperty("ldn.processor.max.attempts", 5);
+        /*
+         * put failed on processing messages with timed-out timeout and
+         * attempts >= configured_max_attempts put queue on processing messages with
+         * timed-out timeout and attempts < configured_max_attempts
+         */
+        Optional<LDNMessageEntity> msgOpt = getSingleMessageEntity(findProcessingTimedoutMessages(context));
+
+        while (msgOpt.isPresent()) {
+            LDNMessageEntity msg = msgOpt.get();
+            try {
+                if (msg.getQueueAttempts() >= maxAttempts) {
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_FAILED);
+                } else {
+                    msg.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED);
+                }
+                update(context, msg);
+                count++;
+            } catch (SQLException e) {
+                log.error("Can't update LDN message " + msg, e);
+            }
+            msgOpt = getSingleMessageEntity(findProcessingTimedoutMessages(context));
+        }
+        return count;
+    }
+
+    public Optional<LDNMessageEntity> getSingleMessageEntity(Collection<LDNMessageEntity> messages) {
+        return messages.stream().findFirst();
+    }
+
+    @Override
+    public NotifyRequestStatus findRequestsByItem(Context context, Item item) throws SQLException {
+        NotifyRequestStatus result = new NotifyRequestStatus();
+        result.setItemUuid(item.getID());
+        List<LDNMessageEntity> msgs = ldnMessageDao.findAllMessagesByItem(
+            context, item, "Offer");
+        if (msgs != null && !msgs.isEmpty()) {
+            for (LDNMessageEntity msg : msgs) {
+                RequestStatus offer = new RequestStatus();
+                NotifyServiceEntity nse = msg.getOrigin();
+                if (nse == null) {
+                    nse = msg.getTarget();
+                }
+                offer.setServiceName(nse == null ? "Unknown Service" : nse.getName());
+                offer.setServiceUrl(nse == null ? "" : nse.getUrl());
+                offer.setOfferType(LDNUtils.getNotifyType(msg.getCoarNotifyType()));
+                List<LDNMessageEntity> acks = ldnMessageDao.findAllRelatedMessagesByItem(
+                    context, msg, item, "Accept", "TentativeReject", "TentativeAccept", "Announce");
+                if (acks == null || acks.isEmpty()) {
+                    offer.setStatus(NotifyRequestStatusEnum.REQUESTED);
+                } else if (acks.stream()
+                    .filter(c -> (c.getActivityStreamType().equalsIgnoreCase("TentativeAccept") ||
+                        c.getActivityStreamType().equalsIgnoreCase("Accept")))
+                    .findAny().isPresent()) {
+                    offer.setStatus(NotifyRequestStatusEnum.ACCEPTED);
+                } else if (acks.stream()
+                    .filter(c -> c.getActivityStreamType().equalsIgnoreCase("TentativeReject"))
+                    .findAny().isPresent()) {
+                    offer.setStatus(NotifyRequestStatusEnum.REJECTED);
+                }
+                if (acks.stream().filter(
+                    c -> c.getActivityStreamType().equalsIgnoreCase("Announce"))
+                    .findAny().isEmpty()) {
+                    result.addRequestStatus(offer);
+                }
+            }
+        }
+        return result;
+    }
+
+    public void delete(Context context, LDNMessageEntity ldnMessage) throws SQLException {
+        ldnMessageDao.delete(context, ldnMessage);
+    }
+
+    @Override
+    public boolean isTargetCurrent(Notification notification) {
+        String localInboxUrl = configurationService.getProperty("ldn.notify.inbox");
+        return StringUtils.equals(notification.getTarget().getInbox(), localInboxUrl);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyPatternToTriggerImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyPatternToTriggerImpl.java
new file mode 100644
index 0000000000..89ec4abe58
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyPatternToTriggerImpl.java
@@ -0,0 +1,62 @@
+/**
+ * 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.ldn.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.dao.NotifyPatternToTriggerDao;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link NotifyPatternToTriggerService}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyPatternToTriggerImpl implements NotifyPatternToTriggerService {
+
+    @Autowired(required = true)
+    private NotifyPatternToTriggerDao notifyPatternToTriggerDao;
+
+    @Override
+    public List<NotifyPatternToTrigger> findAll(Context context) throws SQLException {
+        return notifyPatternToTriggerDao.findAll(context, NotifyPatternToTrigger.class);
+    }
+
+    @Override
+    public List<NotifyPatternToTrigger> findByItem(Context context, Item item) throws SQLException {
+        return notifyPatternToTriggerDao.findByItem(context, item);
+    }
+
+    @Override
+    public List<NotifyPatternToTrigger> findByItemAndPattern(Context context, Item item, String pattern)
+        throws SQLException {
+        return notifyPatternToTriggerDao.findByItemAndPattern(context, item, pattern);
+    }
+
+    @Override
+    public NotifyPatternToTrigger create(Context context) throws SQLException {
+        NotifyPatternToTrigger notifyPatternToTrigger = new NotifyPatternToTrigger();
+        return notifyPatternToTriggerDao.create(context, notifyPatternToTrigger);
+    }
+
+    @Override
+    public void update(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException {
+        notifyPatternToTriggerDao.save(context, notifyPatternToTrigger);
+    }
+
+    @Override
+    public void delete(Context context, NotifyPatternToTrigger notifyPatternToTrigger) throws SQLException {
+        notifyPatternToTriggerDao.delete(context, notifyPatternToTrigger);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceImpl.java
new file mode 100644
index 0000000000..87be008371
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceImpl.java
@@ -0,0 +1,67 @@
+/**
+ * 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.ldn.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.dao.NotifyServiceDao;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link NotifyService}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceImpl implements NotifyService {
+
+    @Autowired(required = true)
+    private NotifyServiceDao notifyServiceDao;
+
+    @Override
+    public List<NotifyServiceEntity> findAll(Context context) throws SQLException {
+        return notifyServiceDao.findAll(context, NotifyServiceEntity.class);
+    }
+
+    @Override
+    public NotifyServiceEntity find(Context context, Integer id) throws SQLException {
+        return notifyServiceDao.findByID(context, NotifyServiceEntity.class, id);
+    }
+
+    @Override
+    public NotifyServiceEntity create(Context context, String name) throws SQLException {
+        NotifyServiceEntity notifyServiceEntity = new NotifyServiceEntity();
+        notifyServiceEntity.setName(name);
+        return notifyServiceDao.create(context, notifyServiceEntity);
+    }
+
+    @Override
+    public void update(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException {
+        notifyServiceDao.save(context, notifyServiceEntity);
+    }
+
+    @Override
+    public void delete(Context context, NotifyServiceEntity notifyServiceEntity) throws SQLException {
+        notifyServiceDao.delete(context, notifyServiceEntity);
+    }
+
+    @Override
+    public NotifyServiceEntity findByLdnUrl(Context context, String ldnUrl) throws SQLException {
+        return notifyServiceDao.findByLdnUrl(context, ldnUrl);
+    }
+
+    @Override
+    public List<NotifyServiceEntity> findManualServicesByInboundPattern(Context context, String pattern)
+        throws SQLException {
+        return notifyServiceDao.findManualServicesByInboundPattern(context, pattern);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceInboundPatternServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceInboundPatternServiceImpl.java
new file mode 100644
index 0000000000..c699d9fd03
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/NotifyServiceInboundPatternServiceImpl.java
@@ -0,0 +1,59 @@
+/**
+ * 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.ldn.service.impl;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.dao.NotifyServiceInboundPatternDao;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation Service class for the {@link NotifyServiceInboundPatternService}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceInboundPatternServiceImpl implements NotifyServiceInboundPatternService {
+
+    @Autowired
+    private NotifyServiceInboundPatternDao inboundPatternDao;
+
+    @Override
+    public NotifyServiceInboundPattern findByServiceAndPattern(Context context,
+                                                               NotifyServiceEntity notifyServiceEntity,
+                                                               String pattern) throws SQLException {
+        return inboundPatternDao.findByServiceAndPattern(context, notifyServiceEntity, pattern);
+    }
+
+    @Override
+    public List<NotifyServiceInboundPattern> findAutomaticPatterns(Context context) throws SQLException {
+        return inboundPatternDao.findAutomaticPatterns(context);
+    }
+
+    @Override
+    public NotifyServiceInboundPattern create(Context context, NotifyServiceEntity notifyServiceEntity)
+        throws SQLException {
+        NotifyServiceInboundPattern inboundPattern = new NotifyServiceInboundPattern();
+        inboundPattern.setNotifyService(notifyServiceEntity);
+        return inboundPatternDao.create(context, inboundPattern);
+    }
+
+    @Override
+    public void update(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException {
+        inboundPatternDao.save(context, inboundPattern);
+    }
+
+    @Override
+    public void delete(Context context, NotifyServiceInboundPattern inboundPattern) throws SQLException {
+        inboundPatternDao.delete(context, inboundPattern);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/utility/LDNUtils.java b/dspace-api/src/main/java/org/dspace/app/ldn/utility/LDNUtils.java
new file mode 100644
index 0000000000..949da655bc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/ldn/utility/LDNUtils.java
@@ -0,0 +1,96 @@
+/**
+ * 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.ldn.utility;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Some linked data notification utilities.
+ */
+public class LDNUtils {
+
+    private final static Pattern UUID_REGEX_PATTERN = Pattern.compile(
+            "\\p{XDigit}{8}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{4}-\\p{XDigit}{12}");
+
+    private final static String SIMPLE_PROTOCOL_REGEX = "^(http[s]?://www\\.|http[s]?://|www\\.)";
+
+    /**
+     * 
+     */
+    private LDNUtils() {
+
+    }
+
+    /**
+     * Whether the URL contains an UUID. Used to determine item id from item URL.
+     *
+     * @param url item URL
+     * @return boolean true if URL has UUID, false otherwise
+     */
+    public static boolean hasUUIDInURL(String url) {
+        Matcher matcher = UUID_REGEX_PATTERN.matcher(url);
+
+        return matcher.find();
+    }
+
+    /**
+     * Extract UUID from URL.
+     *
+     * @param url item URL
+     * @return UUID item id
+     */
+    public static UUID getUUIDFromURL(String url) {
+        Matcher matcher = UUID_REGEX_PATTERN.matcher(url);
+        StringBuilder handle = new StringBuilder();
+        if (matcher.find()) {
+            handle.append(matcher.group(0));
+        }
+        return UUID.fromString(handle.toString());
+    }
+
+    /**
+     * Remove http or https protocol from URL.
+     *
+     * @param url URL
+     * @return String URL without protocol
+     */
+    public static String removedProtocol(String url) {
+        return url.replaceFirst(SIMPLE_PROTOCOL_REGEX, EMPTY);
+    }
+
+    /**
+     * Custom context resolver processing. Currently converting DOI URL to DOI id.
+     *
+     * @param value context ietf:cite-as
+     * @return String ietf:cite-as identifier
+     */
+    public static String processContextResolverId(String value) {
+        String resolverId = value;
+        resolverId = resolverId.replace("https://doi.org/", "doi:");
+
+        return resolverId;
+    }
+
+    /**
+     * Clear the coarNotifyType from the source code.
+     *
+     * @param coarNotifyType coar Notify Type to sanitize
+     * @return String just the notify type
+     */
+    public static String getNotifyType(String coarNotifyType) {
+        String justNotifyType = coarNotifyType;
+        justNotifyType = justNotifyType.substring(justNotifyType.lastIndexOf(":") + 1);
+        justNotifyType = justNotifyType.replace("Action",  "");
+        return justNotifyType;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
index 408982d157..8ed67f4df4 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java
@@ -148,7 +148,7 @@ public abstract class ImageMagickThumbnailFilter extends MediaFilter {
         // the thumbnail because the CropBox is generally used to define the
         // area displayed when a user opens the PDF on a screen, whereas the
         // MediaBox is used for print. Not all PDFs set these correctly, so
-        // we can use ImageMagick's default behavior unless we see an explit
+        // we can use ImageMagick's default behavior unless we see an explicit
         // CropBox. Note: we don't need to do anything special to detect if
         // the CropBox is missing or empty because pdfbox will set it to the
         // same size as the MediaBox if it doesn't exist. Also note that we
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScript.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScript.java
index 5fbbebbb28..7f022f38b3 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScript.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScript.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.mediafilter;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,8 +38,9 @@ import org.dspace.utils.DSpace;
  * MFM: -v verbose outputs all extracted text to STDOUT; -f force forces all
  * bitstreams to be processed, even if they have been before; -n noindex does not
  * recreate index after processing bitstreams; -i [identifier] limits processing
- * scope to a community, collection or item; and -m [max] limits processing to a
- * maximum number of items.
+ * scope to a community, collection or item; -m [max] limits processing to a
+ * maximum number of items; -fd [fromdate] takes only items starting from this date,
+ * filtering by last_modified in the item table.
  */
 public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfiguration> {
 
@@ -60,6 +62,7 @@ public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfigura
     private String[] filterNames;
     private String[] skipIds = null;
     private Map<String, List<String>> filterFormats = new HashMap<>();
+    private LocalDate fromDate = null;
 
     public MediaFilterScriptConfiguration getScriptConfiguration() {
         return new DSpace().getServiceManager()
@@ -112,6 +115,10 @@ public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfigura
             skipIds = commandLine.getOptionValues('s');
         }
 
+        if (commandLine.hasOption('d')) {
+            fromDate = LocalDate.parse(commandLine.getOptionValue('d'));
+        }
+
 
     }
 
@@ -215,6 +222,10 @@ public class MediaFilterScript extends DSpaceRunnable<MediaFilterScriptConfigura
             mediaFilterService.setSkipList(Arrays.asList(skipIds));
         }
 
+        if (fromDate != null) {
+            mediaFilterService.setFromDate(fromDate);
+        }
+
         Context c = null;
 
         try {
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java
index 7465fa6e12..c9f61292d6 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterScriptConfiguration.java
@@ -52,6 +52,8 @@ public class MediaFilterScriptConfiguration<T extends MediaFilterScript> extends
                                     .build();
         options.addOption(pluginOption);
 
+        options.addOption("d", "fromdate", true, "Process only item from specified last modified date");
+
         Option skipOption = Option.builder("s")
                                   .longOpt("skip")
                                   .hasArg()
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java
index a6ba9fde88..512b8f803b 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/MediaFilterServiceImpl.java
@@ -9,8 +9,11 @@ package org.dspace.app.mediafilter;
 
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -93,6 +96,7 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
     protected boolean isVerbose = false;
     protected boolean isQuiet = false;
     protected boolean isForce = false; // default to not forced
+    protected LocalDate fromDate = null;
 
     protected MediaFilterServiceImpl() {
 
@@ -120,6 +124,15 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
             for (Community topLevelCommunity : topLevelCommunities) {
                 applyFiltersCommunity(context, topLevelCommunity);
             }
+        } else if (fromDate != null) {
+            Iterator<Item> itemIterator =
+                    itemService.findByLastModifiedSince(
+                            context,
+                            Date.from(fromDate.atStartOfDay(ZoneId.systemDefault()).toInstant())
+                    );
+            while (itemIterator.hasNext() && processed < max2Process) {
+                applyFiltersItem(context, itemIterator.next());
+            }
         } else {
             //otherwise, just find every item and process
             Iterator<Item> itemIterator = itemService.findAll(context);
@@ -588,4 +601,9 @@ public class MediaFilterServiceImpl implements MediaFilterService, InitializingB
     public void setLogHandler(DSpaceRunnableHandler handler) {
         this.handler = handler;
     }
+
+    @Override
+    public void setFromDate(LocalDate fromDate) {
+        this.fromDate = fromDate;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/mediafilter/service/MediaFilterService.java b/dspace-api/src/main/java/org/dspace/app/mediafilter/service/MediaFilterService.java
index bc92ff5210..30e6dba42f 100644
--- a/dspace-api/src/main/java/org/dspace/app/mediafilter/service/MediaFilterService.java
+++ b/dspace-api/src/main/java/org/dspace/app/mediafilter/service/MediaFilterService.java
@@ -8,6 +8,7 @@
 package org.dspace.app.mediafilter.service;
 
 import java.sql.SQLException;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -149,4 +150,6 @@ public interface MediaFilterService {
      * @param handler
      */
     public void setLogHandler(DSpaceRunnableHandler handler);
+
+    public void setFromDate(LocalDate fromDate);
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java
index cdefd1298c..bf2bfb4d60 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItem.java
@@ -8,19 +8,19 @@
 package org.dspace.app.requestitem;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
index 6499c45a78..c489fb4b3f 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
@@ -11,11 +11,11 @@ package org.dspace.app.requestitem;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.annotation.ManagedBean;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.mail.MessagingException;
 
+import jakarta.annotation.ManagedBean;
+import jakarta.inject.Inject;
+import jakarta.inject.Singleton;
+import jakarta.mail.MessagingException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.requestitem.service.RequestItemService;
diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/dao/impl/RequestItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/app/requestitem/dao/impl/RequestItemDAOImpl.java
index 008174ded8..c76bd50d19 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/dao/impl/RequestItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/dao/impl/RequestItemDAOImpl.java
@@ -9,11 +9,11 @@ package org.dspace.app.requestitem.dao.impl;
 
 import java.sql.SQLException;
 import java.util.Iterator;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.app.requestitem.RequestItem;
 import org.dspace.app.requestitem.RequestItem_;
 import org.dspace.app.requestitem.dao.RequestItemDAO;
@@ -44,8 +44,12 @@ public class RequestItemDAOImpl extends AbstractHibernateDAO<RequestItem> implem
     }
     @Override
     public Iterator<RequestItem> findByItem(Context context, Item item) throws SQLException {
-        Query query = createQuery(context, "FROM RequestItem WHERE item_id= :uuid");
-        query.setParameter("uuid", item.getID());
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, RequestItem.class);
+        Root<RequestItem> requestItemRoot = criteriaQuery.from(RequestItem.class);
+        criteriaQuery.select(requestItemRoot);
+        criteriaQuery.where(criteriaBuilder.equal(requestItemRoot.get(RequestItem_.item), item));
+        Query query = createQuery(context, criteriaQuery);
         return iterate(query);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java b/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
index ead725e842..943df5f2a0 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/SHERPAService.java
@@ -12,8 +12,8 @@ import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.charset.StandardCharsets;
-import javax.annotation.PostConstruct;
 
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
@@ -78,7 +78,7 @@ public class SHERPAService {
     @SuppressWarnings("unused")
     @PostConstruct
     private void init() {
-        // Get endoint and API key from configuration
+        // Get endpoint and API key from configuration
         endpoint = configurationService.getProperty("sherpa.romeo.url",
             "https://v2.sherpa.ac.uk/cgi/retrieve");
         apiKey = configurationService.getProperty("sherpa.romeo.apikey");
@@ -93,7 +93,7 @@ public class SHERPAService {
      * @param query ISSN string to pass in an "issn equals" API query
      * @return      SHERPAResponse containing an error or journal policies
      */
-    @Cacheable(key = "#query", cacheNames = "sherpa.searchByJournalISSN")
+    @Cacheable(key = "#query", condition = "#query != null", cacheNames = "sherpa.searchByJournalISSN")
     public SHERPAResponse searchByJournalISSN(String query) {
         return performRequest("publication", "issn", "equals", query, 0, 1);
     }
@@ -156,7 +156,7 @@ public class SHERPAService {
 
                 // If the response body is valid, pass to SHERPAResponse for parsing as JSON
                 if (null != responseBody) {
-                    log.debug("Non-null SHERPA resonse received for query of " + value);
+                    log.debug("Non-null SHERPA response received for query of " + value);
                     InputStream content = null;
                     try {
                         content = responseBody.getContent();
@@ -259,7 +259,7 @@ public class SHERPAService {
 
                 // If the response body is valid, pass to SHERPAResponse for parsing as JSON
                 if (null != responseBody) {
-                    log.debug("Non-null SHERPA resonse received for query of " + value);
+                    log.debug("Non-null SHERPA response received for query of " + value);
                     InputStream content = null;
                     try {
                         content = responseBody.getContent();
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java b/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java
index e84fb7775a..5bdf1efa26 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/cache/SherpaCacheLogger.java
@@ -13,7 +13,7 @@ import org.ehcache.event.CacheEvent;
 import org.ehcache.event.CacheEventListener;
 
 /**
- * This is a EHCache listner responsible for logging sherpa cache events. It is
+ * This is a EHCache listener responsible for logging sherpa cache events. It is
  * bound to the sherpa cache via the dspace/config/ehcache.xml file. We need a
  * dedicated Logger for each cache as the CacheEvent doesn't include details
  * about where the event occur
diff --git a/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java b/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java
index b795c8a2b2..cb913a9f26 100644
--- a/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java
+++ b/dspace-api/src/main/java/org/dspace/app/sherpa/submit/SHERPASubmitService.java
@@ -47,7 +47,7 @@ public class SHERPASubmitService {
     }
 
     /**
-     * Setter for SHERPA service, reponsible for actual HTTP API calls
+     * Setter for SHERPA service, responsible for actual HTTP API calls
      * @see "dspace-dspace-addon-sherpa-configuration-services.xml"
      * @param sherpaService
      */
diff --git a/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java b/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java
index 90962d12aa..2464221d2d 100644
--- a/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java
+++ b/dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java
@@ -141,7 +141,7 @@ public class GenerateSitemaps {
     public static void deleteSitemaps() throws IOException {
         File outputDir = new File(configurationService.getProperty("sitemap.dir"));
         if (!outputDir.exists() && !outputDir.isDirectory()) {
-            log.error("Unable to delete sitemaps directory, doesn't exist or isn't a directort");
+            log.error("Unable to delete sitemaps directory, doesn't exist or isn't a directory");
         } else {
             FileUtils.deleteDirectory(outputDir);
         }
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java b/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
index 3d76ecaecf..9e27ffdd93 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/HTMLReport.java
@@ -451,7 +451,7 @@ public class HTMLReport implements Report {
     }
 
     /**
-     * Clean Stirngs for display in HTML
+     * Clean Strings for display in HTML
      *
      * @param s The String to clean
      * @return The cleaned String
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java b/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
index 2e4ed69b26..982c339963 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/LogAnalyser.java
@@ -481,7 +481,7 @@ public class LogAnalyser {
         // of the log file are sequential, but can we assume the files are
         // provided in a data sequence?
         for (i = 0; i < logFiles.length; i++) {
-            // check to see if this file is a log file agains the global regex
+            // check to see if this file is a log file against the global regex
             Matcher matchRegex = logRegex.matcher(logFiles[i].getName());
             if (matchRegex.matches()) {
                 // if it is a log file, open it up and lets have a look at the
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java b/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
index c5fe0072f5..5b526773d4 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/ReportGenerator.java
@@ -352,7 +352,7 @@ public class ReportGenerator {
         report.setEndDate(endDate);
         report.setMainTitle(name, serverName);
 
-        // define our standard variables for re-use
+        // define our standard variables for reuse
         // FIXME: we probably don't need these once we've finished re-factoring
         Iterator<String> keys = null;
         int i = 0;
@@ -518,7 +518,7 @@ public class ReportGenerator {
 
     /**
      * a standard stats block preparation method for use when an aggregator
-     * has to be put out in its entirity.  This method will not be able to
+     * has to be put out in its entirety.  This method will not be able to
      * deal with complex cases, although it will perform sorting by value and
      * translations as per the map file if requested
      *
@@ -783,7 +783,7 @@ public class ReportGenerator {
             return null;
         }
 
-        // build the referece
+        // build the reference
         // FIXME: here we have blurred the line between content and presentation
         // and it should probably be un-blurred
         List<MetadataValue> title = itemService.getMetadata(item, MetadataSchemaEnum.DC.getName(),
diff --git a/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java b/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
index cc8a7024f1..23dbe19b61 100644
--- a/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
+++ b/dspace-api/src/main/java/org/dspace/app/statistics/StatisticsLoader.java
@@ -291,7 +291,7 @@ public class StatisticsLoader {
      * by the formatter provided, then we return null.
      *
      * @param thisFile    file
-     * @param thisPattern patter
+     * @param thisPattern pattern
      * @param sdf         date format
      * @return StatsFile
      */
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionProvider.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionProvider.java
new file mode 100644
index 0000000000..f5acd2ccbc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionProvider.java
@@ -0,0 +1,140 @@
+/**
+ * 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.suggestion;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Suggestion provider that read the suggestion from the local suggestion solr
+ * core
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ *
+ */
+public abstract class SolrSuggestionProvider implements SuggestionProvider {
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SolrSuggestionProvider.class);
+
+    @Autowired
+    protected ItemService itemService;
+
+    @Autowired
+    protected SolrSuggestionStorageService solrSuggestionStorageService;
+
+    private String sourceName;
+
+    public String getSourceName() {
+        return sourceName;
+    }
+
+    public void setSourceName(String sourceName) {
+        this.sourceName = sourceName;
+    }
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    @Override
+    public long countAllTargets(Context context) {
+        try {
+            return this.solrSuggestionStorageService.countAllTargets(context, sourceName);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public long countUnprocessedSuggestionByTarget(Context context, UUID target) {
+        try {
+            return this.solrSuggestionStorageService.countUnprocessedSuggestionByTarget(context, sourceName, target);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<Suggestion> findAllUnprocessedSuggestions(Context context, UUID target, int pageSize, long offset,
+            boolean ascending) {
+
+        try {
+            return this.solrSuggestionStorageService.findAllUnprocessedSuggestions(context, sourceName,
+                target, pageSize, offset, ascending);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    @Override
+    public List<SuggestionTarget> findAllTargets(Context context, int pageSize, long offset) {
+        try {
+            return this.solrSuggestionStorageService.findAllTargets(context, sourceName, pageSize, offset);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public Suggestion findUnprocessedSuggestion(Context context, UUID target, String id) {
+        try {
+            return this.solrSuggestionStorageService.findUnprocessedSuggestion(context, sourceName, target, id);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public SuggestionTarget findTarget(Context context, UUID target) {
+        try {
+            return this.solrSuggestionStorageService.findTarget(context, sourceName, target);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void rejectSuggestion(Context context, UUID target, String idPart) {
+        Suggestion suggestion = findUnprocessedSuggestion(context, target, idPart);
+        try {
+            solrSuggestionStorageService.flagSuggestionAsProcessed(suggestion);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void flagRelatedSuggestionsAsProcessed(Context context, ExternalDataObject externalDataObject) {
+        if (!isExternalDataObjectPotentiallySuggested(context, externalDataObject)) {
+            return;
+        }
+        try {
+            solrSuggestionStorageService.flagAllSuggestionAsProcessed(sourceName, externalDataObject.getId());
+        } catch (SolrServerException | IOException e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * check if the externalDataObject may have suggestion
+     * @param context
+     * @param externalDataObject
+     * @return true if the externalDataObject could be suggested by this provider
+     *         (i.e. it comes from a DataProvider used by this suggestor)
+     */
+    protected abstract boolean isExternalDataObjectPotentiallySuggested(Context context,
+            ExternalDataObject externalDataObject);
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageService.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageService.java
new file mode 100644
index 0000000000..b7de6146f2
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageService.java
@@ -0,0 +1,191 @@
+/**
+ * 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.suggestion;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.core.Context;
+
+/**
+ * Service to deal with the local suggestion solr core used by the
+ * SolrSuggestionProvider(s)
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ * @author Luca Giamminonni (luca.giamminonni at 4science dot it)
+ *
+ */
+public interface SolrSuggestionStorageService {
+    public static final String SOURCE = "source";
+    /** This is the URI Part of the suggestion source:target:id */
+    public static final String SUGGESTION_FULLID = "suggestion_fullid";
+    public static final String SUGGESTION_ID = "suggestion_id";
+    public static final String TARGET_ID = "target_id";
+    public static final String TITLE = "title";
+    public static final String DATE = "date";
+    public static final String DISPLAY = "display";
+    public static final String CONTRIBUTORS = "contributors";
+    public static final String ABSTRACT = "abstract";
+    public static final String CATEGORY = "category";
+    public static final String EXTERNAL_URI = "external-uri";
+    public static final String PROCESSED = "processed";
+    public static final String SCORE = "trust";
+    public static final String EVIDENCES = "evidences";
+
+    /**
+     * Add a new suggestion to SOLR
+     * 
+     * @param suggestion
+     * @param force true if the suggestion must be reindexed
+     * @param commit
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void addSuggestion(Suggestion suggestion, boolean force, boolean commit)
+            throws SolrServerException, IOException;
+
+    /**
+     * Return true if the suggestion is already in SOLR and flagged as processed
+     * 
+     * @param suggestion
+     * @return true if the suggestion is already in SOLR and flagged as processed
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public boolean exist(Suggestion suggestion) throws SolrServerException, IOException;
+
+    /**
+     * Delete a suggestion from SOLR if any
+     * 
+     * @param suggestion
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void deleteSuggestion(Suggestion suggestion) throws SolrServerException, IOException;
+
+    /**
+     * Flag a suggestion as processed in SOLR if any
+     * 
+     * @param suggestion
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void flagSuggestionAsProcessed(Suggestion suggestion) throws SolrServerException, IOException;
+
+    /**
+     * Delete all the suggestions from SOLR if any related to a specific target
+     * 
+     * @param target
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    public void deleteTarget(SuggestionTarget target) throws SolrServerException, IOException;
+
+    /**
+     * Performs an explicit commit, causing pending documents to be committed for
+     * indexing.
+     *
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    void commit() throws SolrServerException, IOException;
+
+    /**
+     * Flag all the suggestion related to the given source and id as processed.
+     *
+     * @param  source              the source name
+     * @param  idPart              the id's last part
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    void flagAllSuggestionAsProcessed(String source, String idPart) throws SolrServerException, IOException;
+
+    /**
+     * Count all the targets related to the given source.
+     *
+     * @param  source              the source name
+     * @return                     the target's count
+     * @throws IOException
+     * @throws SolrServerException
+     */
+    long countAllTargets(Context context, String source) throws SolrServerException, IOException;
+
+    /**
+     * Count all the unprocessed suggestions related to the given source and target.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @return                     the suggestion count
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    long countUnprocessedSuggestionByTarget(Context context, String source, UUID target)
+        throws SolrServerException, IOException;
+
+    /**
+     * Find all the unprocessed suggestions related to the given source and target.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @param  pageSize            the page size
+     * @param  offset              the page offset
+     * @param  ascending           true to retrieve the suggestions ordered by score
+     *                             ascending
+     * @return                     the found suggestions
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    List<Suggestion> findAllUnprocessedSuggestions(Context context, String source, UUID target,
+        int pageSize, long offset, boolean ascending) throws SolrServerException, IOException;
+
+    /**
+     *
+     * Find all the suggestion targets related to the given source.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  pageSize            the page size
+     * @param  offset              the page offset
+     * @return                     the found suggestion targets
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    List<SuggestionTarget> findAllTargets(Context context, String source, int pageSize, long offset)
+        throws SolrServerException, IOException;
+
+    /**
+     * Find an unprocessed suggestion by the given source, target id and suggestion
+     * id.
+     *
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @param  id                  the suggestion id
+     * @return                     the suggestion, if any
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    Suggestion findUnprocessedSuggestion(Context context, String source, UUID target, String id)
+        throws SolrServerException, IOException;
+
+    /**
+     * Find a suggestion target by the given source and target.
+     * 
+     * @param  context             the DSpace Context
+     * @param  source              the source name
+     * @param  target              the target id
+     * @return                     the suggestion target, if any
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    SuggestionTarget findTarget(Context context, String source, UUID target) throws SolrServerException, IOException;
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageServiceImpl.java
new file mode 100644
index 0000000000..3c2ad71846
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageServiceImpl.java
@@ -0,0 +1,361 @@
+/**
+ * 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.suggestion;
+
+import static org.apache.commons.collections.CollectionUtils.isEmpty;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrQuery.SortClause;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.solr.client.solrj.response.FacetField.Count;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.FacetParams;
+import org.dspace.content.Item;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Service to deal with the local suggestion solr core used by the
+ * SolrSuggestionProvider(s)
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ *
+ */
+public class SolrSuggestionStorageServiceImpl implements SolrSuggestionStorageService {
+
+    private static final Logger log = LogManager.getLogger(SolrSuggestionStorageServiceImpl.class);
+
+    protected SolrClient solrSuggestionClient;
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * Get solr client which use suggestion core
+     * 
+     * @return solr client
+     */
+    protected SolrClient getSolr() {
+        if (solrSuggestionClient == null) {
+            String solrService = DSpaceServicesFactory.getInstance().getConfigurationService()
+                    .getProperty("suggestion.solr.server", "http://localhost:8983/solr/suggestion");
+            solrSuggestionClient = new HttpSolrClient.Builder(solrService).build();
+        }
+        return solrSuggestionClient;
+    }
+
+    @Override
+    public void addSuggestion(Suggestion suggestion, boolean force, boolean commit)
+            throws SolrServerException, IOException {
+        if (force || !exist(suggestion)) {
+            ObjectMapper jsonMapper = new JsonMapper();
+            jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            SolrInputDocument document = new SolrInputDocument();
+            document.addField(SOURCE, suggestion.getSource());
+            // suggestion id is written as concatenation of
+            // source + ":" + targetID + ":" + idPart (of externalDataObj)
+            String suggestionFullID = suggestion.getID();
+            document.addField(SUGGESTION_FULLID, suggestionFullID);
+            document.addField(SUGGESTION_ID, suggestionFullID.split(":", 3)[2]);
+            document.addField(TARGET_ID, suggestion.getTarget().getID().toString());
+            document.addField(DISPLAY, suggestion.getDisplay());
+            document.addField(TITLE, getFirstValue(suggestion, "dc", "title", null));
+            document.addField(DATE, getFirstValue(suggestion, "dc", "date", "issued"));
+            document.addField(CONTRIBUTORS, getAllValues(suggestion, "dc", "contributor", "author"));
+            document.addField(ABSTRACT, getFirstValue(suggestion, "dc", "description", "abstract"));
+            document.addField(CATEGORY, getAllValues(suggestion, "dc", "source", null));
+            document.addField(EXTERNAL_URI, suggestion.getExternalSourceUri());
+            document.addField(SCORE, suggestion.getScore());
+            document.addField(PROCESSED, false);
+            document.addField(EVIDENCES, jsonMapper.writeValueAsString(suggestion.getEvidences()));
+            getSolr().add(document);
+            if (commit) {
+                getSolr().commit();
+            }
+        }
+    }
+
+    @Override
+    public void commit() throws SolrServerException, IOException {
+        getSolr().commit();
+    }
+
+    private List<String> getAllValues(Suggestion suggestion, String schema, String element, String qualifier) {
+        return suggestion.getMetadata().stream()
+                .filter(st -> StringUtils.isNotBlank(st.getValue()) && StringUtils.equals(st.getSchema(), schema)
+                        && StringUtils.equals(st.getElement(), element)
+                        && StringUtils.equals(st.getQualifier(), qualifier))
+                .map(st -> st.getValue()).collect(Collectors.toList());
+    }
+
+    private String getFirstValue(Suggestion suggestion, String schema, String element, String qualifier) {
+        return suggestion.getMetadata().stream()
+            .filter(st -> StringUtils.isNotBlank(st.getValue())
+                && StringUtils.equals(st.getSchema(), schema)
+                        && StringUtils.equals(st.getElement(), element)
+                        && StringUtils.equals(st.getQualifier(), qualifier))
+                .map(st -> st.getValue()).findFirst().orElse(null);
+    }
+
+    @Override
+    public boolean exist(Suggestion suggestion) throws SolrServerException, IOException {
+        SolrQuery query = new SolrQuery(
+                SUGGESTION_FULLID + ":\"" + suggestion.getID() + "\" AND " + PROCESSED + ":true");
+        return getSolr().query(query).getResults().getNumFound() == 1;
+    }
+
+    @Override
+    public void deleteSuggestion(Suggestion suggestion) throws SolrServerException, IOException {
+        getSolr().deleteById(suggestion.getID());
+        getSolr().commit();
+    }
+
+    @Override
+    public void flagSuggestionAsProcessed(Suggestion suggestion) throws SolrServerException, IOException {
+        SolrInputDocument sdoc = new SolrInputDocument();
+        sdoc.addField(SUGGESTION_FULLID, suggestion.getID());
+        Map<String, Object> fieldModifier = new HashMap<>(1);
+        fieldModifier.put("set", true);
+        sdoc.addField(PROCESSED, fieldModifier); // add the map as the field value
+        getSolr().add(sdoc);
+        getSolr().commit();
+    }
+
+    @Override
+    public void flagAllSuggestionAsProcessed(String source, String idPart) throws SolrServerException, IOException {
+        SolrQuery query = new SolrQuery(SOURCE + ":" + source + " AND " + SUGGESTION_ID + ":\"" + idPart + "\"");
+        query.setRows(Integer.MAX_VALUE);
+        query.setFields(SUGGESTION_FULLID);
+        SolrDocumentList results = getSolr().query(query).getResults();
+        if (results.getNumFound() > 0) {
+            for (SolrDocument rDoc : results) {
+                SolrInputDocument sdoc = new SolrInputDocument();
+                sdoc.addField(SUGGESTION_FULLID, rDoc.getFieldValue(SUGGESTION_FULLID));
+                Map<String, Object> fieldModifier = new HashMap<>(1);
+                fieldModifier.put("set", true);
+                sdoc.addField(PROCESSED, fieldModifier); // add the map as the field value
+                getSolr().add(sdoc);
+            }
+        }
+        getSolr().commit();
+    }
+
+    @Override
+    public void deleteTarget(SuggestionTarget target) throws SolrServerException, IOException {
+        getSolr().deleteByQuery(
+                SOURCE + ":" + target.getSource() + " AND " + TARGET_ID + ":" + target.getTarget().getID().toString());
+        getSolr().commit();
+    }
+
+    @Override
+    public long countAllTargets(Context context, String source) throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(SOURCE + ":" + source);
+        solrQuery.addFilterQuery(PROCESSED + ":false");
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TARGET_ID);
+        solrQuery.setFacetLimit(Integer.MAX_VALUE);
+        QueryResponse response = getSolr().query(solrQuery);
+        return response.getFacetField(TARGET_ID).getValueCount();
+    }
+
+    @Override
+    public long countUnprocessedSuggestionByTarget(Context context, String source, UUID target)
+        throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery("*:*");
+        solrQuery.addFilterQuery(
+            SOURCE + ":" + source,
+            TARGET_ID + ":" + target.toString(),
+            PROCESSED + ":false");
+
+        QueryResponse response = getSolr().query(solrQuery);
+        return response.getResults().getNumFound();
+    }
+
+    @Override
+    public List<Suggestion> findAllUnprocessedSuggestions(Context context, String source, UUID target,
+        int pageSize, long offset, boolean ascending) throws SolrServerException, IOException {
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(pageSize);
+        solrQuery.setStart((int) offset);
+        solrQuery.setQuery("*:*");
+        solrQuery.addFilterQuery(
+            SOURCE + ":" + source,
+            TARGET_ID + ":" + target.toString(),
+            PROCESSED + ":false");
+
+        if (ascending) {
+            solrQuery.addSort(SortClause.asc("trust"));
+        } else {
+            solrQuery.addSort(SortClause.desc("trust"));
+        }
+
+        solrQuery.addSort(SortClause.desc("date"));
+        solrQuery.addSort(SortClause.asc("title"));
+
+        QueryResponse response = getSolr().query(solrQuery);
+        List<Suggestion> suggestions = new ArrayList<Suggestion>();
+        for (SolrDocument solrDoc : response.getResults()) {
+            suggestions.add(convertSolrDoc(context, solrDoc, source));
+        }
+        return suggestions;
+
+    }
+
+    @Override
+    public List<SuggestionTarget> findAllTargets(Context context, String source, int pageSize, long offset)
+        throws SolrServerException, IOException {
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(SOURCE + ":" + source);
+        solrQuery.addFilterQuery(PROCESSED + ":false");
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TARGET_ID);
+        solrQuery.setParam(FacetParams.FACET_OFFSET, String.valueOf(offset));
+        solrQuery.setFacetLimit((int) (pageSize));
+        QueryResponse response = getSolr().query(solrQuery);
+        FacetField facetField = response.getFacetField(TARGET_ID);
+        List<SuggestionTarget> suggestionTargets = new ArrayList<SuggestionTarget>();
+        int idx = 0;
+        for (Count c : facetField.getValues()) {
+            SuggestionTarget target = new SuggestionTarget();
+            target.setSource(source);
+            target.setTotal((int) c.getCount());
+            target.setTarget(findItem(context, c.getName()));
+            suggestionTargets.add(target);
+            idx++;
+        }
+        return suggestionTargets;
+
+    }
+
+    @Override
+    public Suggestion findUnprocessedSuggestion(Context context, String source, UUID target, String id)
+        throws SolrServerException, IOException {
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(1);
+        solrQuery.setQuery("*:*");
+        solrQuery.addFilterQuery(
+            SOURCE + ":" + source,
+            TARGET_ID + ":" + target.toString(),
+            SUGGESTION_ID + ":\"" + id + "\"",
+            PROCESSED + ":false");
+
+        SolrDocumentList results = getSolr().query(solrQuery).getResults();
+        return isEmpty(results) ? null : convertSolrDoc(context, results.get(0), source);
+    }
+
+    @Override
+    public SuggestionTarget findTarget(Context context, String source, UUID target)
+        throws SolrServerException, IOException {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(SOURCE + ":" + source);
+        solrQuery.addFilterQuery(
+            TARGET_ID + ":" + target.toString(),
+            PROCESSED + ":false");
+        QueryResponse response = getSolr().query(solrQuery);
+        SuggestionTarget sTarget = new SuggestionTarget();
+        sTarget.setSource(source);
+        sTarget.setTotal((int) response.getResults().getNumFound());
+        Item itemTarget = findItem(context, target);
+        if (itemTarget != null) {
+            sTarget.setTarget(itemTarget);
+        } else {
+            return null;
+        }
+        return sTarget;
+    }
+
+    private Suggestion convertSolrDoc(Context context, SolrDocument solrDoc, String sourceName) {
+        Item target = findItem(context, (String) solrDoc.getFieldValue(TARGET_ID));
+
+        Suggestion suggestion = new Suggestion(sourceName, target, (String) solrDoc.getFieldValue(SUGGESTION_ID));
+        suggestion.setDisplay((String) solrDoc.getFieldValue(DISPLAY));
+        suggestion.getMetadata()
+            .add(new MetadataValueDTO("dc", "title", null, null, (String) solrDoc.getFieldValue(TITLE)));
+        suggestion.getMetadata()
+            .add(new MetadataValueDTO("dc", "date", "issued", null, (String) solrDoc.getFieldValue(DATE)));
+        suggestion.getMetadata().add(
+            new MetadataValueDTO("dc", "description", "abstract", null, (String) solrDoc.getFieldValue(ABSTRACT)));
+
+        suggestion.setExternalSourceUri((String) solrDoc.getFieldValue(EXTERNAL_URI));
+        if (solrDoc.containsKey(CATEGORY)) {
+            for (Object o : solrDoc.getFieldValues(CATEGORY)) {
+                suggestion.getMetadata().add(
+                    new MetadataValueDTO("dc", "source", null, null, (String) o));
+            }
+        }
+        if (solrDoc.containsKey(CONTRIBUTORS)) {
+            for (Object o : solrDoc.getFieldValues(CONTRIBUTORS)) {
+                suggestion.getMetadata().add(
+                    new MetadataValueDTO("dc", "contributor", "author", null, (String) o));
+            }
+        }
+        String evidencesJson = (String) solrDoc.getFieldValue(EVIDENCES);
+        ObjectMapper jsonMapper = new JsonMapper();
+        jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        List<SuggestionEvidence> evidences = new LinkedList<SuggestionEvidence>();
+        try {
+            evidences = jsonMapper.readValue(evidencesJson, new TypeReference<List<SuggestionEvidence>>() {});
+        } catch (JsonProcessingException e) {
+            log.error(e);
+        }
+        suggestion.getEvidences().addAll(evidences);
+        return suggestion;
+    }
+
+    private Item findItem(Context context, UUID itemId) {
+        try {
+            return itemService.find(context, itemId);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Item findItem(Context context, String itemId) {
+        return findItem(context, UUIDUtils.fromString(itemId));
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/Suggestion.java b/dspace-api/src/main/java/org/dspace/app/suggestion/Suggestion.java
new file mode 100644
index 0000000000..7812cbd522
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/Suggestion.java
@@ -0,0 +1,99 @@
+/**
+ * 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.suggestion;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.content.dto.MetadataValueDTO;
+
+/**
+ * This entity contains metadatas that should be added to the targeted Item
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class Suggestion {
+
+    /** id of the suggestion */
+    private String id;
+
+    /** the dc.title of the item */
+    private String display;
+
+    /** the external source name the suggestion comes from */
+    private String source;
+
+    /** external uri of the item */
+    private String externalSourceUri;
+
+    /** item targeted by this suggestion */
+    private Item target;
+
+    private List<SuggestionEvidence> evidences = new LinkedList<SuggestionEvidence>();
+
+    private List<MetadataValueDTO> metadata = new LinkedList<MetadataValueDTO>();
+
+    /** suggestion creation
+     * @param source name of the external source
+     * @param target the targeted item in repository
+     * @param idPart external item id, used mainly for suggestion @see #id creation
+     * */
+    public Suggestion(String source, Item target, String idPart) {
+        this.source = source;
+        this.target = target;
+        this.id = source + ":" + target.getID().toString() + ":" + idPart;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(String display) {
+        this.display = display;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public String getExternalSourceUri() {
+        return externalSourceUri;
+    }
+
+    public void setExternalSourceUri(String externalSourceUri) {
+        this.externalSourceUri = externalSourceUri;
+    }
+
+    public List<SuggestionEvidence> getEvidences() {
+        return evidences;
+    }
+
+    public List<MetadataValueDTO> getMetadata() {
+        return metadata;
+    }
+
+    public Item getTarget() {
+        return target;
+    }
+
+    public String getID() {
+        return id;
+    }
+
+    public Double getScore() {
+        if (evidences != null && evidences.size() > 0) {
+            double score = 0;
+            for (SuggestionEvidence evidence : evidences) {
+                score += evidence.getScore();
+            }
+            return score;
+        }
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionEvidence.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionEvidence.java
new file mode 100644
index 0000000000..d7f04929a1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionEvidence.java
@@ -0,0 +1,61 @@
+/**
+ * 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.suggestion;
+
+/**
+ * This DTO class is returned by an {@link org.dspace.app.suggestion.openaire.EvidenceScorer} to model the concept of
+ * an evidence / fact that has been used to evaluate the precision of a suggestion increasing or decreasing the score
+ * of the suggestion.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionEvidence {
+
+    /** name of the evidence */
+    private String name;
+
+    /** positive or negative value to influence the score of the suggestion */
+    private double score;
+
+    /** additional notes */
+    private String notes;
+
+    public SuggestionEvidence() {
+    }
+
+    public SuggestionEvidence(String name, double score, String notes) {
+        this.name = name;
+        this.score = score;
+        this.notes = notes;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getScore() {
+        return score;
+    }
+
+    public void setScore(double score) {
+        this.score = score;
+    }
+
+    public String getNotes() {
+        return notes;
+    }
+
+    public void setNotes(String notes) {
+        this.notes = notes;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionProvider.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionProvider.java
new file mode 100644
index 0000000000..7cfc3cfb53
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionProvider.java
@@ -0,0 +1,54 @@
+/**
+ * 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.suggestion;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+
+/**
+ * 
+ * Interface for suggestion management like finding and counting.
+ * @see org.dspace.app.suggestion.SuggestionTarget
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.com)
+ *
+ */
+public interface SuggestionProvider {
+
+    /** find all suggestion targets
+     * @see org.dspace.app.suggestion.SuggestionTarget
+     * */
+    public List<SuggestionTarget> findAllTargets(Context context, int pageSize, long offset);
+
+    /** count all suggestion targets */
+    public long countAllTargets(Context context);
+
+    /** find a suggestion target by UUID */
+    public SuggestionTarget findTarget(Context context, UUID target);
+
+    /** find unprocessed suggestions (paged) by target UUID
+     * @see org.dspace.app.suggestion.Suggestion
+     * */
+    public List<Suggestion> findAllUnprocessedSuggestions(Context context, UUID target, int pageSize, long offset,
+            boolean ascending);
+
+    /** find unprocessed suggestions by target UUID */
+    public long countUnprocessedSuggestionByTarget(Context context, UUID target);
+
+    /** find an unprocessed suggestion by target UUID and suggestion id */
+    public Suggestion findUnprocessedSuggestion(Context context, UUID target, String id);
+
+    /** reject a specific suggestion by target @param target and by suggestion id @param idPart */
+    public void rejectSuggestion(Context context, UUID target, String idPart);
+
+    /** flag a suggestion as processed */
+    public void flagRelatedSuggestionsAsProcessed(Context context, ExternalDataObject externalDataObject);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionService.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionService.java
new file mode 100644
index 0000000000..e8a8830261
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionService.java
@@ -0,0 +1,61 @@
+/**
+ * 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.suggestion;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.core.Context;
+
+/**
+ * Service that handles {@link Suggestion}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public interface SuggestionService {
+
+    /** find a {@link SuggestionTarget } by source name and suggestion id */
+    public SuggestionTarget find(Context context, String source, UUID id);
+
+    /** count all suggestion targets by suggestion source */
+    public long countAll(Context context, String source);
+
+    /** find all suggestion targets by source (paged) */
+    public List<SuggestionTarget> findAllTargets(Context context, String source, int pageSize, long offset);
+
+    /** count all (unprocessed) suggestions by the given target uuid */
+    public long countAllByTarget(Context context, UUID target);
+
+    /** find suggestion target by targeted item (paged) */
+    public List<SuggestionTarget> findByTarget(Context context, UUID target, int pageSize, long offset);
+
+    /** find suggestion source by source name */
+    public SuggestionSource findSource(Context context, String source);
+
+    /** count all suggestion sources */
+    public long countSources(Context context);
+
+    /** find all suggestion sources (paged) */
+    public List<SuggestionSource> findAllSources(Context context, int pageSize, long offset);
+
+    /** find unprocessed suggestion by id */
+    public Suggestion findUnprocessedSuggestion(Context context, String id);
+
+    /** reject a specific suggestion by its id */
+    public void rejectSuggestion(Context context, String id);
+
+    /** find all suggestions by targeted item and external source */
+    public List<Suggestion> findByTargetAndSource(Context context, UUID target, String source, int pageSize,
+            long offset, boolean ascending);
+
+    /** count all suggestions by targeted item id and source name */
+    public long countAllByTargetAndSource(Context context, String source, UUID target);
+
+    /** returns all suggestion providers */
+    public List<SuggestionProvider> getSuggestionProviders();
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionServiceImpl.java
new file mode 100644
index 0000000000..57fe42806b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionServiceImpl.java
@@ -0,0 +1,194 @@
+/**
+ * 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.suggestion;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import jakarta.annotation.Resource;
+import org.apache.logging.log4j.Logger;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SuggestionServiceImpl implements SuggestionService {
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SuggestionServiceImpl.class);
+
+    @Resource(name = "suggestionProviders")
+    private Map<String, SuggestionProvider> providersMap;
+
+    @Override
+    public List<SuggestionProvider> getSuggestionProviders() {
+        if (providersMap != null) {
+            return providersMap.values().stream().collect(Collectors.toList());
+        }
+        return null;
+    }
+
+    @Override
+    public SuggestionTarget find(Context context, String source, UUID id) {
+        if (providersMap.containsKey(source)) {
+            return providersMap.get(source).findTarget(context, id);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public long countAll(Context context, String source) {
+        if (providersMap.containsKey(source)) {
+            return providersMap.get(source).countAllTargets(context);
+        } else {
+            return 0;
+        }
+    }
+
+    @Override
+    public List<SuggestionTarget> findAllTargets(Context context, String source, int pageSize, long offset) {
+        if (providersMap.containsKey(source)) {
+            return providersMap.get(source).findAllTargets(context, pageSize, offset);
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public long countAllByTarget(Context context, UUID target) {
+        int count = 0;
+        for (String provider : providersMap.keySet()) {
+            if (providersMap.get(provider).countUnprocessedSuggestionByTarget(context, target) > 0) {
+                count++;
+            }
+        }
+        return count;
+    }
+
+    @Override
+    public List<SuggestionTarget> findByTarget(Context context, UUID target, int pageSize, long offset) {
+        List<SuggestionTarget> fullSourceTargets = new ArrayList<SuggestionTarget>();
+        for (String source : providersMap.keySet()) {
+            // all the suggestion target will be related to the same target (i.e. the same researcher - person item)
+            SuggestionTarget sTarget = providersMap.get(source).findTarget(context, target);
+            if (sTarget != null && sTarget.getTotal() > 0) {
+                fullSourceTargets.add(sTarget);
+            }
+        }
+        fullSourceTargets.sort(new Comparator<SuggestionTarget>() {
+            @Override
+            public int compare(SuggestionTarget arg0, SuggestionTarget arg1) {
+                return -(arg0.getTotal() - arg1.getTotal());
+            }
+        }
+        );
+        // this list will be as large as the number of sources available in the repository so it is unlikely that
+        // real pagination will occur
+        return fullSourceTargets.stream().skip(offset).limit(pageSize).collect(Collectors.toList());
+    }
+
+    @Override
+    public long countSources(Context context) {
+        return providersMap.size();
+    }
+
+    @Override
+    public SuggestionSource findSource(Context context, String source) {
+        if (providersMap.containsKey(source)) {
+            SuggestionSource ssource = new SuggestionSource(source);
+            ssource.setTotal((int) providersMap.get(source).countAllTargets(context));
+            return ssource;
+        } else {
+            return null;
+        }
+    }
+
+    @Override
+    public List<SuggestionSource> findAllSources(Context context, int pageSize, long offset) {
+        List<SuggestionSource> fullSources = getSources(context).stream().skip(offset).limit(pageSize)
+                .collect(Collectors.toList());
+        return fullSources;
+    }
+
+    private List<SuggestionSource> getSources(Context context) {
+        List<SuggestionSource> results = new ArrayList<SuggestionSource>();
+        for (String source : providersMap.keySet()) {
+            SuggestionSource ssource = new SuggestionSource(source);
+            ssource.setTotal((int) providersMap.get(source).countAllTargets(context));
+            results.add(ssource);
+        }
+        return results;
+    }
+
+    @Override
+    public long countAllByTargetAndSource(Context context, String source, UUID target) {
+        if (providersMap.containsKey(source)) {
+            return providersMap.get(source).countUnprocessedSuggestionByTarget(context, target);
+        }
+        return 0;
+    }
+
+    @Override
+    public List<Suggestion> findByTargetAndSource(Context context, UUID target, String source, int pageSize,
+            long offset, boolean ascending) {
+        if (providersMap.containsKey(source)) {
+            return providersMap.get(source).findAllUnprocessedSuggestions(context, target, pageSize, offset, ascending);
+        }
+        return null;
+    }
+
+    @Override
+    public Suggestion findUnprocessedSuggestion(Context context, String id) {
+        String source = null;
+        UUID target = null;
+        String idPart = null;
+        String[] split;
+        try {
+            split = id.split(":", 3);
+            source = split[0];
+            target = UUID.fromString(split[1]);
+            idPart = split[2];
+        } catch (Exception e) {
+            log.warn("findSuggestion got an invalid id " + id + ", return null");
+            return null;
+        }
+        if (split.length != 3) {
+            return null;
+        }
+        if (providersMap.containsKey(source)) {
+            return providersMap.get(source).findUnprocessedSuggestion(context, target, idPart);
+        }
+        return null;
+    }
+
+    @Override
+    public void rejectSuggestion(Context context, String id) {
+        String source = null;
+        UUID target = null;
+        String idPart = null;
+        String[] split;
+        try {
+            split = id.split(":", 3);
+            source = split[0];
+            target = UUID.fromString(split[1]);
+            idPart = split[2];
+        } catch (Exception e) {
+            log.warn("rejectSuggestion got an invalid id " + id + ", doing nothing");
+            return;
+        }
+        if (split.length != 3) {
+            return;
+        }
+        if (providersMap.containsKey(source)) {
+            providersMap.get(source).rejectSuggestion(context, target, idPart);
+        }
+
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionSource.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionSource.java
new file mode 100644
index 0000000000..6dcc3f7e1e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionSource.java
@@ -0,0 +1,49 @@
+/**
+ * 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.suggestion;
+
+/**
+ * This DTO class is used to pass around the number of items interested by suggestion provided by a specific source
+ * (i.e. openaire)
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionSource {
+
+    /** source name of the suggestion */
+    private String name;
+
+    /** number of targeted items */
+    private int total;
+
+    public SuggestionSource() {
+    }
+
+    /**
+     * Summarize the available suggestions from a source.
+     * 
+     * @param name the name must be not null
+     */
+    public SuggestionSource(String name) {
+        super();
+        this.name = name;
+    }
+
+    public String getID() {
+        return name;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionTarget.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionTarget.java
new file mode 100644
index 0000000000..db82aa8081
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionTarget.java
@@ -0,0 +1,75 @@
+/**
+ * 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.suggestion;
+
+import org.dspace.content.Item;
+
+/**
+ * This DTO class is used to pass around the number of suggestions available from a specific source for a target
+ * repository item
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionTarget {
+
+    /** the item targeted */
+    private Item target;
+
+    /** source name of the suggestion */
+    private String source;
+
+    /** total count of suggestions for same target and source */
+    private int total;
+
+    public SuggestionTarget() {
+    }
+
+    /**
+     * Wrap a target repository item (usually a person item) into a suggestion target.
+     * 
+     * @param item must be not null
+     */
+    public SuggestionTarget(Item item) {
+        super();
+        this.target = item;
+    }
+
+    /**
+     * The suggestion target uses the concatenation of the source and target uuid separated by colon as id
+     * 
+     * @return the source:uuid of the wrapped item
+     */
+    public String getID() {
+        return source + ":" + (target != null ? target.getID() : "");
+    }
+
+    public Item getTarget() {
+        return target;
+    }
+
+    public void setTarget(Item target) {
+        this.target = target;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionUtils.java b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionUtils.java
new file mode 100644
index 0000000000..30ced75fc9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/SuggestionUtils.java
@@ -0,0 +1,111 @@
+/**
+ * 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.suggestion;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.external.model.ExternalDataObject;
+
+/**
+ * This utility class provides convenient methods to deal with the
+ * {@link ExternalDataObject} for the purpose of the Suggestion framework
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionUtils {
+    private SuggestionUtils() {
+    }
+    /**
+     * This method receive an ExternalDataObject and a metadatum key.
+     * It return only the values of the Metadata associated with the key.
+     * 
+     * @param record the ExternalDataObject to extract metadata from
+     * @param schema schema of the searching record
+     * @param element element of the searching record
+     * @param qualifier qualifier of the searching record
+     * @return value of the first matching record
+     */
+    public static List<String> getAllEntriesByMetadatum(ExternalDataObject record, String schema, String element,
+            String qualifier) {
+        return record.getMetadata().stream()
+                .filter(x ->
+                    StringUtils.equals(x.getSchema(), schema)
+                        && StringUtils.equals(x.getElement(), element)
+                        && StringUtils.equals(x.getQualifier(), qualifier))
+                .map(x -> x.getValue()).collect(Collectors.toList());
+    }
+
+    /**
+     * This method receive an ExternalDataObject and a metadatum key.
+     * It return only the values of the Metadata associated with the key.
+     * 
+     * @param record the ExternalDataObject to extract metadata from
+     * @param metadataFieldKey the metadata field key (i.e. dc.title or dc.contributor.author),
+     *      the jolly char is not supported
+     * @return value of the first matching record
+     */
+    public static List<String> getAllEntriesByMetadatum(ExternalDataObject record, String metadataFieldKey) {
+        if (metadataFieldKey == null) {
+            return Collections.EMPTY_LIST;
+        }
+        String[] fields = metadataFieldKey.split("\\.");
+        String schema = fields[0];
+        String element = fields[1];
+        String qualifier = null;
+        if (fields.length == 3) {
+            qualifier = fields[2];
+        }
+        return getAllEntriesByMetadatum(record, schema, element, qualifier);
+    }
+
+    /**
+     * This method receive and ExternalDataObject and a metadatum key.
+     * It return only the value of the first Metadatum from the list associated with the key.
+     * 
+     * @param record the ExternalDataObject to extract metadata from
+     * @param schema schema of the searching record
+     * @param element element of the searching record
+     * @param qualifier qualifier of the searching record
+     * @return value of the first matching record
+     */
+    public static String getFirstEntryByMetadatum(ExternalDataObject record, String schema, String element,
+            String qualifier) {
+        return record.getMetadata().stream()
+                .filter(x ->
+                    StringUtils.equals(x.getSchema(), schema)
+                        && StringUtils.equals(x.getElement(), element)
+                        && StringUtils.equals(x.getQualifier(), qualifier))
+                .map(x -> x.getValue()).findFirst().orElse(null);
+    }
+
+    /**
+     * This method receive and ExternalDataObject and a metadatum key.
+     * It return only the value of the first Metadatum from the list associated with the key.
+     * 
+     * @param record the ExternalDataObject to extract metadata from
+     * @param metadataFieldKey the metadata field key (i.e. dc.title or dc.contributor.author),
+     *      the jolly char is not supported
+     * @return value of the first matching record
+     */
+    public static String getFirstEntryByMetadatum(ExternalDataObject record, String metadataFieldKey) {
+        if (metadataFieldKey == null) {
+            return null;
+        }
+        String[] fields = metadataFieldKey.split("\\.");
+        String schema = fields[0];
+        String element = fields[1];
+        String qualifier = null;
+        if (fields.length == 3) {
+            qualifier = fields[2];
+        }
+        return getFirstEntryByMetadatum(record, schema, element, qualifier);
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/AuthorNamesScorer.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/AuthorNamesScorer.java
new file mode 100644
index 0000000000..60b1521f7e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/AuthorNamesScorer.java
@@ -0,0 +1,151 @@
+/**
+ * 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.suggestion.openaire;
+
+import static org.dspace.app.suggestion.SuggestionUtils.getAllEntriesByMetadatum;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import com.ibm.icu.text.CharsetDetector;
+import com.ibm.icu.text.CharsetMatch;
+import com.ibm.icu.text.Normalizer;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.suggestion.SuggestionEvidence;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.external.model.ExternalDataObject;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@see org.dspace.app.suggestion.oaire.EvidenceScorer} which evaluate ImportRecords
+ * based on Author's name.
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ *
+ */
+public class AuthorNamesScorer implements EvidenceScorer {
+
+    private List<String> contributorMetadata;
+
+    private List<String> names;
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * returns the metadata key of the Item which to base the filter on
+     * @return metadata key
+     */
+    public List<String> getContributorMetadata() {
+        return contributorMetadata;
+    }
+
+    /**
+     * set the metadata key of the Item which to base the filter on
+     */
+    public void setContributorMetadata(List<String> contributorMetadata) {
+        this.contributorMetadata = contributorMetadata;
+    }
+
+    /**
+     * return the metadata key of ImportRecord which to base the filter on
+     * @return
+     */
+    public List<String> getNames() {
+        return names;
+    }
+
+    /**
+     * set the metadata key of ImportRecord which to base the filter on
+     */
+    public void setNames(List<String> names) {
+        this.names = names;
+    }
+
+    /**
+     * Method which is responsible to evaluate ImportRecord based on authors name.
+     * This method extract the researcher name from Item using contributorMetadata fields
+     * and try to match them with values extract from ImportRecord using metadata keys defined
+     * in names.
+     * ImportRecords which don't match will be discarded.
+     * 
+     * @param importRecord the import record to check
+     * @param researcher DSpace item
+     * @return the generated evidence or null if the record must be discarded
+     */
+    @Override
+    public SuggestionEvidence computeEvidence(Item researcher, ExternalDataObject importRecord) {
+        List<String[]> names = searchMetadataValues(researcher);
+        int maxNameLenght = names.stream().mapToInt(n -> n[0].length()).max().orElse(1);
+        List<String> metadataAuthors = new ArrayList<>();
+        for (String contributorMetadatum : contributorMetadata) {
+            metadataAuthors.addAll(getAllEntriesByMetadatum(importRecord, contributorMetadatum));
+        }
+        List<String> normalizedMetadataAuthors = metadataAuthors.stream().map(x -> normalize(x))
+                .collect(Collectors.toList());
+        int idx = 0;
+        for (String nMetadataAuthor : normalizedMetadataAuthors) {
+            Optional<String[]> found = names.stream()
+                    .filter(a -> StringUtils.equalsIgnoreCase(a[0], nMetadataAuthor)).findFirst();
+            if (found.isPresent()) {
+                return new SuggestionEvidence(this.getClass().getSimpleName(),
+                        100 * ((double) nMetadataAuthor.length() / (double) maxNameLenght),
+                        "The author " + metadataAuthors.get(idx) + " at position " + (idx + 1)
+                                + " in the authors list matches the name " + found.get()[1]
+                                + " in the researcher profile");
+            }
+            idx++;
+        }
+        return null;
+    }
+
+    /**
+     * Return list of Item metadata values starting from metadata keys defined in class level variable names.
+     * 
+     * @param researcher DSpace item
+     * @return list of metadata values
+     */
+    private List<String[]> searchMetadataValues(Item researcher) {
+        List<String[]> authors = new ArrayList<String[]>();
+        for (String name : names) {
+            List<MetadataValue> values = itemService.getMetadataByMetadataString(researcher, name);
+            if (values != null) {
+                for (MetadataValue v : values) {
+                    authors.add(new String[] {normalize(v.getValue()), v.getValue()});
+                }
+            }
+        }
+        return authors;
+    }
+
+    /**
+     * cleans up undesired characters
+     * @param value the string to clean up
+     * @return cleaned up string
+     * */
+    private String normalize(String value) {
+        String norm = Normalizer.normalize(value, Normalizer.NFD);
+        CharsetDetector cd = new CharsetDetector();
+        cd.setText(value.getBytes());
+        CharsetMatch detect = cd.detect();
+        if (detect != null && detect.getLanguage() != null) {
+            norm = norm.replaceAll("[^\\p{L}]", " ").toLowerCase(new Locale(detect.getLanguage()));
+        } else {
+            norm = norm.replaceAll("[^\\p{L}]", " ").toLowerCase();
+        }
+        return Arrays.asList(norm.split("\\s+")).stream().sorted().collect(Collectors.joining());
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/DateScorer.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/DateScorer.java
new file mode 100644
index 0000000000..94f81715fa
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/DateScorer.java
@@ -0,0 +1,214 @@
+/**
+ * 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.suggestion.openaire;
+
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.dspace.app.suggestion.SuggestionEvidence;
+import org.dspace.app.suggestion.SuggestionUtils;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.external.model.ExternalDataObject;
+import org.dspace.util.MultiFormatDateParser;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@see org.dspace.app.suggestion.oaire.EvidenceScorer} which evaluate ImportRecords
+ * based on the distance from a date extracted from the ResearcherProfile (birthday / graduation date)
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ *
+ */
+public class DateScorer implements EvidenceScorer {
+
+    /**
+     * if available it should contains the metadata field key in the form (schema.element[.qualifier]) that contains
+     * the birth date of the researcher
+     */
+    private String birthDateMetadata;
+
+    /**
+     * if available it should contains the metadata field key in the form (schema.element[.qualifier]) that contains
+     * the date of graduation of the researcher. If the metadata has multiple values the min will be used
+     */
+    private String educationDateMetadata;
+
+    /**
+     * The minimal age that is expected for a researcher to be a potential author of a scholarly contribution
+     * (i.e. the minimum delta from the publication date and the birth date)
+     */
+    private int birthDateDelta = 20;
+
+    /**
+     * The maximum age that is expected for a researcher to be a potential author of a scholarly contribution
+     * (i.e. the maximum delta from the publication date and the birth date)
+     */
+    private int birthDateRange = 50;
+
+    /**
+     * The number of year from/before the graduation that is expected for a researcher to be a potential
+     * author of a scholarly contribution (i.e. the minimum delta from the publication date and the first
+     * graduation date)
+     */
+    private int educationDateDelta = -3;
+
+    /**
+     * The maximum scientific longevity that is expected for a researcher from its graduation to be a potential
+     * author of a scholarly contribution (i.e. the maximum delta from the publication date and the first
+     * graduation date)
+     */
+    private int educationDateRange = 50;
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * the metadata used in the publication to track the publication date (i.e. dc.date.issued)
+     */
+    private String publicationDateMetadata;
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    public void setBirthDateMetadata(String birthDate) {
+        this.birthDateMetadata = birthDate;
+    }
+
+    public String getBirthDateMetadata() {
+        return birthDateMetadata;
+    }
+
+    public void setEducationDateMetadata(String educationDate) {
+        this.educationDateMetadata = educationDate;
+    }
+
+    public String getEducationDateMetadata() {
+        return educationDateMetadata;
+    }
+
+    public void setBirthDateDelta(int birthDateDelta) {
+        this.birthDateDelta = birthDateDelta;
+    }
+
+    public void setBirthDateRange(int birthDateRange) {
+        this.birthDateRange = birthDateRange;
+    }
+
+    public void setEducationDateDelta(int educationDateDelta) {
+        this.educationDateDelta = educationDateDelta;
+    }
+
+    public void setEducationDateRange(int educationDateRange) {
+        this.educationDateRange = educationDateRange;
+    }
+
+    public void setPublicationDateMetadata(String publicationDateMetadata) {
+        this.publicationDateMetadata = publicationDateMetadata;
+    }
+
+    /**
+     * Method which is responsible to evaluate ImportRecord based on the publication date.
+     * ImportRecords which have a date outside the defined or calculated expected range will be discarded.
+     * {@link DateScorer#birthDateMetadata}, {@link DateScorer#educationDateMetadata}
+     * 
+     * @param importRecord the ExternalDataObject to check
+     * @param researcher DSpace item
+     * @return the generated evidence or null if the record must be discarded
+     */
+    @Override
+    public SuggestionEvidence computeEvidence(Item researcher, ExternalDataObject importRecord) {
+        Integer[] range = calculateRange(researcher);
+        if (range == null) {
+            return new SuggestionEvidence(this.getClass().getSimpleName(),
+                    0,
+                    "No assumption was possible about the publication year range. "
+                    + "Please consider setting your birthday in your profile.");
+        } else {
+            String optDate = SuggestionUtils.getFirstEntryByMetadatum(importRecord, publicationDateMetadata);
+            int year = getYear(optDate);
+            if (year > 0) {
+                if ((range[0] == null || year >= range[0]) &&
+                    (range[1] == null || year <= range[1])) {
+                    return new SuggestionEvidence(this.getClass().getSimpleName(),
+                            10,
+                            "The publication date is within the expected range [" + range[0] + ", "
+                                    + range[1] + "]");
+                } else {
+                    // outside the range, discard the suggestion
+                    return null;
+                }
+            } else {
+                return new SuggestionEvidence(this.getClass().getSimpleName(),
+                        0,
+                        "No assumption was possible as the publication date is " + (optDate != null
+                                ? "unprocessable [" + optDate + "]"
+                                : "unknown"));
+            }
+        }
+    }
+
+    /**
+     * returns min and max year interval in between it's probably that the researcher
+     * actually contributed to the suggested item
+     * @param researcher
+     * @return
+     */
+    private Integer[] calculateRange(Item researcher) {
+        String birthDateStr = getSingleValue(researcher, birthDateMetadata);
+        int birthDateYear = getYear(birthDateStr);
+        int educationDateYear = getListMetadataValues(researcher, educationDateMetadata).stream()
+                .mapToInt(x -> getYear(x.getValue())).filter(d -> d > 0).min().orElse(-1);
+        if (educationDateYear > 0) {
+            return new Integer[] {
+                educationDateYear + educationDateDelta,
+                educationDateYear + educationDateDelta + educationDateRange
+            };
+        } else if (birthDateYear > 0) {
+            return new Integer[] {
+                birthDateYear + birthDateDelta,
+                birthDateYear + birthDateDelta + birthDateRange
+            };
+        } else {
+            return null;
+        }
+    }
+
+    private List<MetadataValue> getListMetadataValues(Item researcher, String metadataKey) {
+        if (metadataKey != null) {
+            return itemService.getMetadataByMetadataString(researcher, metadataKey);
+        } else {
+            return Collections.EMPTY_LIST;
+        }
+    }
+
+    private String getSingleValue(Item researcher, String metadataKey) {
+        if (metadataKey != null) {
+            return itemService.getMetadata(researcher, metadataKey);
+        }
+        return null;
+    }
+
+    private int getYear(String birthDateStr) {
+        int birthDateYear = -1;
+        if (birthDateStr != null) {
+            Date birthDate = MultiFormatDateParser.parse(birthDateStr);
+            if (birthDate != null) {
+                Calendar calendar = new GregorianCalendar();
+                calendar.setTime(birthDate);
+                birthDateYear = calendar.get(Calendar.YEAR);
+            }
+        }
+        return birthDateYear;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/EvidenceScorer.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/EvidenceScorer.java
new file mode 100644
index 0000000000..027e9902f9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/EvidenceScorer.java
@@ -0,0 +1,37 @@
+/**
+ * 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.suggestion.openaire;
+
+import org.dspace.app.suggestion.SuggestionEvidence;
+import org.dspace.content.Item;
+import org.dspace.external.model.ExternalDataObject;
+
+/**
+ * Interface used in {@see org.dspace.app.suggestion.oaire.PublicationApproverServiceImpl}
+ * to construct filtering pipeline.
+ * 
+ * For each EvidenceScorer, the service call computeEvidence method.
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science dot it)
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ *
+ */
+public interface EvidenceScorer {
+
+    /**
+     * Method to compute the suggestion evidence of an ImportRecord, a null evidence
+     * would lead the record to be discarded.
+     * 
+     * @param researcher   DSpace item
+     * @param importRecord the record to evaluate
+     * @return the generated suggestion evidence or null if the record should be
+     *         discarded
+     */
+    public SuggestionEvidence computeEvidence(Item researcher, ExternalDataObject importRecord);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoader.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoader.java
new file mode 100644
index 0000000000..7ad723af12
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoader.java
@@ -0,0 +1,256 @@
+/**
+ * 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.suggestion.openaire;
+
+import static org.dspace.app.suggestion.SuggestionUtils.getAllEntriesByMetadatum;
+import static org.dspace.app.suggestion.SuggestionUtils.getFirstEntryByMetadatum;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.app.suggestion.SolrSuggestionProvider;
+import org.dspace.app.suggestion.Suggestion;
+import org.dspace.app.suggestion.SuggestionEvidence;
+import org.dspace.content.Item;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+import org.dspace.external.provider.ExternalDataProvider;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Class responsible to load and manage ImportRecords from OpenAIRE
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ *
+ */
+public class PublicationLoader extends SolrSuggestionProvider {
+
+    private List<String> names;
+
+    private ExternalDataProvider primaryProvider;
+
+    private List<ExternalDataProvider> otherProviders;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private List<EvidenceScorer> pipeline;
+
+    public void setPrimaryProvider(ExternalDataProvider primaryProvider) {
+        this.primaryProvider = primaryProvider;
+    }
+
+    public void setOtherProviders(List<ExternalDataProvider> otherProviders) {
+        this.otherProviders = otherProviders;
+    }
+
+    /**
+     * Set the pipeline of Approver
+     * @param pipeline list Approver
+     */
+    public void setPipeline(List<EvidenceScorer> pipeline) {
+        this.pipeline = pipeline;
+    }
+
+    /**
+     * This method filter a list of ImportRecords using a pipeline of AuthorNamesApprover
+     * and return a filtered list of ImportRecords.
+     * 
+     * @see org.dspace.app.suggestion.openaire.AuthorNamesScorer
+     * @param researcher the researcher Item
+     * @param importRecords List of import record
+     * @return a list of filtered import records
+     */
+    public List<Suggestion> reduceAndTransform(Item researcher, List<ExternalDataObject> importRecords) {
+        List<Suggestion> results = new ArrayList<>();
+        for (ExternalDataObject r : importRecords) {
+            boolean skip = false;
+            List<SuggestionEvidence> evidences = new ArrayList<SuggestionEvidence>();
+            for (EvidenceScorer authorNameApprover : pipeline) {
+                SuggestionEvidence evidence = authorNameApprover.computeEvidence(researcher, r);
+                if (evidence != null) {
+                    evidences.add(evidence);
+                } else {
+                    skip = true;
+                    break;
+                }
+            }
+            if (!skip) {
+                Suggestion suggestion = translateImportRecordToSuggestion(researcher, r);
+                suggestion.getEvidences().addAll(evidences);
+                results.add(suggestion);
+            }
+        }
+        return results;
+    }
+
+    /**
+     * Save a List of ImportRecord into Solr.
+     * ImportRecord will be translate into a SolrDocument by the method translateImportRecordToSolrDocument.
+     *
+     * @param context the DSpace Context
+     * @param researcher a DSpace Item
+     * @throws SolrServerException
+     * @throws IOException
+     */
+    public void importAuthorRecords(Context context, Item researcher)
+            throws SolrServerException, IOException {
+        int offset = 0;
+        int limit = 10;
+        int loaded = limit;
+        List<String> searchValues = searchMetadataValues(researcher);
+        while (loaded > 0) {
+            List<ExternalDataObject> metadata = getImportRecords(searchValues, researcher, offset, limit);
+            if (metadata.isEmpty()) {
+                loaded = 0;
+                continue;
+            }
+            offset += limit;
+            loaded = metadata.size();
+            List<Suggestion> records = reduceAndTransform(researcher, metadata);
+            for (Suggestion record : records) {
+                solrSuggestionStorageService.addSuggestion(record, false, false);
+            }
+        }
+        solrSuggestionStorageService.commit();
+    }
+
+    /**
+     * Translate an ImportRecord into a Suggestion
+     * @param item DSpace item
+     * @param record ImportRecord
+     * @return Suggestion
+     */
+    private Suggestion translateImportRecordToSuggestion(Item item, ExternalDataObject record) {
+        String openAireId = record.getId();
+        Suggestion suggestion = new Suggestion(getSourceName(), item, openAireId);
+        suggestion.setDisplay(getFirstEntryByMetadatum(record, "dc", "title", null));
+        suggestion.getMetadata().add(
+                new MetadataValueDTO("dc", "title", null, null, getFirstEntryByMetadatum(record, "dc", "title", null)));
+        suggestion.getMetadata().add(new MetadataValueDTO("dc", "date", "issued", null,
+                getFirstEntryByMetadatum(record, "dc", "date", "issued")));
+        suggestion.getMetadata().add(new MetadataValueDTO("dc", "description", "abstract", null,
+                getFirstEntryByMetadatum(record, "dc", "description", "abstract")));
+        suggestion.setExternalSourceUri(configurationService.getProperty("dspace.server.url")
+                + "/api/integration/externalsources/" + primaryProvider.getSourceIdentifier() + "/entryValues/"
+                + openAireId);
+        for (String o : getAllEntriesByMetadatum(record, "dc", "source", null)) {
+            suggestion.getMetadata().add(new MetadataValueDTO("dc", "source", null, null, o));
+        }
+        for (String o : getAllEntriesByMetadatum(record, "dc", "contributor", "author")) {
+            suggestion.getMetadata().add(new MetadataValueDTO("dc", "contributor", "author", null, o));
+        }
+        return suggestion;
+    }
+
+    public List<String> getNames() {
+        return names;
+    }
+
+    public void setNames(List<String> names) {
+        this.names = names;
+    }
+
+    /**
+     * Load metadata from OpenAIRE using the import service. The service use the value
+     * get from metadata key defined in class level variable names as author to query OpenAIRE.
+     * 
+     * @see org.dspace.importer.external.openaire.service.OpenAireImportMetadataSourceServiceImpl
+     * @param searchValues query
+     * @param researcher item to extract metadata from
+     * @param limit for pagination purpose
+     * @param offset for pagination purpose
+     * @return list of ImportRecord
+     */
+    private List<ExternalDataObject> getImportRecords(List<String> searchValues,
+        Item researcher, int offset, int limit) {
+        List<ExternalDataObject> matchingRecords = new ArrayList<>();
+        for (String searchValue : searchValues) {
+            matchingRecords.addAll(
+                primaryProvider.searchExternalDataObjects(searchValue, offset, limit));
+        }
+        List<ExternalDataObject> toReturn = removeDuplicates(matchingRecords);
+        return toReturn;
+    }
+
+    /**
+     * This method remove duplicates from importRecords list.
+     * An element is a duplicate if in the list exist another element
+     * with the same value of the metadatum 'dc.identifier.other'
+     *
+     * @param importRecords list of ImportRecord
+     * @return list of ImportRecords without duplicates
+     */
+    private List<ExternalDataObject> removeDuplicates(List<ExternalDataObject> importRecords) {
+        List<ExternalDataObject> filteredRecords = new ArrayList<>();
+        for (ExternalDataObject currentRecord : importRecords) {
+            if (!isDuplicate(currentRecord, filteredRecords)) {
+                filteredRecords.add(currentRecord);
+            }
+        }
+        return filteredRecords;
+    }
+
+
+    /**
+     * Check if the ImportRecord is already present in the list.
+     * The comparison is made on the value of metadatum with key 'dc.identifier.other'
+     * 
+     * @param dto An importRecord instance
+     * @param importRecords a list of importRecord
+     * @return true if dto is already present in importRecords, false otherwise
+     */
+    private boolean isDuplicate(ExternalDataObject dto, List<ExternalDataObject> importRecords) {
+        String currentItemId = dto.getId();
+        if (currentItemId == null) {
+            return true;
+        }
+        for (ExternalDataObject importRecord : importRecords) {
+            if (currentItemId.equals(importRecord.getId())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+
+    /**
+     * Return list of Item metadata values starting from metadata keys defined in class level variable names.
+     * 
+     * @param researcher DSpace item
+     * @return list of metadata values
+     */
+    private List<String> searchMetadataValues(Item researcher) {
+        List<String> authors = new ArrayList<String>();
+        for (String name : names) {
+            String value = itemService.getMetadata(researcher, name);
+            if (value != null) {
+                authors.add(value);
+            }
+        }
+        return authors;
+    }
+
+    @Override
+    protected boolean isExternalDataObjectPotentiallySuggested(Context context, ExternalDataObject externalDataObject) {
+        if (StringUtils.equals(externalDataObject.getSource(), primaryProvider.getSourceIdentifier())) {
+            return true;
+        } else if (otherProviders != null) {
+            return otherProviders.stream()
+                    .anyMatch(x -> StringUtils.equals(externalDataObject.getSource(), x.getSourceIdentifier()));
+        } else {
+            return false;
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderCliScriptConfiguration.java
new file mode 100644
index 0000000000..f5289fd99a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderCliScriptConfiguration.java
@@ -0,0 +1,29 @@
+/**
+ * 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.suggestion.openaire;
+
+import org.apache.commons.cli.Options;
+
+/**
+ * Extension of {@link PublicationLoaderScriptConfiguration} for CLI.
+ *
+ * @author Alessandro Martelli (alessandro.martelli at 4science.it)
+ */
+public class PublicationLoaderCliScriptConfiguration<T extends PublicationLoaderRunnable>
+    extends PublicationLoaderScriptConfiguration<T> {
+
+    @Override
+    public Options getOptions() {
+        Options options = super.getOptions();
+        options.addOption("h", "help", false, "help");
+        options.getOption("h").setType(boolean.class);
+        super.options = options;
+        return options;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderRunnable.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderRunnable.java
new file mode 100644
index 0000000000..76e8213cd7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderRunnable.java
@@ -0,0 +1,115 @@
+/**
+ * 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.suggestion.openaire;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.commons.cli.ParseException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.discovery.utils.DiscoverQueryBuilder;
+import org.dspace.discovery.utils.parameter.QueryBuilderSearchFilter;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.sort.SortOption;
+import org.dspace.utils.DSpace;
+
+/**
+ * Runner responsible to import metadata about authors from OpenAIRE to Solr.
+ * This runner works in two ways:
+ * If -s parameter with a valid UUID is received, then the specific researcher
+ * with this UUID will be used.
+ * Invocation without any parameter results in massive import, processing all
+ * authors registered in DSpace.
+ *
+ * @author Alessandro Martelli (alessandro.martelli at 4science.it)
+ */
+public class PublicationLoaderRunnable
+    extends DSpaceRunnable<PublicationLoaderScriptConfiguration<PublicationLoaderRunnable>> {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private PublicationLoader oairePublicationLoader = null;
+
+    protected Context context;
+
+    protected String profile;
+
+    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public PublicationLoaderScriptConfiguration<PublicationLoaderRunnable> getScriptConfiguration() {
+        PublicationLoaderScriptConfiguration configuration = new DSpace().getServiceManager()
+                .getServiceByName("import-openaire-suggestions", PublicationLoaderScriptConfiguration.class);
+        return configuration;
+    }
+
+    @Override
+    public void setup() throws ParseException {
+
+        oairePublicationLoader = new DSpace().getServiceManager().getServiceByName(
+                "OpenairePublicationLoader", PublicationLoader.class);
+
+        profile = commandLine.getOptionValue("s");
+        if (profile == null) {
+            LOGGER.info("No argument for -s, process all profiles");
+        } else {
+            LOGGER.info("Process eperson item with UUID {}", profile);
+        }
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+
+        context = new Context();
+
+        Iterator<Item> researchers = getResearchers(profile);
+        while (researchers.hasNext()) {
+            Item researcher = researchers.next();
+            oairePublicationLoader.importAuthorRecords(context, researcher);
+        }
+
+    }
+
+    /**
+     * Get the Item(s) which map a researcher from Solr. If the uuid is specified,
+     * the researcher with this UUID will be chosen. If the uuid doesn't match any
+     * researcher, the method returns an empty array list. If uuid is null, all
+     * research will be return.
+     *
+     * @param  profileUUID uuid of the researcher. If null, all researcher will be
+     *                     returned.
+     * @return             the researcher with specified UUID or all researchers
+     */
+    @SuppressWarnings("rawtypes")
+    private Iterator<Item> getResearchers(String profileUUID) {
+        SearchService searchService = new DSpace().getSingletonService(SearchService.class);
+        DiscoverQueryBuilder queryBuilder = SearchUtils.getQueryBuilder();
+        List<QueryBuilderSearchFilter> filters = new ArrayList<>();
+        String query = "*:*";
+        if (profileUUID != null) {
+            query = "search.resourceid:" + profileUUID;
+        }
+        try {
+            DiscoverQuery discoverQuery = queryBuilder.buildQuery(context, null,
+                SearchUtils.getDiscoveryConfigurationByName("person"),
+                query, filters,
+                "Item", 10, Long.getLong("0"), null, SortOption.DESCENDING);
+            return searchService.iteratorSearch(context, null, discoverQuery);
+        } catch (SearchServiceException e) {
+            LOGGER.error("Unable to read researcher on solr", e);
+        }
+        return null;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderRunnableCli.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderRunnableCli.java
new file mode 100644
index 0000000000..6c59b725d5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderRunnableCli.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.suggestion.openaire;
+
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.ParseException;
+import org.dspace.utils.DSpace;
+
+public class PublicationLoaderRunnableCli extends PublicationLoaderRunnable {
+
+    @Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+    public PublicationLoaderCliScriptConfiguration getScriptConfiguration() {
+        PublicationLoaderCliScriptConfiguration configuration = new DSpace().getServiceManager()
+                .getServiceByName("import-openaire-suggestions", PublicationLoaderCliScriptConfiguration.class);
+        return configuration;
+    }
+
+    @Override
+    public void setup() throws ParseException {
+        super.setup();
+
+        // in case of CLI we show the help prompt
+        if (commandLine.hasOption('h')) {
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp("Import Researchers Suggestions", getScriptConfiguration().getOptions());
+            System.exit(0);
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderScriptConfiguration.java
new file mode 100644
index 0000000000..8bef7de40d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/app/suggestion/openaire/PublicationLoaderScriptConfiguration.java
@@ -0,0 +1,56 @@
+/**
+ * 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.suggestion.openaire;
+
+import org.apache.commons.cli.Options;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+public class PublicationLoaderScriptConfiguration<T extends PublicationLoaderRunnable>
+    extends ScriptConfiguration<T> {
+
+    private Class<T> dspaceRunnableClass;
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    /**
+     * Generic setter for the dspaceRunnableClass
+     * @param dspaceRunnableClass   The dspaceRunnableClass to be set on this PublicationLoaderScriptConfiguration
+     */
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+
+    /*
+    @Override
+    public boolean isAllowedToExecute(Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
+        }
+    }
+    */
+
+    @Override
+    public Options getOptions() {
+        if (options == null) {
+            Options options = new Options();
+
+            options.addOption("s", "single-researcher", true, "Single researcher UUID");
+            options.getOption("s").setType(String.class);
+
+            super.options = options;
+        }
+        return options;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java b/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java
index c0cb5d226c..48df3dbc12 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/AbstractDSpaceWebapp.java
@@ -12,13 +12,13 @@ import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.Date;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.factory.UtilServiceFactory;
 import org.dspace.app.util.service.WebAppService;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Represent a DSpace application while it is running.  This helps us report
@@ -29,11 +29,10 @@ import org.slf4j.LoggerFactory;
  */
 abstract public class AbstractDSpaceWebapp
     implements DSpaceWebappMXBean {
-    private static final Logger log = LoggerFactory.getLogger(AbstractDSpaceWebapp.class);
+    private static final Logger log = LogManager.getLogger();
 
     protected final WebAppService webAppService = UtilServiceFactory.getInstance().getWebAppService();
 
-
     protected String kind;
 
     protected Date started;
diff --git a/dspace-api/src/main/java/org/dspace/app/util/AuthorizeUtil.java b/dspace-api/src/main/java/org/dspace/app/util/AuthorizeUtil.java
index efd813d29b..ed59f4b24f 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/AuthorizeUtil.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/AuthorizeUtil.java
@@ -9,8 +9,8 @@ package org.dspace.app.util;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
 import org.dspace.authorize.AuthorizeConfiguration;
@@ -624,16 +624,27 @@ public class AuthorizeUtil {
         throws SQLException {
         if (DSpaceServicesFactory.getInstance().getConfigurationService()
                                  .getBooleanProperty("user.registration", true)) {
-            // This allowSetPassword is currently the only mthod that would return true only when it's
+            // This allowSetPassword is currently the only method that would return true only when it's
             // actually expected to be returning true.
             // For example the LDAP canSelfRegister will return true due to auto-register, while that
             // does not imply a new user can register explicitly
-            return AuthenticateServiceFactory.getInstance().getAuthenticationService()
-                                             .allowSetPassword(context, request, null);
+            return authorizePasswordChange(context, request);
         }
         return false;
     }
 
+    /**
+     * This method will return a boolean indicating whether the current user is allowed to reset the password
+     * or not
+     *
+     * @return          A boolean indicating whether the current user can reset its password or not
+     * @throws SQLException If something goes wrong
+     */
+    public static boolean authorizeForgotPassword() {
+        return DSpaceServicesFactory.getInstance().getConfigurationService()
+                             .getBooleanProperty("user.forgot-password", true);
+    }
+
     /**
      * This method will return a boolean indicating whether it's allowed to update the password for the EPerson
      * with the given email and canLogin property
@@ -647,8 +658,7 @@ public class AuthorizeUtil {
             if (eperson != null && eperson.canLogIn()) {
                 HttpServletRequest request = new DSpace().getRequestService().getCurrentRequest()
                                                          .getHttpServletRequest();
-                return AuthenticateServiceFactory.getInstance().getAuthenticationService()
-                                                 .allowSetPassword(context, request, null);
+                return authorizePasswordChange(context, request);
             }
         } catch (SQLException e) {
             log.error("Something went wrong trying to retrieve EPerson for email: " + email, e);
@@ -656,6 +666,19 @@ public class AuthorizeUtil {
         return false;
     }
 
+    /**
+     * Checks if the current configuration has at least one password based authentication method
+     *
+     * @param context Dspace Context
+     * @param request Current Request
+     * @return True if the password change is enabled
+     * @throws SQLException
+     */
+    protected static boolean authorizePasswordChange(Context context, HttpServletRequest request) throws SQLException {
+        return AuthenticateServiceFactory.getInstance().getAuthenticationService()
+                                         .allowSetPassword(context, request, null);
+    }
+
     /**
      * This method checks if the community Admin can manage accounts
      *
diff --git a/dspace-api/src/main/java/org/dspace/app/util/DCInput.java b/dspace-api/src/main/java/org/dspace/app/util/DCInput.java
index 11f9aadd86..dd88390cb8 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/DCInput.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/DCInput.java
@@ -13,13 +13,13 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.core.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Class representing a line in an input form.
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DCInput {
 
-    private static final Logger log = LoggerFactory.getLogger(DCInput.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * the DC element name
@@ -183,7 +183,7 @@ public class DCInput {
         }
 
         //check if the input have a language tag
-        language = Boolean.valueOf(fieldMap.get("language"));
+        language = Boolean.parseBoolean(fieldMap.get("language"));
         valueLanguageList = new ArrayList<>();
         if (language) {
             String languageNameTmp = fieldMap.get("value-pairs-name");
@@ -219,7 +219,7 @@ public class DCInput {
             || "yes".equalsIgnoreCase(closedVocabularyStr);
 
         // parsing of the <type-bind> element (using the colon as split separator)
-        typeBind = new ArrayList<String>();
+        typeBind = new ArrayList<>();
         String typeBindDef = fieldMap.get("type-bind");
         if (typeBindDef != null && typeBindDef.trim().length() > 0) {
             String[] types = typeBindDef.split(",");
@@ -523,7 +523,7 @@ public class DCInput {
      * @return true when there is no type restriction or typeName is allowed
      */
     public boolean isAllowedFor(String typeName) {
-        if (typeBind.size() == 0) {
+        if (typeBind.isEmpty()) {
             return true;
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/app/util/DSpaceContextListener.java b/dspace-api/src/main/java/org/dspace/app/util/DSpaceContextListener.java
index b0289ec4a4..51d78ccaba 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/DSpaceContextListener.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/DSpaceContextListener.java
@@ -13,9 +13,9 @@ import java.net.URLConnection;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.util.Enumeration;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
 
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 import org.apache.logging.log4j.Logger;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/app/util/DSpaceWebappListener.java b/dspace-api/src/main/java/org/dspace/app/util/DSpaceWebappListener.java
index c2817169b2..32c4ff9c1c 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/DSpaceWebappListener.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/DSpaceWebappListener.java
@@ -8,8 +8,9 @@
 package org.dspace.app.util;
 
 import java.lang.reflect.InvocationTargetException;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 /**
  * Class that registers the web application upon startup of the application.
diff --git a/dspace-api/src/main/java/org/dspace/app/util/IndexVersion.java b/dspace-api/src/main/java/org/dspace/app/util/IndexVersion.java
index 7bdaa95b5c..8634954795 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/IndexVersion.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/IndexVersion.java
@@ -62,7 +62,7 @@ public class IndexVersion {
         // First argument is the Index path. Determine its version
         String indexVersion = getIndexVersion(argv[0]);
 
-        // Second argumet is an optional version number to compare to
+        // Second argument is an optional version number to compare to
         String compareToVersion = argv.length > 1 ? argv[1] : null;
 
         // If indexVersion comes back as null, then it is not a valid index directory.
diff --git a/dspace-api/src/main/java/org/dspace/app/util/InitializeEntities.java b/dspace-api/src/main/java/org/dspace/app/util/InitializeEntities.java
index 0a072a9819..e8c5d93181 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/InitializeEntities.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/InitializeEntities.java
@@ -74,7 +74,7 @@ public class InitializeEntities {
     private static void checkHelpEntered(Options options, CommandLine line) {
         if (line.hasOption("h")) {
             HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp("Intialize Entities", options);
+            formatter.printHelp("Initialize Entities", options);
             System.exit(0);
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java b/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java
index 578e57fb09..17d94027af 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/RegexPatternUtils.java
@@ -36,7 +36,7 @@ public class RegexPatternUtils {
      * Computes a pattern starting from a regex definition with flags that
      * uses the standard format: <code>/{regex}/{flags}</code> (ECMAScript format).
      * This method can transform an ECMAScript regex into a java {@code Pattern} object
-     * wich can be used to validate strings.
+     * which can be used to validate strings.
      * <br/>
      * If regex is null, empty or blank a null {@code Pattern} will be retrieved
      * If it's a valid regex, then a non-null {@code Pattern} will be retrieved,
diff --git a/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java b/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java
index 70c5092602..0f8f745680 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/SubmissionConfigReader.java
@@ -22,6 +22,7 @@ import javax.xml.parsers.FactoryConfigurationError;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
+import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
@@ -92,10 +93,11 @@ public class SubmissionConfigReader {
     private Map<String, String> collectionToSubmissionConfig = null;
 
     /**
-     * Reference to the global submission step definitions defined in the
-     * "step-definitions" section
+     * Hashmap which stores which submission process configuration is used by
+     * which community, computed from the item submission config file
+     * (specifically, the 'submission-map' tag)
      */
-    private Map<String, Map<String, String>> stepDefns = null;
+    private Map<String, String> communityToSubmissionConfig = null;
 
     /**
      * Hashmap which stores which submission process configuration is used by
@@ -104,6 +106,12 @@ public class SubmissionConfigReader {
      */
     private Map<String, String> entityTypeToSubmissionConfig = null;
 
+    /**
+     * Reference to the global submission step definitions defined in the
+     * "step-definitions" section
+     */
+    private Map<String, Map<String, String>> stepDefns = null;
+
     /**
      * Reference to the item submission definitions defined in the
      * "submission-definitions" section
@@ -135,6 +143,7 @@ public class SubmissionConfigReader {
 
     public void reload() throws SubmissionConfigReaderException {
         collectionToSubmissionConfig = null;
+        communityToSubmissionConfig = null;
         entityTypeToSubmissionConfig = null;
         stepDefns = null;
         submitDefns = null;
@@ -149,11 +158,12 @@ public class SubmissionConfigReader {
      * <li>Hashmap of Collection to Submission definition mappings -
      * defines which Submission process a particular collection uses
      * <li>Hashmap of all Submission definitions.  List of all valid
-     * Submision Processes by name.
+     * Submission Processes by name.
      * </ul>
      */
     private void buildInputs(String fileName) throws SubmissionConfigReaderException {
         collectionToSubmissionConfig = new HashMap<String, String>();
+        communityToSubmissionConfig = new HashMap<String, String>();
         entityTypeToSubmissionConfig = new HashMap<String, String>();
         submitDefns = new LinkedHashMap<String, List<Map<String, String>>>();
 
@@ -233,15 +243,30 @@ public class SubmissionConfigReader {
             if (submitName != null) {
                 return getSubmissionConfigByName(submitName);
             }
-        }
 
-        // get the name of the submission process based on the entity type of this collections
-        if (!entityTypeToSubmissionConfig.isEmpty()) {
-            String entityType = collectionService.getMetadataFirstValue(col, "dspace", "entity", "type", Item.ANY);
-            submitName = entityTypeToSubmissionConfig
-                .get(entityType);
-            if (submitName != null) {
-                return getSubmissionConfigByName(submitName);
+            // get the name of the submission process based on the entity type of this collections
+            if (!entityTypeToSubmissionConfig.isEmpty()) {
+                String entityType = collectionService.getMetadataFirstValue(col, "dspace", "entity", "type", Item.ANY);
+                submitName = entityTypeToSubmissionConfig
+                    .get(entityType);
+                if (submitName != null) {
+                    return getSubmissionConfigByName(submitName);
+                }
+            }
+
+            if (!communityToSubmissionConfig.isEmpty()) {
+                try {
+                    List<Community> communities = col.getCommunities();
+                    for (Community com : communities) {
+                        submitName = getSubmissionConfigByCommunity(com);
+                        if (submitName != null) {
+                            return getSubmissionConfigByName(submitName);
+                        }
+                    }
+                } catch (SQLException sqle) {
+                    throw new IllegalStateException("Error occurred while getting item submission configured " +
+                                                    "by community", sqle);
+                }
             }
         }
 
@@ -255,6 +280,30 @@ public class SubmissionConfigReader {
         return getSubmissionConfigByName(submitName);
     }
 
+    /**
+     * Recursive function to return the Item Submission process config
+     * used for a community or the closest community parent, or null
+     * if none is defined
+     *
+     * @param com community for which search Submission process config
+     * @return the SubmissionConfig representing the item submission config
+     */
+    private String getSubmissionConfigByCommunity(Community com) {
+        String submitName = communityToSubmissionConfig
+                .get(com.getHandle());
+        if (submitName != null) {
+            return submitName;
+        }
+        List<Community> communities = com.getParentCommunities();
+        for (Community parentCom : communities) {
+            submitName = getSubmissionConfigByCommunity(parentCom);
+            if (submitName != null) {
+                return submitName;
+            }
+        }
+        return null;
+    }
+
     /**
      * Returns the Item Submission process config
      *
@@ -309,7 +358,7 @@ public class SubmissionConfigReader {
         throws SubmissionConfigReaderException {
         // We should already have the step definitions loaded
         if (stepDefns != null) {
-            // retreive step info
+            // retrieve step info
             Map<String, String> stepInfo = stepDefns.get(stepID);
 
             if (stepInfo != null) {
@@ -380,13 +429,14 @@ public class SubmissionConfigReader {
             Node nd = nl.item(i);
             if (nd.getNodeName().equals("name-map")) {
                 String id = getAttribute(nd, "collection-handle");
+                String communityId = getAttribute(nd, "community-handle");
                 String entityType = getAttribute(nd, "collection-entity-type");
                 String value = getAttribute(nd, "submission-name");
                 String content = getValue(nd);
-                if (id == null && entityType == null) {
+                if (id == null && communityId == null && entityType == null) {
                     throw new SAXException(
-                        "name-map element is missing collection-handle or collection-entity-type attribute " +
-                            "in 'item-submission.xml'");
+                        "name-map element is missing collection-handle or community-handle or collection-entity-type " +
+                            "attribute in 'item-submission.xml'");
                 }
                 if (value == null) {
                     throw new SAXException(
@@ -398,7 +448,8 @@ public class SubmissionConfigReader {
                 }
                 if (id != null) {
                     collectionToSubmissionConfig.put(id, value);
-
+                } else if (communityId != null) {
+                    communityToSubmissionConfig.put(communityId, value);
                 } else {
                     entityTypeToSubmissionConfig.put(entityType, value);
                 }
diff --git a/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java b/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java
index 28d39d911b..db45d42e49 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/SubmissionStepConfig.java
@@ -13,7 +13,7 @@ import java.util.Map;
 import org.apache.commons.lang3.BooleanUtils;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.WorkspaceItem;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.dspace.core.HibernateProxyHelper;
 
 /**
  * Class representing configuration for a single step within an Item Submission
diff --git a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
index d37e6d802f..b4ba69ffa2 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/SyndicationFeed.java
@@ -13,7 +13,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 
 import com.rometools.modules.itunes.EntryInformation;
 import com.rometools.modules.itunes.EntryInformationImpl;
@@ -35,6 +34,7 @@ import com.rometools.rome.feed.synd.SyndPerson;
 import com.rometools.rome.feed.synd.SyndPersonImpl;
 import com.rometools.rome.io.FeedException;
 import com.rometools.rome.io.SyndFeedOutput;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -523,7 +523,7 @@ public class SyndicationFeed {
      */
     protected String resolveURL(HttpServletRequest request, DSpaceObject dso) {
         // If no object given then just link to the whole repository,
-        // since no offical handle exists so we have to use local resolution.
+        // since no official handle exists so we have to use local resolution.
         if (dso == null) {
             if (baseURL == null) {
                 if (request == null) {
diff --git a/dspace-api/src/main/java/org/dspace/app/util/Util.java b/dspace-api/src/main/java/org/dspace/app/util/Util.java
index 3bc828d6c4..3a0c368880 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/Util.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/Util.java
@@ -20,8 +20,8 @@ import java.util.Locale;
 import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -179,7 +179,7 @@ public class Util {
      * @return the file size as a String
      */
     public static String formatFileSize(double in) {
-        // Work out the size of the file, and format appropriatly
+        // Work out the size of the file, and format appropriately
         // FIXME: When full i18n support is available, use the user's Locale
         // rather than the default Locale.
         NumberFormat nf = NumberFormat.getNumberInstance(Locale.getDefault());
@@ -238,7 +238,7 @@ public class Util {
         } catch (Exception e) {
             // at least log this error to make debugging easier
             // do not silently return null only.
-            log.warn("Unable to recoginze UUID from String \""
+            log.warn("Unable to recognize UUID from String \""
                          + val + "\". Will return null.", e);
             // Problem with parameter
             return null;
diff --git a/dspace-api/src/main/java/org/dspace/app/util/WebApp.java b/dspace-api/src/main/java/org/dspace/app/util/WebApp.java
index 2f42c1459f..c2fc133f41 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/WebApp.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/WebApp.java
@@ -8,16 +8,16 @@
 package org.dspace.app.util;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 
diff --git a/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java b/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java
index 03f41e535c..cf62bca30e 100644
--- a/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java
+++ b/dspace-api/src/main/java/org/dspace/app/util/service/OpenSearchService.java
@@ -85,7 +85,7 @@ public interface OpenSearchService {
      * @param start        - start result index
      * @param pageSize     - page size
      * @param scope        - search scope, null or the community/collection
-     * @param results      the retreived DSpace objects satisfying search
+     * @param results      the retrieved DSpace objects satisfying search
      * @param labels       labels to apply - format specific
      * @return formatted search results
      * @throws IOException if IO error
@@ -105,7 +105,7 @@ public interface OpenSearchService {
      * @param start        - start result index
      * @param pageSize     - page size
      * @param scope        - search scope, null or the community/collection
-     * @param results      the retreived DSpace objects satisfying search
+     * @param results      the retrieved DSpace objects satisfying search
      * @param labels       labels to apply - format specific
      * @return formatted search results
      * @throws IOException if IO error
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java
index 500ee04a97..d316cb636f 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationMethod.java
@@ -9,9 +9,9 @@ package org.dspace.authenticate;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java
index 1d67da37ec..2b07f73c48 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/AuthenticationServiceImpl.java
@@ -13,8 +13,10 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
@@ -22,8 +24,6 @@ import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.service.EPersonService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -49,15 +49,14 @@ import org.springframework.beans.factory.annotation.Autowired;
  * specified first (in the configuration) thus getting highest priority.
  *
  * @author Larry Stone
- * @version $Revision$
  * @see AuthenticationMethod
  */
 public class AuthenticationServiceImpl implements AuthenticationService {
 
     /**
-     * SLF4J logging category
+     * Logging category
      */
-    private final Logger log = (Logger) LoggerFactory.getLogger(AuthenticationServiceImpl.class);
+    private final Logger log = LogManager.getLogger();
 
     @Autowired(required = true)
     protected EPersonService ePersonService;
@@ -121,6 +120,7 @@ public class AuthenticationServiceImpl implements AuthenticationService {
         return bestRet;
     }
 
+    @Override
     public void updateLastActiveDate(Context context) {
         EPerson me = context.getCurrentUser();
         if (me != null) {
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
index 0c2be211a5..db71ec1c2f 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/IPAuthentication.java
@@ -14,9 +14,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
index 585eaf9cd8..40b8f48078 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
@@ -17,6 +17,7 @@ import java.util.Collections;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -29,9 +30,9 @@ import javax.naming.ldap.InitialLdapContext;
 import javax.naming.ldap.LdapContext;
 import javax.naming.ldap.StartTlsRequest;
 import javax.naming.ldap.StartTlsResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
@@ -68,12 +69,8 @@ import org.dspace.services.factory.DSpaceServicesFactory;
  * @author Ivan Masár
  * @author Michael Plate
  */
-public class LDAPAuthentication
-    implements AuthenticationMethod {
+public class LDAPAuthentication implements AuthenticationMethod {
 
-    /**
-     * log4j category
-     */
     private static final Logger log
             = org.apache.logging.log4j.LogManager.getLogger(LDAPAuthentication.class);
 
@@ -130,7 +127,7 @@ public class LDAPAuthentication
         return false;
     }
 
-    /*
+    /**
      * This is an explicit method.
      */
     @Override
@@ -138,7 +135,7 @@ public class LDAPAuthentication
         return false;
     }
 
-    /*
+    /**
      * Add authenticated users to the group defined in dspace.cfg by
      * the login.specialgroup key.
      */
@@ -177,7 +174,7 @@ public class LDAPAuthentication
         return Collections.EMPTY_LIST;
     }
 
-    /*
+    /**
      * Authenticate the given credentials.
      * This is the heart of the authentication method: test the
      * credentials for authenticity, and if accepted, attempt to match
@@ -187,7 +184,7 @@ public class LDAPAuthentication
      * @param context
      *  DSpace context, will be modified (ePerson set) upon success.
      *
-     * @param username
+     * @param netid
      *  Username (or email address) when method is explicit. Use null for
      *  implicit method.
      *
@@ -250,7 +247,7 @@ public class LDAPAuthentication
         }
 
         // Check a DN was found
-        if ((dn == null) || (dn.trim().equals(""))) {
+        if (StringUtils.isBlank(dn)) {
             log.info(LogHelper
                          .getHeader(context, "failed_login", "no DN found for user " + netid));
             return BAD_CREDENTIALS;
@@ -269,6 +266,18 @@ public class LDAPAuthentication
                 context.setCurrentUser(eperson);
                 request.setAttribute(LDAP_AUTHENTICATED, true);
 
+                // update eperson's attributes
+                context.turnOffAuthorisationSystem();
+                setEpersonAttributes(context, eperson, ldap, Optional.empty());
+                try {
+                    ePersonService.update(context, eperson);
+                    context.dispatchEvents();
+                } catch (AuthorizeException e) {
+                    log.warn("update of eperson " + eperson.getID()  + " failed", e);
+                } finally {
+                    context.restoreAuthSystemState();
+                }
+
                 // assign user to groups based on ldap dn
                 assignGroups(dn, ldap.ldapGroup, context);
 
@@ -313,14 +322,13 @@ public class LDAPAuthentication
                             log.info(LogHelper.getHeader(context,
                                                           "type=ldap-login", "type=ldap_but_already_email"));
                             context.turnOffAuthorisationSystem();
-                            eperson.setNetid(netid.toLowerCase());
+                            setEpersonAttributes(context, eperson, ldap, Optional.of(netid));
                             ePersonService.update(context, eperson);
                             context.dispatchEvents();
                             context.restoreAuthSystemState();
                             context.setCurrentUser(eperson);
                             request.setAttribute(LDAP_AUTHENTICATED, true);
 
-
                             // assign user to groups based on ldap dn
                             assignGroups(dn, ldap.ldapGroup, context);
 
@@ -331,20 +339,7 @@ public class LDAPAuthentication
                                 try {
                                     context.turnOffAuthorisationSystem();
                                     eperson = ePersonService.create(context);
-                                    if (StringUtils.isNotEmpty(email)) {
-                                        eperson.setEmail(email);
-                                    }
-                                    if (StringUtils.isNotEmpty(ldap.ldapGivenName)) {
-                                        eperson.setFirstName(context, ldap.ldapGivenName);
-                                    }
-                                    if (StringUtils.isNotEmpty(ldap.ldapSurname)) {
-                                        eperson.setLastName(context, ldap.ldapSurname);
-                                    }
-                                    if (StringUtils.isNotEmpty(ldap.ldapPhone)) {
-                                        ePersonService.setMetadataSingleValue(context, eperson,
-                                                MD_PHONE, ldap.ldapPhone, null);
-                                    }
-                                    eperson.setNetid(netid.toLowerCase());
+                                    setEpersonAttributes(context, eperson, ldap, Optional.of(netid));
                                     eperson.setCanLogIn(true);
                                     authenticationService.initEPerson(context, request, eperson);
                                     ePersonService.update(context, eperson);
@@ -382,6 +377,29 @@ public class LDAPAuthentication
         return BAD_ARGS;
     }
 
+    /**
+     * Update eperson's attributes
+     */
+    private void setEpersonAttributes(Context context, EPerson eperson, SpeakerToLDAP ldap, Optional<String> netid)
+        throws SQLException {
+
+        if (StringUtils.isNotEmpty(ldap.ldapEmail)) {
+            eperson.setEmail(ldap.ldapEmail);
+        }
+        if (StringUtils.isNotEmpty(ldap.ldapGivenName)) {
+            eperson.setFirstName(context, ldap.ldapGivenName);
+        }
+        if (StringUtils.isNotEmpty(ldap.ldapSurname)) {
+            eperson.setLastName(context, ldap.ldapSurname);
+        }
+        if (StringUtils.isNotEmpty(ldap.ldapPhone)) {
+            ePersonService.setMetadataSingleValue(context, eperson, MD_PHONE, ldap.ldapPhone, null);
+        }
+        if (netid.isPresent()) {
+            eperson.setNetid(netid.get().toLowerCase());
+        }
+    }
+
     /**
      * Internal class to manage LDAP query and results, mainly
      * because there are multiple values to return.
@@ -503,6 +521,7 @@ public class LDAPAuthentication
                     } else {
                         searchName = ldap_provider_url + ldap_search_context;
                     }
+                    @SuppressWarnings("BanJNDI")
                     NamingEnumeration<SearchResult> answer = ctx.search(
                         searchName,
                         "(&({0}={1}))", new Object[] {ldap_id_field,
@@ -553,7 +572,7 @@ public class LDAPAuthentication
                             att = atts.get(attlist[4]);
                             if (att != null) {
                                 // loop through all groups returned by LDAP
-                                ldapGroup = new ArrayList<String>();
+                                ldapGroup = new ArrayList<>();
                                 for (NamingEnumeration val = att.getAll(); val.hasMoreElements(); )  {
                                     ldapGroup.add((String) val.next());
                                 }
@@ -633,7 +652,8 @@ public class LDAPAuthentication
                         ctx.addToEnvironment(javax.naming.Context.AUTHORITATIVE, "true");
                         ctx.addToEnvironment(javax.naming.Context.REFERRAL, "follow");
                         // dummy operation to check if authentication has succeeded
-                        ctx.getAttributes("");
+                        @SuppressWarnings("BanJNDI")
+                        Attributes trash = ctx.getAttributes("");
                     } else if (!useTLS) {
                         // Authenticate
                         env.put(javax.naming.Context.SECURITY_AUTHENTICATION, "Simple");
@@ -671,7 +691,7 @@ public class LDAPAuthentication
         }
     }
 
-    /*
+    /**
      * Returns the URL of an external login page which is not applicable for this authn method.
      *
      * Note: Prior to DSpace 7, this method return the page of login servlet.
@@ -699,7 +719,7 @@ public class LDAPAuthentication
         return "ldap";
     }
 
-    /*
+    /**
      * Add authenticated users to the group defined in dspace.cfg by
      * the authentication-ldap.login.groupmap.* key.
      *
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java
index 5d4635d48e..c7ac1ff557 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthentication.java
@@ -9,9 +9,9 @@ package org.dspace.authenticate;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
index 8a4ac190c8..44c9fb7dc8 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OidcAuthenticationBean.java
@@ -20,10 +20,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.oidc.OidcClient;
 import org.dspace.authenticate.oidc.model.OidcTokenResponseDTO;
 import org.dspace.core.Context;
@@ -31,8 +33,6 @@ import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.services.ConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -51,7 +51,7 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
 
     private final static String LOGIN_PAGE_URL_FORMAT = "%s?client_id=%s&response_type=code&scope=%s&redirect_uri=%s";
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OidcAuthenticationBean.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private static final String OIDC_AUTHENTICATED = "oidc.authenticated";
 
@@ -174,7 +174,7 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
                 final Entry<String, String> entry = iterator.next();
 
                 if (isBlank(entry.getValue())) {
-                    LOGGER.error(" * {} is missing", entry.getKey());
+                    LOGGER.error(" * {} is missing", entry::getKey);
                 }
             }
             return "";
@@ -183,7 +183,7 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
         try {
             return format(LOGIN_PAGE_URL_FORMAT, authorizeUrl, clientId, scopes, encode(redirectUri, "UTF-8"));
         } catch (UnsupportedEncodingException e) {
-            LOGGER.error(e.getMessage(), e);
+            LOGGER.error(e::getMessage, e);
             return "";
         }
 
@@ -235,7 +235,7 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
         try {
             return oidcClient.getAccessToken(code);
         } catch (Exception ex) {
-            LOGGER.error("An error occurs retriving the OIDC access_token", ex);
+            LOGGER.error("An error occurs retrieving the OIDC access_token", ex);
             return null;
         }
     }
@@ -244,7 +244,7 @@ public class OidcAuthenticationBean implements AuthenticationMethod {
         try {
             return oidcClient.getUserInfo(accessToken);
         } catch (Exception ex) {
-            LOGGER.error("An error occurs retriving the OIDC user info", ex);
+            LOGGER.error("An error occurs retrieving the OIDC user info", ex);
             return Map.of();
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java
index 3e9ff6638a..932d963307 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthentication.java
@@ -10,9 +10,9 @@ package org.dspace.authenticate;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
index a11bbfc867..ee30338a8f 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/OrcidAuthenticationBean.java
@@ -18,11 +18,13 @@ import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
@@ -39,8 +41,6 @@ import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.orcid.jaxb.model.v3.release.record.Email;
 import org.orcid.jaxb.model.v3.release.record.Person;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -53,7 +53,7 @@ public class OrcidAuthenticationBean implements AuthenticationMethod {
 
     public static final String ORCID_AUTH_ATTRIBUTE = "orcid-authentication";
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(OrcidAuthenticationBean.class);
+    private final static Logger LOGGER = LogManager.getLogger();
 
     private final static String LOGIN_PAGE_URL_FORMAT = "%s?client_id=%s&response_type=code&scope=%s&redirect_uri=%s";
 
@@ -282,7 +282,8 @@ public class OrcidAuthenticationBean implements AuthenticationMethod {
         try {
             return orcidClient.getPerson(token.getAccessToken(), token.getOrcid());
         } catch (Exception ex) {
-            LOGGER.error("An error occurs retriving the ORCID record with id " + token.getOrcid(), ex);
+            LOGGER.error("An error occurs retrieving the ORCID record with id {}",
+                    token.getOrcid(), ex);
             return null;
         }
     }
@@ -319,7 +320,7 @@ public class OrcidAuthenticationBean implements AuthenticationMethod {
         try {
             return orcidClient.getAccessToken(code);
         } catch (Exception ex) {
-            LOGGER.error("An error occurs retriving the ORCID access_token", ex);
+            LOGGER.error("An error occurs retrieving the ORCID access_token", ex);
             return null;
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java
index 6d1ca862d3..f66d0730e9 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/PasswordAuthentication.java
@@ -11,9 +11,9 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -82,7 +82,7 @@ public class PasswordAuthentication
             // No conditions set, so must be able to self register
             return true;
         } else {
-            // Itterate through all domains
+            // Iterate through all domains
             String check;
             email = email.trim().toLowerCase();
             for (int i = 0; i < domains.length; i++) {
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
index 791634a7dc..2f117e6944 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/ShibAuthentication.java
@@ -20,9 +20,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -287,7 +287,7 @@ public class ShibAuthentication implements AuthenticationMethod {
     @Override
     public List<Group> getSpecialGroups(Context context, HttpServletRequest request) {
         try {
-            // User has not successfuly authenticated via shibboleth.
+            // User has not successfully authenticated via shibboleth.
             if (request == null ||
                 context.getCurrentUser() == null) {
                 return Collections.EMPTY_LIST;
@@ -309,7 +309,7 @@ public class ShibAuthentication implements AuthenticationMethod {
             if (ignoreScope && ignoreValue) {
                 throw new IllegalStateException(
                     "Both config parameters for ignoring an roll attributes scope and value are turned on, this is " +
-                        "not a permissable configuration. (Note: ignore-scope defaults to true) The configuration " +
+                        "not a permissible configuration. (Note: ignore-scope defaults to true) The configuration " +
                         "parameters are: 'authentication.shib.role-header.ignore-scope' and 'authentication.shib" +
                         ".role-header.ignore-value'");
             }
@@ -391,7 +391,7 @@ public class ShibAuthentication implements AuthenticationMethod {
             return new ArrayList<>(groups);
 
         } catch (Throwable t) {
-            log.error("Unable to validate any sepcial groups this user may belong too because of an exception.", t);
+            log.error("Unable to validate any special groups this user may belong too because of an exception.", t);
             return Collections.EMPTY_LIST;
         }
     }
@@ -546,7 +546,7 @@ public class ShibAuthentication implements AuthenticationMethod {
 
     /**
      * Identify an existing EPerson based upon the shibboleth attributes provided on
-     * the request object. There are three cases where this can occurr, each as
+     * the request object. There are three cases where this can occur, each as
      * a fallback for the previous method.
      *
      * 1) NetID from Shibboleth Header (best)
@@ -671,7 +671,7 @@ public class ShibAuthentication implements AuthenticationMethod {
         if (!foundNetID && !foundEmail && !foundRemoteUser) {
             log.error(
                 "Shibboleth authentication was not able to find a NetId, Email, or Tomcat Remote user for which to " +
-                    "indentify a user from.");
+                    "identify a user from.");
         }
 
 
@@ -931,7 +931,7 @@ public class ShibAuthentication implements AuthenticationMethod {
                          "compatibility mode.");
             return SUCCESS;
         } else {
-            // Passsword failure
+            // Password failure
             log.error(
                 "Shibboleth-based password authentication failed for user " + username + " because a bad password was" +
                     " supplied.");
@@ -944,7 +944,7 @@ public class ShibAuthentication implements AuthenticationMethod {
     /**
      * Initialize Shibboleth Authentication.
      *
-     * During initalization the mapping of additional eperson metadata will be loaded from the DSpace.cfg
+     * During initialization the mapping of additional eperson metadata will be loaded from the DSpace.cfg
      * and cached. While loading the metadata mapping this method will check the EPerson object to see
      * if it supports the metadata field. If the field is not supported and autocreate is turned on then
      * the field will be automatically created.
@@ -985,7 +985,7 @@ public class ShibAuthentication implements AuthenticationMethod {
             String[] metadataParts = metadataString.split("=>");
 
             if (metadataParts.length != 2) {
-                log.error("Unable to parse metadat mapping string: '" + metadataString + "'");
+                log.error("Unable to parse metadata mapping string: '" + metadataString + "'");
                 continue;
             }
 
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java b/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
index 12dc5feda5..55843c7107 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/X509Authentication.java
@@ -25,10 +25,10 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.StringTokenizer;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.factory.AuthenticateServiceFactory;
@@ -505,7 +505,7 @@ public class X509Authentication implements AuthenticationMethod {
         X509Certificate[] certs = null;
         if (request != null) {
             certs = (X509Certificate[]) request
-                .getAttribute("javax.servlet.request.X509Certificate");
+                .getAttribute("jakarta.servlet.request.X509Certificate");
         }
 
         if ((certs == null) || (certs.length == 0)) {
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/oidc/impl/OidcClientImpl.java b/dspace-api/src/main/java/org/dspace/authenticate/oidc/impl/OidcClientImpl.java
index ddab01e8cb..68fffd3fb2 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/oidc/impl/OidcClientImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/oidc/impl/OidcClientImpl.java
@@ -14,10 +14,10 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java b/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java
index e955302ec3..45ad8932da 100644
--- a/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java
+++ b/dspace-api/src/main/java/org/dspace/authenticate/service/AuthenticationService.java
@@ -10,8 +10,8 @@ package org.dspace.authenticate.service;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authenticate.AuthenticationMethod;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
index ca5b4a11b5..2ab2bbf902 100644
--- a/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authority/AuthoritySolrServiceImpl.java
@@ -11,9 +11,9 @@ import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.inject.Inject;
-import javax.inject.Named;
 
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrClient;
diff --git a/dspace-api/src/main/java/org/dspace/authority/AuthorityValue.java b/dspace-api/src/main/java/org/dspace/authority/AuthorityValue.java
index 10a608bb76..6ca0292fdb 100644
--- a/dspace-api/src/main/java/org/dspace/authority/AuthorityValue.java
+++ b/dspace-api/src/main/java/org/dspace/authority/AuthorityValue.java
@@ -9,6 +9,10 @@ package org.dspace.authority;
 
 import java.sql.SQLException;
 import java.text.DateFormat;
+import java.time.DateTimeException;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -16,6 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.SolrInputDocument;
@@ -25,9 +30,6 @@ import org.dspace.content.MetadataValue;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.core.Context;
 import org.dspace.util.SolrUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
 
 /**
  * @author Antoine Snyers (antoine at atmire.com)
@@ -192,7 +194,7 @@ public class AuthorityValue {
     }
 
     /**
-     * Information that can be used the choice ui
+     * Information that can be used the choice ui.
      *
      * @return map
      */
@@ -200,42 +202,51 @@ public class AuthorityValue {
         return new HashMap<>();
     }
 
-
-    public List<DateTimeFormatter> getDateFormatters() {
-        List<DateTimeFormatter> list = new ArrayList<>();
-        list.add(ISODateTimeFormat.dateTime());
-        list.add(ISODateTimeFormat.dateTimeNoMillis());
+    /**
+     * Build a list of ISO date formatters to parse various forms.
+     *
+     * <p><strong>Note:</strong>  any formatter which does not parse a zone or
+     * offset must have a default zone set.  See {@link stringToDate}.
+     *
+     * @return the formatters.
+     */
+    static private List<DateTimeFormatter> getDateFormatters() {
+        List<java.time.format.DateTimeFormatter> list = new ArrayList<>();
+        list.add(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss[.SSS]X"));
+        list.add(java.time.format.DateTimeFormatter.ISO_LOCAL_DATE_TIME
+                .withZone(ZoneId.systemDefault().normalized()));
         return list;
     }
 
-    public Date stringToDate(String date) {
+    /**
+     * Convert a date string to internal form, trying several parsers.
+     *
+     * @param date serialized date to be converted.
+     * @return converted date, or null if no parser accepted the input.
+     */
+    static public Date stringToDate(String date) {
         Date result = null;
         if (StringUtils.isNotBlank(date)) {
-            List<DateTimeFormatter> dateFormatters = getDateFormatters();
-            boolean converted = false;
-            int formatter = 0;
-            while (!converted) {
+            for (DateTimeFormatter formatter : getDateFormatters()) {
                 try {
-                    DateTimeFormatter dateTimeFormatter = dateFormatters.get(formatter);
-                    DateTime dateTime = dateTimeFormatter.parseDateTime(date);
-                    result = dateTime.toDate();
-                    converted = true;
-                } catch (IllegalArgumentException e) {
-                    formatter++;
-                    if (formatter > dateFormatters.size()) {
-                        converted = true;
-                    }
-                    log.error("Could not find a valid date format for: \"" + date + "\"", e);
+                    ZonedDateTime dateTime = ZonedDateTime.parse(date, formatter);
+                    result = Date.from(dateTime.toInstant());
+                    break;
+                } catch (DateTimeException e) {
+                    log.debug("Input '{}' did not match {}", date, formatter);
                 }
             }
         }
+        if (null == result) {
+            log.error("Could not find a valid date format for: \"{}\"", date);
+        }
         return result;
     }
 
     /**
      * log4j logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(AuthorityValue.class);
+    private static Logger log = LogManager.getLogger();
 
     @Override
     public String toString() {
@@ -272,6 +283,10 @@ public class AuthorityValue {
         return new AuthorityValue();
     }
 
+    /**
+     * Get the type of authority which created this value.
+     * @return type name.
+     */
     public String getAuthorityType() {
         return "internal";
     }
diff --git a/dspace-api/src/main/java/org/dspace/authority/indexer/DSpaceAuthorityIndexer.java b/dspace-api/src/main/java/org/dspace/authority/indexer/DSpaceAuthorityIndexer.java
index 20baef8f9c..b42bd130b7 100644
--- a/dspace-api/src/main/java/org/dspace/authority/indexer/DSpaceAuthorityIndexer.java
+++ b/dspace-api/src/main/java/org/dspace/authority/indexer/DSpaceAuthorityIndexer.java
@@ -80,7 +80,15 @@ public class DSpaceAuthorityIndexer implements AuthorityIndexerInterface, Initia
             throws SQLException, AuthorizeException {
         List<AuthorityValue> values = new ArrayList<>();
         for (String metadataField : metadataFields) {
-            List<MetadataValue> metadataValues = itemService.getMetadataByMetadataString(item, metadataField);
+
+            String[] fieldParts = metadataField.split("\\.");
+            String schema = (fieldParts.length > 0 ? fieldParts[0] : null);
+            String element = (fieldParts.length > 1 ? fieldParts[1] : null);
+            String qualifier = (fieldParts.length > 2 ? fieldParts[2] : null);
+
+            // Get metadata values without virtual metadata
+            List<MetadataValue> metadataValues = itemService.getMetadata(item, schema, element, qualifier, Item.ANY,
+                false);
             for (MetadataValue metadataValue : metadataValues) {
                 String content = metadataValue.getValue();
                 String authorityKey = metadataValue.getAuthority();
diff --git a/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java b/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
index a99d83764a..932cd71744 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/AuthorizeServiceImpl.java
@@ -693,7 +693,7 @@ public class AuthorizeServiceImpl implements AuthorizeService {
             if (!duplicates.isEmpty()) {
                 policy = duplicates.get(0);
             }
-        } else {
+        } else if (group != null) {
             // if an identical policy (same Action and same Group) is already in place modify it...
             policyTemp = findByTypeGroupAction(context, dso, group, action);
         }
diff --git a/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java b/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java
index e22b8e9df0..23806b35dd 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/PolicySet.java
@@ -137,7 +137,7 @@ public class PolicySet {
      *                      otherwise add to existing policies
      * @param clearOnly     if non-null, only process bitstreams whose names contain filter
      * @param name          policy name
-     * @param description   policy descrption
+     * @param description   policy description
      * @param startDate     policy start date
      * @param endDate       policy end date
      * @throws SQLException       if database error
diff --git a/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java b/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java
index d12c3ba919..2cefec35b3 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/RegexPasswordValidator.java
@@ -17,7 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Implementation of {@link PasswordValidatorService} that verifies if the given
- * passowrd matches the configured pattern.
+ * password matches the configured pattern.
  * 
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  */
diff --git a/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java b/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
index c781400bae..68a59d46ae 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicy.java
@@ -9,29 +9,28 @@ package org.dspace.authorize;
 
 import java.util.Date;
 import java.util.Objects;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.apache.solr.common.StringUtils;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
-import org.hibernate.annotations.Type;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.hibernate.Length;
 
 /**
  * Database entity representation of the ResourcePolicy table
@@ -99,9 +98,7 @@ public class ResourcePolicy implements ReloadableEntity<Integer> {
     @Column(name = "rptype", length = 30)
     private String rptype;
 
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "rpdescription")
+    @Column(name = "rpdescription", length = Length.LONG32)
     private String rpdescription;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicyServiceImpl.java b/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicyServiceImpl.java
index 7b93b91237..86998a2196 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicyServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/ResourcePolicyServiceImpl.java
@@ -417,7 +417,7 @@ public class ResourcePolicyServiceImpl implements ResourcePolicyService {
         ResourcePolicy resourcePolicy = resourcePolicyDAO.findOneById(context, id);
         Group group = resourcePolicy.getGroup();
 
-        if (resourcePolicy.getEPerson() != null && resourcePolicy.getEPerson().getID() == eperson.getID()) {
+        if (resourcePolicy.getEPerson() != null && resourcePolicy.getEPerson().getID().equals(eperson.getID())) {
             isMy = true;
         } else if (group != null && groupService.isMember(context, eperson, group)) {
             isMy = true;
diff --git a/dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java b/dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java
index 26b6bb1d73..3b09f9cf30 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/dao/impl/ResourcePolicyDAOImpl.java
@@ -8,16 +8,19 @@
 package org.dspace.authorize.dao.impl;
 
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import org.apache.commons.collections.CollectionUtils;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.ResourcePolicy_;
 import org.dspace.authorize.dao.ResourcePolicyDAO;
@@ -153,16 +156,30 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
 
     public List<ResourcePolicy> findByEPersonGroupTypeIdAction(Context context, EPerson e, List<Group> groups,
                                                                int action, int type_id) throws SQLException {
+        // If groups and eperson are empty, return immediately
+        if (CollectionUtils.isEmpty(groups) && e == null) {
+            return Collections.emptyList();
+        }
+
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, ResourcePolicy.class);
         Root<ResourcePolicy> resourcePolicyRoot = criteriaQuery.from(ResourcePolicy.class);
         criteriaQuery.select(resourcePolicyRoot);
+
+        // Determine which predicate to use to match EPerson or Group(s) based on which were specified in params
+        Predicate compareEpersonOrGroups =
+            (CollectionUtils.isNotEmpty(groups) && e != null) ?
+                // Both are non-empty, so check both via an OR clause
+                criteriaBuilder.or(criteriaBuilder.equal(resourcePolicyRoot.get(ResourcePolicy_.eperson), e),
+                                   resourcePolicyRoot.get(ResourcePolicy_.epersonGroup).in(groups)) :
+                // Otherwise only check one based on which is non-empty
+                (e != null ? criteriaBuilder.equal(resourcePolicyRoot.get(ResourcePolicy_.eperson), e) :
+                             resourcePolicyRoot.get(ResourcePolicy_.epersonGroup).in(groups));
+
         criteriaQuery.where(
             criteriaBuilder.and(criteriaBuilder.equal(resourcePolicyRoot.get(ResourcePolicy_.resourceTypeId), type_id),
                                 criteriaBuilder.equal(resourcePolicyRoot.get(ResourcePolicy_.actionId), action),
-                                criteriaBuilder
-                                    .or(criteriaBuilder.equal(resourcePolicyRoot.get(ResourcePolicy_.eperson), e),
-                                        (resourcePolicyRoot.get(ResourcePolicy_.epersonGroup).in(groups)))
+                                compareEpersonOrGroups
             )
         );
         return list(context, criteriaQuery, false, ResourcePolicy.class, 1, -1);
@@ -286,8 +303,8 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public int countByEPerson(Context context, EPerson ePerson) throws SQLException {
         Query query = createQuery(context,
-                "SELECT count(*) FROM " + ResourcePolicy.class.getSimpleName() + " WHERE eperson_id = (:epersonUuid) ");
-        query.setParameter("epersonUuid", ePerson.getID());
+                "SELECT count(*) FROM " + ResourcePolicy.class.getSimpleName() + " WHERE eperson = :eperson ");
+        query.setParameter("eperson", ePerson);
         return count(query);
     }
 
@@ -307,9 +324,9 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public int countByEPersonAndResourceUuid(Context context, EPerson eperson, UUID resourceUuid) throws SQLException {
         Query query = createQuery(context, "SELECT count(*) FROM " + ResourcePolicy.class.getSimpleName()
-                + " WHERE eperson_id = (:epersonUuid) AND dspace_object = (:resourceUuid) ");
+                + " WHERE eperson = :eperson AND dSpaceObject.id = :resourceUuid ");
         query.setParameter("resourceUuid", resourceUuid);
-        query.setParameter("epersonUuid", eperson.getID());
+        query.setParameter("eperson", eperson);
         return count(query);
     }
 
@@ -329,7 +346,7 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public int countByResouceUuidAndActionId(Context context, UUID resourceUuid, int actionId) throws SQLException {
         Query query = createQuery(context, "SELECT count(*) FROM " + ResourcePolicy.class.getSimpleName()
-                + " WHERE dspace_object = (:resourceUuid) AND action_id = (:actionId) ");
+                + " WHERE dSpaceObject.id = :resourceUuid AND actionId = :actionId ");
         query.setParameter("resourceUuid", resourceUuid);
         query.setParameter("actionId", actionId);
         return count(query);
@@ -349,7 +366,7 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public int countByResourceUuid(Context context, UUID resourceUuid) throws SQLException {
         Query query = createQuery(context, "SELECT count(*) FROM " + ResourcePolicy.class.getSimpleName()
-                + " WHERE dspace_object = (:resourceUuid) ");
+                + " WHERE dSpaceObject.id = :resourceUuid ");
         query.setParameter("resourceUuid", resourceUuid);
         return count(query);
     }
@@ -367,8 +384,8 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public int countResourcePolicyByGroup(Context context, Group group) throws SQLException {
         Query query = createQuery(context, "SELECT count(*) " + "FROM " + ResourcePolicy.class.getSimpleName()
-                + " WHERE epersongroup_id = (:groupUuid) ");
-        query.setParameter("groupUuid", group.getID());
+                + " WHERE epersonGroup = :group ");
+        query.setParameter("group", group);
         return count(query);
     }
 
@@ -388,9 +405,9 @@ public class ResourcePolicyDAOImpl extends AbstractHibernateDAO<ResourcePolicy>
     @Override
     public int countByGroupAndResourceUuid(Context context, Group group, UUID resourceUuid) throws SQLException {
         Query query = createQuery(context, "SELECT count(*) FROM " + ResourcePolicy.class.getSimpleName()
-                + " WHERE dspace_object = (:resourceUuid) AND epersongroup_id = (:groupUuid) ");
+                + " WHERE dSpaceObject.id = :resourceUuid AND epersonGroup = :group ");
         query.setParameter("resourceUuid", resourceUuid);
-        query.setParameter("groupUuid", group.getID());
+        query.setParameter("group", group);
         return count(query);
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java b/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java
index e0a94833d7..9fb2e6d4a1 100644
--- a/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java
+++ b/dspace-api/src/main/java/org/dspace/authorize/service/AuthorizeService.java
@@ -133,7 +133,7 @@ public interface AuthorizeService {
     public boolean authorizeActionBoolean(Context c, DSpaceObject o, int a, boolean useInheritance) throws SQLException;
 
     /**
-     * same authorize with a specif eperson (not the current user), returns boolean for those who don't want to deal
+     * same authorize with a specific eperson (not the current user), returns boolean for those who don't want to deal
      * with
      * catching exceptions.
      *
@@ -235,7 +235,7 @@ public interface AuthorizeService {
      * @param o        DSpaceObject to add policy to
      * @param actionID ID of action from <code>org.dspace.core.Constants</code>
      * @param e        eperson who can perform the action
-     * @param type     policy type, deafult types are declared in the ResourcePolicy class
+     * @param type     policy type, default types are declared in the ResourcePolicy class
      * @throws SQLException       if database error
      * @throws AuthorizeException if current user in context is not authorized to add policies
      */
@@ -261,7 +261,7 @@ public interface AuthorizeService {
      * @param o        object to add policy for
      * @param actionID ID of action from <code>org.dspace.core.Constants</code>
      * @param g        group to add policy for
-     * @param type     policy type, deafult types are declared in the ResourcePolicy class
+     * @param type     policy type, default types are declared in the ResourcePolicy class
      * @throws SQLException       if there's a database problem
      * @throws AuthorizeException if the current user is not authorized to add this policy
      */
diff --git a/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java b/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
index 6c38c8dd66..0eddfcac91 100644
--- a/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
+++ b/dspace-api/src/main/java/org/dspace/browse/BrowseIndex.java
@@ -195,7 +195,7 @@ public class BrowseIndex {
                                 }
                             }
 
-                            // for backward compatability we ignore the keywords
+                            // for backward compatibility we ignore the keywords
                             // single and full here
                             if (!sortName.equalsIgnoreCase("single")
                                 && !sortName.equalsIgnoreCase("full")
@@ -597,7 +597,7 @@ public class BrowseIndex {
     /**
      * Is the browse index of display type single?
      *
-     * @return true if singe, false if not
+     * @return true if single, false if not
      */
     public boolean isMetadataIndex() {
         return displayType != null && displayType.startsWith("metadata");
diff --git a/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java b/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
index ec4cb199ea..f78070d4f6 100644
--- a/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
+++ b/dspace-api/src/main/java/org/dspace/browse/CrossLinks.java
@@ -100,7 +100,7 @@ public class CrossLinks {
         // Resolve wildcards properly, eg. dc.subject.other matches a configuration for dc.subject.*
         for (String key : links.keySet()) {
             if (null != key && key.endsWith(".*")) {
-                // A substring of length-1, also substracting the wildcard should work as a "startsWith"
+                // A substring of length-1, also subtracting the wildcard should work as a "startsWith"
                 // check for the field eg. dc.subject.* -> dc.subject is the start of dc.subject.other
                 if (null != metadata && metadata.startsWith(key.substring(0, key.length() - 1 - ".*".length()))) {
                     return links.get(key);
diff --git a/dspace-api/src/main/java/org/dspace/checker/ChecksumHistory.java b/dspace-api/src/main/java/org/dspace/checker/ChecksumHistory.java
index 63779cda02..521bf546a4 100644
--- a/dspace-api/src/main/java/org/dspace/checker/ChecksumHistory.java
+++ b/dspace-api/src/main/java/org/dspace/checker/ChecksumHistory.java
@@ -8,19 +8,19 @@
 package org.dspace.checker;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.content.Bitstream;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/checker/ChecksumResult.java b/dspace-api/src/main/java/org/dspace/checker/ChecksumResult.java
index 57fcdb8e36..a634880777 100644
--- a/dspace-api/src/main/java/org/dspace/checker/ChecksumResult.java
+++ b/dspace-api/src/main/java/org/dspace/checker/ChecksumResult.java
@@ -8,12 +8,13 @@
 package org.dspace.checker;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Id;
-import javax.persistence.Table;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 /**
  * Database entity representation of the checksum_results table
diff --git a/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java b/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java
index b291232e8b..50ef4baa98 100644
--- a/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java
+++ b/dspace-api/src/main/java/org/dspace/checker/DailyReportEmailer.java
@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
@@ -63,7 +63,7 @@ public class DailyReportEmailer {
      * @throws MessagingException if message cannot be sent.
      */
     public void sendReport(File attachment, int numberOfBitstreams)
-        throws IOException, javax.mail.MessagingException {
+        throws IOException, jakarta.mail.MessagingException {
         if (numberOfBitstreams > 0) {
             ConfigurationService configurationService
                     = DSpaceServicesFactory.getInstance().getConfigurationService();
diff --git a/dspace-api/src/main/java/org/dspace/checker/LimitedCountDispatcher.java b/dspace-api/src/main/java/org/dspace/checker/LimitedCountDispatcher.java
index 93ce634a05..36fcefd47b 100644
--- a/dspace-api/src/main/java/org/dspace/checker/LimitedCountDispatcher.java
+++ b/dspace-api/src/main/java/org/dspace/checker/LimitedCountDispatcher.java
@@ -60,7 +60,7 @@ public class LimitedCountDispatcher implements BitstreamDispatcher {
     }
 
     /**
-     * Retreives the next bitstream to be checked.
+     * Retrieves the next bitstream to be checked.
      *
      * @return the bitstream
      * @throws SQLException if database error
diff --git a/dspace-api/src/main/java/org/dspace/checker/MostRecentChecksum.java b/dspace-api/src/main/java/org/dspace/checker/MostRecentChecksum.java
index eff8a8be1c..5cb1851e7c 100644
--- a/dspace-api/src/main/java/org/dspace/checker/MostRecentChecksum.java
+++ b/dspace-api/src/main/java/org/dspace/checker/MostRecentChecksum.java
@@ -9,16 +9,16 @@ package org.dspace.checker;
 
 import java.io.Serializable;
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.content.Bitstream;
diff --git a/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java b/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java
index 328d4a717e..44c594d0eb 100644
--- a/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImpl.java
@@ -9,9 +9,9 @@ package org.dspace.checker.dao.impl;
 
 import java.sql.SQLException;
 import java.util.Date;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
 import org.dspace.checker.ChecksumHistory;
 import org.dspace.checker.ChecksumResultCode;
 import org.dspace.checker.dao.ChecksumHistoryDAO;
diff --git a/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumResultDAOImpl.java b/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumResultDAOImpl.java
index 7552c6d5bb..ac882e971d 100644
--- a/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumResultDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/checker/dao/impl/ChecksumResultDAOImpl.java
@@ -8,10 +8,10 @@
 package org.dspace.checker.dao.impl;
 
 import java.sql.SQLException;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.checker.ChecksumResult;
 import org.dspace.checker.ChecksumResultCode;
 import org.dspace.checker.ChecksumResult_;
diff --git a/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java b/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java
index a31e02cbab..669621aeeb 100644
--- a/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/checker/dao/impl/MostRecentChecksumDAOImpl.java
@@ -11,14 +11,14 @@ import java.sql.SQLException;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Subquery;
 import org.dspace.checker.ChecksumHistory;
 import org.dspace.checker.ChecksumHistory_;
 import org.dspace.checker.ChecksumResult;
diff --git a/dspace-api/src/main/java/org/dspace/coarnotify/NotifyConfigurationService.java b/dspace-api/src/main/java/org/dspace/coarnotify/NotifyConfigurationService.java
new file mode 100644
index 0000000000..c9d65186b6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/coarnotify/NotifyConfigurationService.java
@@ -0,0 +1,34 @@
+/**
+ * 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.coarnotify;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Simple bean to manage different COAR Notify configuration
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyConfigurationService {
+
+    /**
+     * Mapping the submission step process identifier with the configuration
+     * (see configuration at coar-notify.xml)
+     */
+    private Map<String, List<NotifyPattern>> patterns;
+
+    public Map<String, List<NotifyPattern>> getPatterns() {
+        return patterns;
+    }
+
+    public void setPatterns(Map<String, List<NotifyPattern>> patterns) {
+        this.patterns = patterns;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/coarnotify/NotifyPattern.java b/dspace-api/src/main/java/org/dspace/coarnotify/NotifyPattern.java
new file mode 100644
index 0000000000..d678aa0523
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/coarnotify/NotifyPattern.java
@@ -0,0 +1,44 @@
+/**
+ * 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.coarnotify;
+
+/**
+ * A collection of configured patterns to be met when adding COAR Notify services.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyPattern {
+
+    private String pattern;
+    private boolean multipleRequest;
+
+    public NotifyPattern() {
+
+    }
+
+    public NotifyPattern(String pattern, boolean multipleRequest) {
+        this.pattern = pattern;
+        this.multipleRequest = multipleRequest;
+    }
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    public boolean isMultipleRequest() {
+        return multipleRequest;
+    }
+
+    public void setMultipleRequest(boolean multipleRequest) {
+        this.multipleRequest = multipleRequest;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/coarnotify/NotifySubmissionConfiguration.java b/dspace-api/src/main/java/org/dspace/coarnotify/NotifySubmissionConfiguration.java
new file mode 100644
index 0000000000..ee23ee3465
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/coarnotify/NotifySubmissionConfiguration.java
@@ -0,0 +1,65 @@
+/**
+ * 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.coarnotify;
+
+import java.util.List;
+
+/**
+ * this class represents the Configuration of Submission COAR Notify
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifySubmissionConfiguration {
+
+    /**
+     * the map key of configured bean of COARNotifyConfigurationService
+     * in coar-notify.xml
+     */
+    private String id;
+
+    /**
+     * the map values of configured bean of COARNotifyConfigurationService
+     * in coar-notify.xml
+     */
+    private List<NotifyPattern> patterns;
+
+    public NotifySubmissionConfiguration() {
+
+    }
+
+    public NotifySubmissionConfiguration(String id, List<NotifyPattern> patterns) {
+        super();
+        this.id = id;
+        this.patterns = patterns;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    /**
+     * Gets the list of configured COAR Notify Patterns
+     *
+     * @return the list of configured COAR Notify Patterns
+     */
+    public List<NotifyPattern> getPatterns() {
+        return patterns;
+    }
+
+    /**
+     * Sets the list of configured COAR Notify Patterns
+     * @param patterns
+     */
+    public void setPatterns(final List<NotifyPattern> patterns) {
+        this.patterns = patterns;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/coarnotify/SubmissionNotifyServiceImpl.java b/dspace-api/src/main/java/org/dspace/coarnotify/SubmissionNotifyServiceImpl.java
new file mode 100644
index 0000000000..afb771529f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/coarnotify/SubmissionNotifyServiceImpl.java
@@ -0,0 +1,53 @@
+/**
+ * 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.coarnotify;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.coarnotify.service.SubmissionNotifyService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Service implementation of {@link SubmissionNotifyService}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class SubmissionNotifyServiceImpl implements SubmissionNotifyService {
+
+    @Autowired(required = true)
+    private NotifyConfigurationService coarNotifyConfigurationService;
+
+    protected SubmissionNotifyServiceImpl() {
+
+    }
+
+    @Override
+    public NotifySubmissionConfiguration findOne(String id) {
+        List<NotifyPattern> patterns =
+            coarNotifyConfigurationService.getPatterns().get(id);
+
+        if (patterns == null) {
+            return null;
+        }
+
+        return new NotifySubmissionConfiguration(id, patterns);
+    }
+
+    @Override
+    public List<NotifySubmissionConfiguration> findAll() {
+        List<NotifySubmissionConfiguration> coarNotifies = new ArrayList<>();
+
+        coarNotifyConfigurationService.getPatterns().forEach((id, patterns) ->
+            coarNotifies.add(new NotifySubmissionConfiguration(id, patterns)
+            ));
+
+        return coarNotifies;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/coarnotify/service/SubmissionNotifyService.java b/dspace-api/src/main/java/org/dspace/coarnotify/service/SubmissionNotifyService.java
new file mode 100644
index 0000000000..43f3ea1733
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/coarnotify/service/SubmissionNotifyService.java
@@ -0,0 +1,39 @@
+/**
+ * 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.coarnotify.service;
+
+import java.util.List;
+
+import org.dspace.coarnotify.NotifySubmissionConfiguration;
+
+/**
+ * Service interface class for the Creative Submission COAR Notify.
+ * The implementation of this class is responsible for all business logic calls for the Creative Submission COAR Notify
+ * and is autowired by spring
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface SubmissionNotifyService {
+
+    /**
+     * Find the COARE Notify corresponding to the provided ID
+     * found in the configuration
+     *
+     * @param id - the ID of the COAR Notify to be found
+     * @return the corresponding COAR Notify if found or null when not found
+     */
+    public NotifySubmissionConfiguration findOne(String id);
+
+    /**
+     * Find all configured COAR Notifies
+     *
+     * @return all configured COAR Notifies
+     */
+    public List<NotifySubmissionConfiguration> findAll();
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/Bitstream.java b/dspace-api/src/main/java/org/dspace/content/Bitstream.java
index 5485735a28..3fdb6316b2 100644
--- a/dspace-api/src/main/java/org/dspace/content/Bitstream.java
+++ b/dspace-api/src/main/java/org/dspace/content/Bitstream.java
@@ -11,21 +11,21 @@ import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.dspace.core.HibernateProxyHelper;
 
 /**
  * Class representing bitstreams stored in the DSpace system.
diff --git a/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java b/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
index 6d64ee3073..4dacea0952 100644
--- a/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
+++ b/dspace-api/src/main/java/org/dspace/content/BitstreamFormat.java
@@ -11,27 +11,28 @@ import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CollectionTable;
-import javax.persistence.Column;
-import javax.persistence.ElementCollection;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.persistence.CollectionTable;
+import jakarta.persistence.Column;
+import jakarta.persistence.ElementCollection;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BitstreamFormatService;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
 import org.hibernate.annotations.Cascade;
 import org.hibernate.annotations.CollectionId;
-import org.hibernate.annotations.Type;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.hibernate.annotations.CollectionIdJavaType;
+import org.hibernate.type.descriptor.java.IntegerJavaType;
 
 /**
  * Class representing a particular bitstream format.
@@ -55,8 +56,6 @@ public class BitstreamFormat implements Serializable, ReloadableEntity<Integer>
     @Column(name = "short_description", length = 128, unique = true)
     private String shortDescription;
 
-    //    @Column(name="description")
-//    @Lob //Generates a TEXT or LONGTEXT data type
     @Column(name = "description", columnDefinition = "text")
     private String description;
 
@@ -73,10 +72,10 @@ public class BitstreamFormat implements Serializable, ReloadableEntity<Integer>
     @ElementCollection(fetch = FetchType.EAGER)
     @CollectionTable(name = "fileextension", joinColumns = @JoinColumn(name = "bitstream_format_id"))
     @CollectionId(
-        columns = @Column(name = "file_extension_id"),
-        type = @Type(type = "integer"),
+        column = @Column(name = "file_extension_id"),
         generator = "fileextension_seq"
     )
+    @CollectionIdJavaType(IntegerJavaType.class)
     @SequenceGenerator(name = "fileextension_seq", sequenceName = "fileextension_seq", allocationSize = 1)
     @Column(name = "extension")
     @Cascade( {org.hibernate.annotations.CascadeType.ALL, org.hibernate.annotations.CascadeType.DELETE_ORPHAN})
diff --git a/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java
index e23e5ce2c8..bd56ad4651 100644
--- a/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/BitstreamServiceImpl.java
@@ -14,8 +14,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 import java.util.regex.Pattern;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/content/Bundle.java b/dspace-api/src/main/java/org/dspace/content/Bundle.java
index e5cbdb6ff2..b619d5cd06 100644
--- a/dspace-api/src/main/java/org/dspace/content/Bundle.java
+++ b/dspace-api/src/main/java/org/dspace/content/Bundle.java
@@ -10,22 +10,22 @@ package org.dspace.content;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderColumn;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.OrderColumn;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.BundleService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.dspace.core.HibernateProxyHelper;
 
 /**
  * Class representing bundles of bitstreams stored in the DSpace system
@@ -131,7 +131,7 @@ public class Bundle extends DSpaceObject implements DSpaceObjectLegacySupport {
 
     /**
      * Get a copy of the bitstream list of this bundle
-     * Note that this is a copy and if you wish to manipulate the bistream list, you should use
+     * Note that this is a copy and if you wish to manipulate the bitstream list, you should use
      * {@ref Bundle.addBitstream}, {@ref Bundle.removeBitstream} or {@ref Bundle.clearBitstreams}
      *
      * @return the bitstreams
diff --git a/dspace-api/src/main/java/org/dspace/content/CacheableDSpaceObject.java b/dspace-api/src/main/java/org/dspace/content/CacheableDSpaceObject.java
new file mode 100644
index 0000000000..fa6ec7676a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/CacheableDSpaceObject.java
@@ -0,0 +1,20 @@
+/**
+ * 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.content;
+
+import jakarta.persistence.Cacheable;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+/**
+ * Abstract class for DSpaceObjects which are safe to cache in Hibernate's second level cache.
+ * See hibernate-ehcache-config.xml for caching configurations for each DSpaceObject which extends this class.
+ */
+@Cacheable
+@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy")
+public abstract class CacheableDSpaceObject extends DSpaceObject {
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/Collection.java b/dspace-api/src/main/java/org/dspace/content/Collection.java
index 8900ac21b7..8c27c5a4ae 100644
--- a/dspace-api/src/main/java/org/dspace/content/Collection.java
+++ b/dspace-api/src/main/java/org/dspace/content/Collection.java
@@ -15,28 +15,26 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nonnull;
-import javax.persistence.Cacheable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.annotation.Nonnull;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.comparator.NameAscendingComparator;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.eperson.Group;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.proxy.HibernateProxyHelper;
 
 /**
  * Class representing a collection.
@@ -53,9 +51,7 @@ import org.hibernate.proxy.HibernateProxyHelper;
  */
 @Entity
 @Table(name = "collection")
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy")
-public class Collection extends DSpaceObject implements DSpaceObjectLegacySupport {
+public class Collection extends CacheableDSpaceObject implements DSpaceObjectLegacySupport {
 
     @Column(name = "collection_id", insertable = false, updatable = false)
     private Integer legacyId;
@@ -159,7 +155,7 @@ public class Collection extends DSpaceObject implements DSpaceObjectLegacySuppor
     /**
      * Set the default group of submitters
      *
-     * Package protected in order to preven unauthorized calls to this method
+     * Package protected in order to prevent unauthorized calls to this method
      *
      * @param submitters the group of submitters
      */
@@ -233,7 +229,7 @@ public class Collection extends DSpaceObject implements DSpaceObjectLegacySuppor
      * @throws SQLException if database error
      */
     public void setLicense(Context context, String license) throws SQLException {
-        getCollectionService().setMetadataSingleValue(context, this, MD_LICENSE, Item.ANY, license);
+        getCollectionService().setMetadataSingleValue(context, this, MD_LICENSE, null, license);
     }
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
index 5fe8ca54d9..b800ce21a9 100644
--- a/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/CollectionServiceImpl.java
@@ -1028,6 +1028,61 @@ public class CollectionServiceImpl extends DSpaceObjectServiceImpl<Collection> i
         return resp;
     }
 
+    @Override
+    public Collection retrieveCollectionWithSubmitByEntityType(Context context, Item item,
+        String entityType) throws SQLException {
+        Collection ownCollection = item.getOwningCollection();
+        return retrieveWithSubmitCollectionByEntityType(context, ownCollection.getCommunities(), entityType);
+    }
+
+    private Collection retrieveWithSubmitCollectionByEntityType(Context context, List<Community> communities,
+        String entityType) {
+
+        for (Community community : communities) {
+            Collection collection = retrieveCollectionWithSubmitByCommunityAndEntityType(context, community,
+                entityType);
+            if (collection != null) {
+                return collection;
+            }
+        }
+
+        for (Community community : communities) {
+            List<Community> parentCommunities = community.getParentCommunities();
+            Collection collection = retrieveWithSubmitCollectionByEntityType(context, parentCommunities, entityType);
+            if (collection != null) {
+                return collection;
+            }
+        }
+
+        return retrieveCollectionWithSubmitByCommunityAndEntityType(context, null, entityType);
+    }
+
+    @Override
+    public Collection retrieveCollectionWithSubmitByCommunityAndEntityType(Context context, Community community,
+        String entityType) {
+        context.turnOffAuthorisationSystem();
+        List<Collection> collections;
+        try {
+            collections = findCollectionsWithSubmit(null, context, community, entityType, 0, 1);
+        } catch (SQLException | SearchServiceException e) {
+            throw new RuntimeException(e);
+        }
+        context.restoreAuthSystemState();
+        if (collections != null && collections.size() > 0) {
+            return collections.get(0);
+        }
+        if (community != null) {
+            for (Community subCommunity : community.getSubcommunities()) {
+                Collection collection = retrieveCollectionWithSubmitByCommunityAndEntityType(context,
+                    subCommunity, entityType);
+                if (collection != null) {
+                    return collection;
+                }
+            }
+        }
+        return null;
+    }
+
     @Override
     public List<Collection> findCollectionsWithSubmit(String q, Context context, Community community, String entityType,
             int offset, int limit) throws SQLException, SearchServiceException {
diff --git a/dspace-api/src/main/java/org/dspace/content/Community.java b/dspace-api/src/main/java/org/dspace/content/Community.java
index 4503b24cfa..7f362d2f16 100644
--- a/dspace-api/src/main/java/org/dspace/content/Community.java
+++ b/dspace-api/src/main/java/org/dspace/content/Community.java
@@ -12,27 +12,26 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import javax.persistence.Cacheable;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.content.comparator.NameAscendingComparator;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CommunityService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.eperson.Group;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.proxy.HibernateProxyHelper;
+
 
 /**
  * Class representing a community
@@ -45,9 +44,7 @@ import org.hibernate.proxy.HibernateProxyHelper;
  */
 @Entity
 @Table(name = "community")
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy")
-public class Community extends DSpaceObject implements DSpaceObjectLegacySupport {
+public class Community extends CacheableDSpaceObject implements DSpaceObjectLegacySupport {
     @Column(name = "community_id", insertable = false, updatable = false)
     private Integer legacyId;
 
diff --git a/dspace-api/src/main/java/org/dspace/content/DCDate.java b/dspace-api/src/main/java/org/dspace/content/DCDate.java
index d58aff7b1e..163e21cdc2 100644
--- a/dspace-api/src/main/java/org/dspace/content/DCDate.java
+++ b/dspace-api/src/main/java/org/dspace/content/DCDate.java
@@ -80,6 +80,9 @@ public class DCDate {
     // just year, "2009"
     private final SimpleDateFormat yearIso = new SimpleDateFormat("yyyy");
 
+    // Additional iso-like format which contains milliseconds
+    private final SimpleDateFormat fullIsoWithMs = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.000'");
+
     private static Map<Locale, DateFormatSymbols> dfsLocaleMap = new HashMap<Locale, DateFormatSymbols>();
 
     /**
@@ -193,6 +196,9 @@ public class DCDate {
         if (date == null) {
             date = tryParse(fullIso4, fromDC);
         }
+        if (date == null) {
+            date = tryParse(fullIsoWithMs, fromDC);
+        }
         if (date == null) {
             // Seems there is no time component to the date.
             date = tryParse(dateIso, fromDC);
@@ -244,6 +250,7 @@ public class DCDate {
         dateIso.setTimeZone(utcZone);
         yearMonthIso.setTimeZone(utcZone);
         yearIso.setTimeZone(utcZone);
+        fullIsoWithMs.setTimeZone(utcZone);
     }
 
     // Attempt to parse, swallowing errors; return null for failure.
diff --git a/dspace-api/src/main/java/org/dspace/content/DCPersonName.java b/dspace-api/src/main/java/org/dspace/content/DCPersonName.java
index cb9b5346ff..e51882f82e 100644
--- a/dspace-api/src/main/java/org/dspace/content/DCPersonName.java
+++ b/dspace-api/src/main/java/org/dspace/content/DCPersonName.java
@@ -44,7 +44,7 @@ public class DCPersonName {
      * @param rawValue the value entry from the database
      */
     public DCPersonName(String rawValue) {
-        // Null by default (representing noone)
+        // Null by default (representing no one)
         lastName = null;
         firstNames = null;
 
diff --git a/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java b/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
index 59217a109f..b659035dc6 100644
--- a/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
+++ b/dspace-api/src/main/java/org/dspace/content/DSpaceObject.java
@@ -11,19 +11,19 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.apache.commons.collections4.CollectionUtils;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
index 4e3fa42162..eee858fbc3 100644
--- a/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/DSpaceObjectServiceImpl.java
@@ -323,7 +323,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
                     }
                 }
                 metadataValue.setValue(String.valueOf(dcvalue));
-                //An update here isn't needed, this is persited upon the merge of the owning object
+                //An update here isn't needed, this is persisted upon the merge of the owning object
 //            metadataValueService.update(context, metadataValue);
                 dso.addDetails(metadataField.toString());
             }
@@ -656,6 +656,7 @@ public abstract class DSpaceObjectServiceImpl<T extends DSpaceObject> implements
                     // E.g. for an Author relationship,
                     //   the place should be updated using the same principle as dc.contributor.author.
                     StringUtils.startsWith(metadataValue.getAuthority(), Constants.VIRTUAL_AUTHORITY_PREFIX)
+                        && metadataValue instanceof RelationshipMetadataValue
                         && ((RelationshipMetadataValue) metadataValue).isUseForPlace()
                 ) {
                     int mvPlace = getMetadataValuePlace(fieldToLastPlace, metadataValue);
diff --git a/dspace-api/src/main/java/org/dspace/content/DuplicateDetectionServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/DuplicateDetectionServiceImpl.java
new file mode 100644
index 0000000000..9f52b7b63a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/DuplicateDetectionServiceImpl.java
@@ -0,0 +1,362 @@
+/**
+ * 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.content;
+
+import static java.util.Comparator.comparing;
+import static java.util.Comparator.naturalOrder;
+
+import java.sql.SQLException;
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.dspace.app.itemupdate.MetadataUtilities;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.service.DuplicateDetectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.MetadataFieldService;
+import org.dspace.content.service.MetadataValueService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.content.virtual.PotentialDuplicate;
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverQuery;
+import org.dspace.discovery.DiscoverResult;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchService;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.discovery.SearchUtils;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.discovery.indexobject.IndexableWorkflowItem;
+import org.dspace.discovery.indexobject.IndexableWorkspaceItem;
+import org.dspace.eperson.service.GroupService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.versioning.VersionHistory;
+import org.dspace.versioning.service.VersionHistoryService;
+import org.dspace.workflow.WorkflowItem;
+import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Default implementation of DuplicateDetectionService.
+ * Duplicate Detection Service handles get, search and validation operations for duplicate detection.
+ *
+ * @author Kim Shepherd
+ */
+public class DuplicateDetectionServiceImpl implements DuplicateDetectionService {
+
+    @Autowired
+    ConfigurationService configurationService;
+    @Autowired
+    VersionHistoryService versionHistoryService;
+    @Autowired
+    AuthorizeService authorizeService;
+    @Autowired
+    GroupService groupService;
+    @Autowired
+    MetadataFieldService metadataFieldService;
+    @Autowired
+    MetadataValueService metadataValueService;
+    @Autowired
+    XmlWorkflowItemService workflowItemService;
+    @Autowired
+    WorkspaceItemService workspaceItemService;
+    @Autowired
+    ItemService itemService;
+
+    /**
+     * Get a list of PotentialDuplicate objects (wrappers with some metadata included for previewing) that
+     * are identified as potential duplicates of the given item
+     *
+     * @param context DSpace context
+     * @param item    Item to check
+     * @return        List of potential duplicates (empty if none found)
+     * @throws SearchServiceException if an error occurs performing the discovery search
+     */
+    @Override
+    public List<PotentialDuplicate> getPotentialDuplicates(Context context, Item item)
+            throws SearchServiceException {
+        // Instantiate a new list of potential duplicates
+        List<PotentialDuplicate> potentialDuplicates = new LinkedList<>();
+
+        // Immediately return an empty if this feature is not configured
+        if (!configurationService.getBooleanProperty("duplicate.enable", false)) {
+            return potentialDuplicates;
+        }
+
+        // Search duplicates of this item and get discovery search result
+        DiscoverResult discoverResult = searchDuplicates(context, item);
+
+        // If the search result is valid, iterate results and validate / transform
+        if (discoverResult != null) {
+            for (IndexableObject result : discoverResult.getIndexableObjects()) {
+                if (result != null) {
+                    try {
+                        // Validate this result and check permissions to read the item
+                        Optional<PotentialDuplicate> potentialDuplicateOptional =
+                                validateDuplicateResult(context, result, item);
+                        if (potentialDuplicateOptional.isPresent()) {
+                            // Add the potential duplicate to the list
+                            potentialDuplicates.add(potentialDuplicateOptional.get());
+                        }
+                    } catch (SQLException e) {
+                        log.error("SQL Error obtaining duplicate result: " + e.getMessage());
+                    } catch (AuthorizeException e) {
+                        log.error("Authorize Error obtaining duplicate result: " + e.getMessage());
+                    }
+                }
+            }
+        }
+
+        // Return the list of potential duplicates
+        return potentialDuplicates;
+    }
+
+
+
+    /**
+     * Validate an indexable object (returned by discovery search) to ensure it is permissible, readable and valid
+     * and can be added to a list of results.
+     * An Optional is returned, if it is empty then it was invalid or did not pass validation.
+     *
+     * @param context The DSpace context
+     * @param indexableObject The discovery search result
+     * @param original The original item (to compare IDs, submitters, etc)
+     * @return An Optional potential duplicate
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    @Override
+    public Optional<PotentialDuplicate> validateDuplicateResult(Context context, IndexableObject indexableObject,
+                                                                Item original)
+            throws SQLException,
+            AuthorizeException {
+
+        Item resultItem = null;
+        PotentialDuplicate potentialDuplicate = null;
+        WorkspaceItem workspaceItem = null;
+        WorkflowItem workflowItem = null;
+
+        // Inspect the indexable object, and extract the DSpace item depending on
+        // what submission / archived state it is in
+        if (indexableObject instanceof IndexableWorkspaceItem) {
+            workspaceItem = ((IndexableWorkspaceItem) indexableObject).getIndexedObject();
+            // Only process workspace items that belong to the submitter
+            if (workspaceItem != null && workspaceItem.getSubmitter() != null
+                    && workspaceItem.getSubmitter().equals(context.getCurrentUser())) {
+                resultItem = workspaceItem.getItem();
+            }
+        }
+        if (indexableObject instanceof IndexableWorkflowItem) {
+            workflowItem = ((IndexableWorkflowItem) indexableObject).getIndexedObject();
+            if (workflowItem != null) {
+                resultItem = workflowItem.getItem();
+            }
+        }
+        if (indexableObject instanceof IndexableItem) {
+            resultItem = ((IndexableItem) indexableObject).getIndexedObject();
+            // Attempt resolution of workflow or workspace items, tested later
+            workflowItem = workflowItemService.findByItem(context, resultItem);
+            workspaceItem = workspaceItemService.findByItem(context, resultItem);
+        }
+
+        // Result item must not be null, a template item, or actually identical to the original
+        if (resultItem == null) {
+            log.warn("skipping null item in duplicate search results");
+            return Optional.empty();
+        } else if (resultItem.getTemplateItemOf() != null) {
+            log.info("skipping template item in duplicate search results, item={}", resultItem.getID());
+            return Optional.empty();
+        } else if (resultItem.getID().equals(original.getID())) {
+            log.info("skipping a duplicate search result for the original item", resultItem.getID());
+            return Optional.empty();
+        }
+
+        // If our item and the duplicate candidate share the same versionHistory, they are two different
+        // versions of the same item.
+        VersionHistory versionHistory = versionHistoryService.findByItem(context, original);
+        VersionHistory candiateVersionHistory = versionHistoryService.findByItem(context, resultItem);
+        // if the versionHistory is null, either versioning is switched off or the item doesn't have
+        // multiple versions
+        if (versionHistory != null && versionHistory.equals(candiateVersionHistory)) {
+            log.warn("skipping item that is just another version of this item");
+            return Optional.empty();
+        }
+
+        // Construct new potential duplicate object
+        potentialDuplicate = new PotentialDuplicate(resultItem);
+
+        // Get configured list of metadata fields to copy
+        List<String> fields = new ArrayList<>(Arrays.asList(
+                configurationService.getArrayProperty("duplicate.preview.metadata.field", new String[]{})));
+
+        // Get item metadata and if it's configured for mapping, copy it across to the potential duplicate object
+        List<MetadataValue> metadata = resultItem.getCachedMetadata();
+
+        // Prepare a map of metadata to set on the potential duplicate object
+        for (MetadataValue metadatum : metadata) {
+            String fieldName = metadatum.getMetadataField().toString('.');
+            if (fields.contains(fieldName)) {
+                potentialDuplicate.getMetadataValueList().add(metadatum);
+            }
+        }
+
+        // Only if the current user is also the submitter of the item will we add this information
+        if (workspaceItem != null && workspaceItem.getSubmitter() != null
+                && workspaceItem.getSubmitter().equals(context.getCurrentUser())) {
+            potentialDuplicate.setWorkspaceItemId(workspaceItem.getID());
+            return Optional.of(potentialDuplicate);
+        }
+
+        // More authorisation checks
+        if (workflowItem != null) {
+            Collection c = workflowItem.getCollection();
+            if (groupService.isMember(context, context.getCurrentUser(), c.getWorkflowStep1(context)) ||
+                    groupService.isMember(context, context.getCurrentUser(), c.getWorkflowStep2(context)) ||
+                    groupService.isMember(context, context.getCurrentUser(), c.getWorkflowStep3(context))) {
+                // Current user is a member of one of the workflow role groups
+                potentialDuplicate.setWorkflowItemId(workflowItem.getID());
+                return Optional.of(potentialDuplicate);
+            }
+        } else if (resultItem.isArchived() && !resultItem.isWithdrawn() && resultItem.isDiscoverable()) {
+            // Not a workspace or workflow item, but is it archived, not withdrawn, and discoverable?
+            // Is it readable by the current user?
+            if (authorizeService.authorizeActionBoolean(context, resultItem, Constants.READ)) {
+                return Optional.of(potentialDuplicate);
+            }
+        } else if (authorizeService.isAdmin(context, resultItem)) {
+            // Admins can always read, return immediately
+            return Optional.of(potentialDuplicate);
+        } else {
+            log.info("Potential duplicate result is not readable by the current user, skipping item={}",
+                    potentialDuplicate.getUuid());
+        }
+
+            // By default, return an empty result
+        return Optional.empty();
+    }
+
+    /**
+     * Search discovery for potential duplicates of a given item. The search uses levenshtein distance (configurable)
+     * and a single-term "comparison value" constructed out of the item title
+     *
+     * @param context DSpace context
+     * @param item The item to check
+     * @return DiscoverResult as a result of performing search. Null if invalid.
+     *
+     * @throws SearchServiceException if an error was encountered during the discovery search itself.
+     */
+    @Override
+    public DiscoverResult searchDuplicates(Context context, Item item) throws SearchServiceException {
+
+        // If the item is null or otherwise invalid (template, etc) then throw an appropriate error
+        if (item == null) {
+            throw new ResourceNotFoundException("Duplicate search error: item is null");
+        }
+        if (item.getTemplateItemOf() != null) {
+            throw new IllegalArgumentException("Cannot get duplicates for template item");
+        }
+
+        // Build normalised comparison value
+        String comparisonValue = buildComparisonValue(context, item);
+
+        // Construct query
+        if (StringUtils.isNotBlank(comparisonValue)) {
+            // Get search service
+            SearchService searchService = SearchUtils.getSearchService();
+
+            // Escape reserved solr characters
+            comparisonValue = searchService.escapeQueryChars(comparisonValue);
+
+            // Construct discovery query based on comparison value
+            DiscoverQuery discoverQuery = new DiscoverQuery();
+            discoverQuery.setQuery("(" + configurationService.getProperty("duplicate.comparison.solr.field",
+                    "deduplication_keyword") + ":" + comparisonValue + "~" +
+                    configurationService.getIntProperty("duplicate.comparison.distance", 0) + ")");
+            // Add filter queries for the resource type
+            discoverQuery.addFilterQueries("(search.resourcetype:Item OR " +
+                    "search.resourcetype:WorkspaceItem OR " +
+                    "search.resourcetype:XmlWorkflowItem OR search.resourcetype:WorkflowItem)");
+            // Skip this item itself so it isn't a false positive
+            discoverQuery.addFilterQueries("-search.resourceid:" + item.getID());
+
+            // Perform search and populate list with results, update total count integer
+            return searchService.search(context, discoverQuery);
+        } else {
+            log.warn("empty item comparison value, ignoring for duplicate search");
+        }
+
+        // Return null by default
+        return null;
+
+    }
+
+    /**
+     * Build a comparison value string made up of values of configured fields, used when indexing and querying
+     * items for deduplication
+     * @param context DSpace context
+     * @param item The DSpace item
+     * @return a constructed, normalised string
+     */
+    @Override
+    public String buildComparisonValue(Context context, Item item) {
+        // Get configured fields to use for comparison values
+        String[] comparisonFields = configurationService.getArrayProperty("duplicate.comparison.metadata.field",
+                new String[]{"dc.title"});
+        // Get all values, in order, for these fields
+        StringBuilder comparisonValueBuilder = new StringBuilder();
+        String comparisonValue = null;
+        for (String field : comparisonFields) {
+            try {
+                // Get field components
+                String[] fieldParts = MetadataUtilities.parseCompoundForm(field);
+                // Get all values of this field
+                List<MetadataValue> metadataValues = itemService.getMetadata(item,
+                        fieldParts[0], fieldParts[1], (fieldParts.length > 2 ? fieldParts[2] : null), Item.ANY);
+                // Sort metadata values by text value, so their 'position' in db doesn't matter for dedupe purposes
+                metadataValues.sort(comparing(MetadataValue::getValue, naturalOrder()));
+                for (MetadataValue metadataValue : metadataValues) {
+                    // Add each found value to the string builder (null values interpreted as empty)
+                    if (metadataValue != null) {
+                        comparisonValueBuilder.append(metadataValue.getValue());
+                    }
+                }
+            } catch (ParseException e) {
+                // Log error and continue processing
+                log.error("Error parsing configured field for deduplication comparison: item={}, field={}",
+                        item.getID(), field);
+            } catch (NullPointerException e) {
+                log.error("Null pointer encountered, probably during metadata value sort, when deduping:" +
+                        "item={}, field={}", item.getID(), field);
+            }
+        }
+
+        // Build string
+        comparisonValue = comparisonValueBuilder.toString();
+
+        // Normalise according to configuration
+        if (!StringUtils.isBlank(comparisonValue)) {
+            if (configurationService.getBooleanProperty("duplicate.comparison.normalise.lowercase")) {
+                comparisonValue = comparisonValue.toLowerCase(context.getCurrentLocale());
+            }
+            if (configurationService.getBooleanProperty("duplicate.comparison.normalise.whitespace")) {
+                comparisonValue = comparisonValue.replaceAll("\\s+", "");
+            }
+        }
+
+        // Return comparison value
+        return comparisonValue;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java
index 2f34129f2e..e831786678 100644
--- a/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java
@@ -8,6 +8,7 @@
 package org.dspace.content;
 
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
@@ -51,12 +52,7 @@ public class EntityServiceImpl implements EntityService {
     @Override
     public EntityType getType(Context context, Entity entity) throws SQLException {
         Item item = entity.getItem();
-        List<MetadataValue> list = itemService.getMetadata(item, "dspace", "entity", "type", Item.ANY, false);
-        if (!list.isEmpty()) {
-            return entityTypeService.findByEntityType(context, list.get(0).getValue());
-        } else {
-            return null;
-        }
+        return itemService.getEntityType(context, item);
     }
 
     @Override
@@ -64,7 +60,7 @@ public class EntityServiceImpl implements EntityService {
         List<Relationship> fullList = entity.getRelationships();
         List<Relationship> listToReturn = new LinkedList<>();
         for (Relationship relationship : fullList) {
-            if (relationship.getLeftItem().getID() == entity.getItem().getID()) {
+            if (relationship.getLeftItem().getID().equals(entity.getItem().getID())) {
                 listToReturn.add(relationship);
             }
         }
@@ -76,7 +72,7 @@ public class EntityServiceImpl implements EntityService {
         List<Relationship> fullList = entity.getRelationships();
         List<Relationship> listToReturn = new LinkedList<>();
         for (Relationship relationship : fullList) {
-            if (relationship.getRightItem().getID() == entity.getItem().getID()) {
+            if (relationship.getRightItem().getID().equals(entity.getItem().getID())) {
                 listToReturn.add(relationship);
             }
         }
@@ -103,7 +99,12 @@ public class EntityServiceImpl implements EntityService {
     @Override
     public List<RelationshipType> getAllRelationshipTypes(Context context, Entity entity, Integer limit, Integer offset)
             throws SQLException {
-        return relationshipTypeService.findByEntityType(context, this.getType(context, entity), limit, offset);
+        EntityType entityType = this.getType(context, entity);
+        if (entityType != null) {
+            return relationshipTypeService.findByEntityType(context, entityType, limit, offset);
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     @Override
@@ -115,7 +116,12 @@ public class EntityServiceImpl implements EntityService {
     @Override
     public List<RelationshipType> getLeftRelationshipTypes(Context context, Entity entity, boolean isLeft,
                                                            Integer limit, Integer offset) throws SQLException {
-        return relationshipTypeService.findByEntityType(context, this.getType(context, entity), isLeft, limit, offset);
+        EntityType entityType = this.getType(context, entity);
+        if (entityType != null) {
+            return relationshipTypeService.findByEntityType(context, entityType, isLeft, limit, offset);
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     @Override
@@ -128,7 +134,12 @@ public class EntityServiceImpl implements EntityService {
     public List<RelationshipType> getRightRelationshipTypes(Context context, Entity entity, boolean isLeft,
                                                             Integer limit, Integer offset) throws SQLException {
 
-        return relationshipTypeService.findByEntityType(context, this.getType(context, entity), isLeft, limit, offset);
+        EntityType entityType = this.getType(context, entity);
+        if (entityType != null) {
+            return relationshipTypeService.findByEntityType(context, entityType, isLeft, limit, offset);
+        } else {
+            return Collections.emptyList();
+        }
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/EntityType.java b/dspace-api/src/main/java/org/dspace/content/EntityType.java
index 20ab758a0b..720e0c492c 100644
--- a/dspace-api/src/main/java/org/dspace/content/EntityType.java
+++ b/dspace-api/src/main/java/org/dspace/content/EntityType.java
@@ -8,14 +8,14 @@
 package org.dspace.content;
 
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/content/FeedbackServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/FeedbackServiceImpl.java
index 7e34af132b..13f149f69f 100644
--- a/dspace-api/src/main/java/org/dspace/content/FeedbackServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/FeedbackServiceImpl.java
@@ -9,9 +9,9 @@ package org.dspace.content;
 import java.io.IOException;
 import java.util.Date;
 import java.util.Objects;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.dspace.content.service.FeedbackService;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/content/InstallItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/InstallItemServiceImpl.java
index 1aadbea162..23f30615d0 100644
--- a/dspace-api/src/main/java/org/dspace/content/InstallItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/InstallItemServiceImpl.java
@@ -28,6 +28,7 @@ import org.dspace.event.Event;
 import org.dspace.identifier.Identifier;
 import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.service.IdentifierService;
+import org.dspace.services.ConfigurationService;
 import org.dspace.supervision.SupervisionOrder;
 import org.dspace.supervision.service.SupervisionOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,6 +57,9 @@ public class InstallItemServiceImpl implements InstallItemService {
 
     Logger log = LogManager.getLogger(InstallItemServiceImpl.class);
 
+    @Autowired
+    protected ConfigurationService configurationService;
+
     protected InstallItemServiceImpl() {
     }
 
@@ -150,7 +154,6 @@ public class InstallItemServiceImpl implements InstallItemService {
         return finishItem(c, item, is);
     }
 
-
     protected void populateMetadata(Context c, Item item)
         throws SQLException, AuthorizeException {
         // create accession date
@@ -158,15 +161,6 @@ public class InstallItemServiceImpl implements InstallItemService {
         itemService.addMetadata(c, item, MetadataSchemaEnum.DC.getName(),
                                 "date", "accessioned", null, now.toString());
 
-        // add date available if not under embargo, otherwise it will
-        // be set when the embargo is lifted.
-        // this will flush out fatal embargo metadata
-        // problems before we set inArchive.
-        if (embargoService.getEmbargoTermsAsDate(c, item) == null) {
-            itemService.addMetadata(c, item, MetadataSchemaEnum.DC.getName(),
-                                    "date", "available", null, now.toString());
-        }
-
         // If issue date is set as "today" (literal string), then set it to current date
         // In the below loop, we temporarily clear all issued dates and re-add, one-by-one,
         // replacing "today" with today's date.
@@ -280,14 +274,20 @@ public class InstallItemServiceImpl implements InstallItemService {
         // Create provenance description
         StringBuffer provmessage = new StringBuffer();
 
-        if (item.getSubmitter() != null) {
+        //behavior to generate provenance message, if set true, personal data (e.g. email) of submitter will be hidden
+        //default value false, personal data of submitter will be shown in provenance message
+        String isProvenancePrivacyActiveProperty =
+                configurationService.getProperty("metadata.privacy.dc.description.provenance", "false");
+        boolean isProvenancePrivacyActive = Boolean.parseBoolean(isProvenancePrivacyActiveProperty);
+
+        if (item.getSubmitter() != null && !isProvenancePrivacyActive) {
             provmessage.append("Submitted by ").append(item.getSubmitter().getFullName())
-                .append(" (").append(item.getSubmitter().getEmail()).append(") on ")
-                .append(now.toString());
+                    .append(" (").append(item.getSubmitter().getEmail()).append(") on ")
+                    .append(now.toString());
         } else {
             // else, null submitter
-            provmessage.append("Submitted by unknown (probably automated) on")
-                .append(now.toString());
+            provmessage.append("Submitted by unknown (probably automated or submitter hidden) on ")
+                    .append(now.toString());
         }
         provmessage.append("\n");
 
diff --git a/dspace-api/src/main/java/org/dspace/content/Item.java b/dspace-api/src/main/java/org/dspace/content/Item.java
index 547ff490b8..5422528f84 100644
--- a/dspace-api/src/main/java/org/dspace/content/Item.java
+++ b/dspace-api/src/main/java/org/dspace/content/Item.java
@@ -14,27 +14,28 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
 import org.dspace.content.comparator.NameAscendingComparator;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.eperson.EPerson;
-import org.hibernate.proxy.HibernateProxyHelper;
+
 
 /**
  * Class representing an item in DSpace.
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemFilterService.java b/dspace-api/src/main/java/org/dspace/content/ItemFilterService.java
new file mode 100644
index 0000000000..8b664a9726
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/ItemFilterService.java
@@ -0,0 +1,33 @@
+/**
+ * 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.content;
+
+import java.util.List;
+
+import org.dspace.app.ldn.ItemFilter;
+
+/**
+ * Service interface class for the Item Filter Object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface ItemFilterService {
+
+    /**
+     * @param id the bean name of item filter
+     * @return one logical item filter by id
+     * defined in item-filter.xml
+     */
+    public ItemFilter findOne(String id);
+
+    /**
+     * @return all logical item filters
+     * defined in item-filter.xml
+     */
+    public List<ItemFilter> findAll();
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemFilterServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemFilterServiceImpl.java
new file mode 100644
index 0000000000..bdb23d6566
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/ItemFilterServiceImpl.java
@@ -0,0 +1,58 @@
+/**
+ * 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.content;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.dspace.app.ldn.ItemFilter;
+import org.dspace.content.logic.LogicalStatement;
+import org.dspace.kernel.ServiceManager;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Service implementation for {@link ItemFilterService}
+ *
+ * @author Mohamd Eskander (mohamed.eskander at 4science.com)
+ */
+public class ItemFilterServiceImpl implements ItemFilterService {
+
+    @Autowired
+    private ServiceManager serviceManager;
+
+    @Override
+    public ItemFilter findOne(String id) {
+        return findAll()
+            .stream()
+            .filter(itemFilter ->
+                itemFilter.getId().equals(id))
+            .findFirst()
+            .orElse(null);
+    }
+
+    @Override
+    public List<ItemFilter> findAll() {
+        Map<String, LogicalStatement> ldnFilters =
+            serviceManager.getServiceByName("ldnItemFilters", Map.class);
+        return ldnFilters.keySet()
+            .stream()
+            .sorted()
+            .map(ItemFilter::new)
+            .collect(Collectors.toList());
+    }
+
+    public ServiceManager getServiceManager() {
+        return serviceManager;
+    }
+
+    public void setServiceManager(ServiceManager serviceManager) {
+        this.serviceManager = serviceManager;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
index ac6c0d43d7..9a97851937 100644
--- a/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
@@ -50,6 +50,7 @@ import org.dspace.content.service.MetadataSchemaService;
 import org.dspace.content.service.RelationshipService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.content.virtual.VirtualMetadataPopulator;
+import org.dspace.contentreport.QueryPredicate;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
@@ -66,6 +67,7 @@ import org.dspace.event.Event;
 import org.dspace.harvest.HarvestedItem;
 import org.dspace.harvest.service.HarvestedItemService;
 import org.dspace.identifier.DOI;
+import org.dspace.identifier.DOIIdentifierProvider;
 import org.dspace.identifier.IdentifierException;
 import org.dspace.identifier.service.DOIService;
 import org.dspace.identifier.service.IdentifierService;
@@ -78,6 +80,7 @@ import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.orcid.service.OrcidSynchronizationService;
 import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.profile.service.ResearcherProfileService;
+import org.dspace.qaevent.dao.QAEventsDAO;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.service.VersioningService;
 import org.dspace.workflow.WorkflowItemService;
@@ -96,7 +99,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
     /**
      * log4j category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(Item.class);
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
 
     @Autowired(required = true)
     protected ItemDAO itemDAO;
@@ -171,8 +174,10 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
     @Autowired(required = true)
     protected SubscribeService subscribeService;
 
+    @Autowired
+    private QAEventsDAO qaEventsDao;
+
     protected ItemServiceImpl() {
-        super();
     }
 
     @Override
@@ -272,9 +277,8 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
                                               + template.getID()));
 
             return template;
-        } else {
-            return collection.getTemplateItem();
         }
+        return collection.getTemplateItem();
     }
 
     @Override
@@ -848,6 +852,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
         DOI doi = doiService.findDOIByDSpaceObject(context, item);
         if (doi != null) {
             doi.setDSpaceObject(null);
+            doi.setStatus(DOIIdentifierProvider.TO_BE_DELETED);
         }
 
         // remove version attached to the item
@@ -869,6 +874,11 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
             orcidToken.setProfileItem(null);
         }
 
+        List<QAEventProcessed> qaEvents = qaEventsDao.findByItem(context, item);
+        for (QAEventProcessed qaEvent : qaEvents) {
+            qaEventsDao.delete(context, qaEvent);
+        }
+
         //Only clear collections after we have removed everything else from the item
         item.clearCollections();
         item.setOwningCollection(null);
@@ -997,7 +1007,7 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
         throws SQLException, AuthorizeException {
         // Bundles should inherit from DEFAULT_ITEM_READ so that if the item is readable, the files
         // can be listed (even if they are themselves not readable as per DEFAULT_BITSTREAM_READ or other
-        // policies or embargos applied
+        // policies or embargoes applied
         List<ResourcePolicy> defaultCollectionBundlePolicies = authorizeService
                 .getPoliciesActionFilter(context, collection, Constants.DEFAULT_ITEM_READ);
         // Bitstreams should inherit from DEFAULT_BITSTREAM_READ
@@ -1231,9 +1241,8 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
         if (item.getOwningCollection() == null) {
             if (!isInProgressSubmission(context, item)) {
                 return true;
-            } else {
-                return false;
             }
+            return false;
         }
 
         return collectionService.canEditBoolean(context, item.getOwningCollection(), false);
@@ -1325,8 +1334,8 @@ prevent the generation of resource policy entry values with null dspace_object a
             if (!authorizeService
                 .isAnIdenticalPolicyAlreadyInPlace(context, dso, defaultPolicy.getGroup(), Constants.READ,
                     defaultPolicy.getID()) &&
-                   (!appendMode && this.isNotAlreadyACustomRPOfThisTypeOnDSO(context, dso) ||
-                    appendMode && this.shouldBeAppended(context, dso, defaultPolicy))) {
+                   (!appendMode && isNotAlreadyACustomRPOfThisTypeOnDSO(context, dso) ||
+                    appendMode && shouldBeAppended(context, dso, defaultPolicy))) {
                 ResourcePolicy newPolicy = resourcePolicyService.clone(context, defaultPolicy);
                 newPolicy.setdSpaceObject(dso);
                 newPolicy.setAction(Constants.READ);
@@ -1425,9 +1434,8 @@ prevent the generation of resource policy entry values with null dspace_object a
 
         if (Item.ANY.equals(value)) {
             return itemDAO.findByMetadataField(context, mdf, null, true);
-        } else {
-            return itemDAO.findByMetadataField(context, mdf, value, true);
         }
+        return itemDAO.findByMetadataField(context, mdf, value, true);
     }
 
     @Override
@@ -1471,19 +1479,24 @@ prevent the generation of resource policy entry values with null dspace_object a
 
         if (Item.ANY.equals(value)) {
             return itemDAO.findByMetadataField(context, mdf, null, true);
-        } else {
-            return itemDAO.findByMetadataField(context, mdf, value, true);
         }
+        return itemDAO.findByMetadataField(context, mdf, value, true);
     }
 
     @Override
-    public Iterator<Item> findByMetadataQuery(Context context, List<List<MetadataField>> listFieldList,
-                                              List<String> query_op, List<String> query_val, List<UUID> collectionUuids,
-                                              String regexClause, int offset, int limit)
-        throws SQLException, AuthorizeException, IOException {
-        return itemDAO
-            .findByMetadataQuery(context, listFieldList, query_op, query_val, collectionUuids, regexClause, offset,
-                                 limit);
+    public List<Item> findByMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids, long offset, int limit)
+            throws SQLException {
+        return itemDAO.findByMetadataQuery(context, queryPredicates, collectionUuids, "value ~ ?",
+                offset, limit);
+    }
+
+
+    @Override
+    public long countForMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids)
+            throws SQLException {
+        return itemDAO.countForMetadataQuery(context, queryPredicates, collectionUuids, "value ~ ?");
     }
 
     @Override
@@ -1549,20 +1562,19 @@ prevent the generation of resource policy entry values with null dspace_object a
         Collection ownCollection = item.getOwningCollection();
         if (ownCollection != null) {
             return ownCollection;
-        } else {
-            InProgressSubmission inprogress = ContentServiceFactory.getInstance().getWorkspaceItemService()
-                                                                   .findByItem(context,
-                                                                               item);
-            if (inprogress == null) {
-                inprogress = WorkflowServiceFactory.getInstance().getWorkflowItemService().findByItem(context, item);
-            }
-
-            if (inprogress != null) {
-                return inprogress.getCollection();
-            }
-            // is a template item?
-            return item.getTemplateItemOf();
         }
+        InProgressSubmission inprogress = ContentServiceFactory.getInstance().getWorkspaceItemService()
+                                                               .findByItem(context,
+                                                                           item);
+        if (inprogress == null) {
+            inprogress = WorkflowServiceFactory.getInstance().getWorkflowItemService().findByItem(context, item);
+        }
+
+        if (inprogress != null) {
+            return inprogress.getCollection();
+        }
+        // is a template item?
+        return item.getTemplateItemOf();
     }
 
     @Override
@@ -1662,9 +1674,8 @@ prevent the generation of resource policy entry values with null dspace_object a
         try {
             if (StringUtils.isNumeric(id)) {
                 return findByLegacyId(context, Integer.parseInt(id));
-            } else {
-                return find(context, UUID.fromString(id));
             }
+            return find(context, UUID.fromString(id));
         } catch (IllegalArgumentException e) {
             // Not a valid legacy ID or valid UUID
             return null;
@@ -1783,12 +1794,14 @@ prevent the generation of resource policy entry values with null dspace_object a
      */
     @Override
     protected void moveSingleMetadataValue(Context context, Item dso, int place, MetadataValue rr) {
+        // If this is a (virtual) metadata value representing a relationship,
+        // then we must also update the corresponding Relationship with the new place
         if (rr instanceof RelationshipMetadataValue) {
             try {
                 //Retrieve the applicable relationship
                 Relationship rs = relationshipService.find(context,
                         ((RelationshipMetadataValue) rr).getRelationshipId());
-                if (rs.getLeftItem() == dso) {
+                if (rs.getLeftItem().equals(dso)) {
                     rs.setLeftPlace(place);
                 } else {
                     rs.setRightPlace(place);
@@ -1798,10 +1811,10 @@ prevent the generation of resource policy entry values with null dspace_object a
                 //should not occur, otherwise metadata can't be updated either
                 log.error("An error occurred while moving " + rr.getAuthority() + " for item " + dso.getID(), e);
             }
-        } else {
-            //just move the metadata
-            rr.setPlace(place);
         }
+
+        // Update the MetadataValue object with the new place setting
+        rr.setPlace(place);
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataField.java b/dspace-api/src/main/java/org/dspace/content/MetadataField.java
index 8b76701199..cbe90a3744 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataField.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataField.java
@@ -7,23 +7,22 @@
  */
 package org.dspace.content;
 
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.proxy.HibernateProxyHelper;
 
 
 /**
@@ -58,8 +57,6 @@ public class MetadataField implements ReloadableEntity<Integer> {
     @Column(name = "qualifier", length = 64)
     private String qualifier = null;
 
-    //    @Column(name = "scope_note")
-//    @Lob
     @Column(name = "scope_note", columnDefinition = "text")
     private String scopeNote;
 
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataFieldName.java b/dspace-api/src/main/java/org/dspace/content/MetadataFieldName.java
index 8d7f4b0277..32c08dab2b 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataFieldName.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataFieldName.java
@@ -8,7 +8,8 @@
 package org.dspace.content;
 
 import java.util.Arrays;
-import javax.annotation.Nonnull;
+
+import jakarta.annotation.Nonnull;
 
 /**
  * Simple immutable holder for the name of a metadata field.
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataSchema.java b/dspace-api/src/main/java/org/dspace/content/MetadataSchema.java
index f60e5e1604..b9a4665e66 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataSchema.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataSchema.java
@@ -7,19 +7,18 @@
  */
 package org.dspace.content;
 
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Cacheable;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.proxy.HibernateProxyHelper;
 
 /**
  * Class representing a schema in DSpace.
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataValue.java b/dspace-api/src/main/java/org/dspace/content/MetadataValue.java
index 31479e6206..dc45579f4e 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataValue.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataValue.java
@@ -7,24 +7,23 @@
  */
 package org.dspace.content;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
-import org.hibernate.annotations.Type;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.hibernate.Length;
 
 /**
  * Database access class representing a Dublin Core metadata value.
@@ -59,9 +58,7 @@ public class MetadataValue implements ReloadableEntity<Integer> {
     /**
      * The value of the field
      */
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "text_value")
+    @Column(name = "text_value", length = Length.LONG32)
     private String value;
 
     /**
@@ -143,6 +140,9 @@ public class MetadataValue implements ReloadableEntity<Integer> {
      * @param language new language
      */
     public void setLanguage(String language) {
+        if (StringUtils.equals(language, Item.ANY)) {
+            language = null;
+        }
         this.language = language;
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/content/MetadataValueServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/MetadataValueServiceImpl.java
index 0c34c04f30..97f0c2ccf4 100644
--- a/dspace-api/src/main/java/org/dspace/content/MetadataValueServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/MetadataValueServiceImpl.java
@@ -52,7 +52,7 @@ public class MetadataValueServiceImpl implements MetadataValueService {
         metadataValue.setMetadataField(metadataField);
         metadataValue.setDSpaceObject(dso);
         dso.addMetadata(metadataValue);
-//An update here isn't needed, this is persited upon the merge of the owning object
+//An update here isn't needed, this is persisted upon the merge of the owning object
 //        metadataValueDAO.save(context, metadataValue);
         metadataValue = metadataValueDAO.create(context, metadataValue);
         log.info(LogHelper.getHeader(context, "add_metadatavalue",
diff --git a/dspace-api/src/main/java/org/dspace/content/PredefinedUUIDGenerator.java b/dspace-api/src/main/java/org/dspace/content/PredefinedUUIDGenerator.java
index aa4a8ea542..15d302ec61 100644
--- a/dspace-api/src/main/java/org/dspace/content/PredefinedUUIDGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/content/PredefinedUUIDGenerator.java
@@ -7,7 +7,6 @@
  */
 package org.dspace.content;
 
-import java.io.Serializable;
 import java.util.UUID;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
@@ -21,7 +20,7 @@ import org.hibernate.id.UUIDGenerator;
 public class PredefinedUUIDGenerator extends UUIDGenerator {
 
     @Override
-    public Serializable generate(SharedSessionContractImplementor session, Object object) {
+    public Object generate(SharedSessionContractImplementor session, Object object) {
         if (object instanceof DSpaceObject) {
             UUID uuid = ((DSpaceObject) object).getPredefinedUUID();
             if (uuid != null) {
diff --git a/dspace-api/src/main/java/org/dspace/content/QAEvent.java b/dspace-api/src/main/java/org/dspace/content/QAEvent.java
new file mode 100644
index 0000000000..0f2608ef70
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/QAEvent.java
@@ -0,0 +1,220 @@
+/**
+ * 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.content;
+
+import java.io.UnsupportedEncodingException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.dspace.qaevent.service.dto.CorrectionTypeMessageDTO;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.qaevent.service.dto.OpenaireMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.dspace.util.RawJsonDeserializer;
+
+/**
+ * This class represent the Quality Assurance broker data as loaded in our solr
+ * qaevent core
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class QAEvent {
+    public static final char[] HEX_DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
+        'f' };
+    public static final String ACCEPTED = "accepted";
+    public static final String REJECTED = "rejected";
+    public static final String DISCARDED = "discarded";
+
+    public static final String OPENAIRE_SOURCE = "openaire";
+    public static final String DSPACE_USERS_SOURCE = "DSpaceUsers";
+    public static final String COAR_NOTIFY_SOURCE = "coar-notify";
+
+    private String source;
+
+    private String eventId;
+    /**
+     * contains the targeted dspace object,
+     * ie: oai:www.openstarts.units.it:123456789/1120 contains the handle
+     * of the DSpace pbject in its final part 123456789/1120
+     * */
+    private String originalId;
+
+    /**
+     * evaluated with the targeted dspace object id
+     * 
+     * */
+    private String target;
+
+    private String related;
+
+    private String title;
+
+    private String topic;
+
+    private double trust;
+
+    @JsonDeserialize(using = RawJsonDeserializer.class)
+    private String message;
+
+    private Date lastUpdate;
+
+    private String status = "PENDING";
+
+    public QAEvent() {}
+
+    public QAEvent(String source, String originalId, String target, String title,
+        String topic, double trust, String message, Date lastUpdate) {
+        super();
+        this.source = source;
+        this.originalId = originalId;
+        this.target = target;
+        this.title = title;
+        this.topic = topic;
+        this.trust = trust;
+        this.message = message;
+        this.lastUpdate = lastUpdate;
+        try {
+            computedEventId();
+        } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    public String getOriginalId() {
+        return originalId;
+    }
+
+    public void setOriginalId(String originalId) {
+        this.originalId = originalId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public double getTrust() {
+        return trust;
+    }
+
+    public void setTrust(double trust) {
+        this.trust = trust;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+    public String getEventId() {
+        if (eventId == null) {
+            try {
+                computedEventId();
+            } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return eventId;
+    }
+
+    public void setEventId(String eventId) {
+        this.eventId = eventId;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public Date getLastUpdate() {
+        return lastUpdate;
+    }
+
+    public void setLastUpdate(Date lastUpdate) {
+        this.lastUpdate = lastUpdate;
+    }
+
+    public void setRelated(String related) {
+        this.related = related;
+    }
+
+    public String getRelated() {
+        return related;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public String getSource() {
+        return source != null ? source : OPENAIRE_SOURCE;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    /*
+     * DTO constructed via Jackson use empty constructor. In this case, the eventId
+     * must be compute on the get method. This method create a signature based on
+     * the event fields and store it in the eventid attribute.
+     */
+    private void computedEventId() throws NoSuchAlgorithmException, UnsupportedEncodingException {
+        MessageDigest digester = MessageDigest.getInstance("MD5");
+        String dataToString = "source=" + source + ",originalId=" + originalId + ", title=" + title + ", topic="
+            + topic + ", trust=" + trust + ", message=" + message;
+        digester.update(dataToString.getBytes("UTF-8"));
+        byte[] signature = digester.digest();
+        char[] arr = new char[signature.length << 1];
+        for (int i = 0; i < signature.length; i++) {
+            int b = signature[i];
+            int idx = i << 1;
+            arr[idx] = HEX_DIGITS[(b >> 4) & 0xf];
+            arr[idx + 1] = HEX_DIGITS[b & 0xf];
+        }
+        eventId = new String(arr);
+
+    }
+
+    public Class<? extends QAMessageDTO> getMessageDtoClass() {
+        switch (getSource()) {
+            case OPENAIRE_SOURCE:
+                return OpenaireMessageDTO.class;
+            case COAR_NOTIFY_SOURCE:
+                return NotifyMessageDTO.class;
+            case DSPACE_USERS_SOURCE:
+                return CorrectionTypeMessageDTO.class;
+            default:
+                throw new IllegalArgumentException("Unknown event's source: " + getSource());
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/QAEventProcessed.java b/dspace-api/src/main/java/org/dspace/content/QAEventProcessed.java
new file mode 100644
index 0000000000..fcca5b4570
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/QAEventProcessed.java
@@ -0,0 +1,82 @@
+/**
+ * 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.content;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import org.dspace.eperson.EPerson;
+
+/**
+ * This class represent the stored information about processed notification
+ * broker events
+ *
+ */
+@Entity
+@Table(name = "qaevent_processed")
+public class QAEventProcessed implements Serializable {
+
+    private static final long serialVersionUID = 3427340199132007814L;
+
+    @Id
+    @Column(name = "qaevent_id")
+    private String eventId;
+
+    @Temporal(TemporalType.TIMESTAMP)
+    @Column(name = "qaevent_timestamp")
+    private Date eventTimestamp;
+
+    @JoinColumn(name = "eperson_uuid")
+    @ManyToOne
+    private EPerson eperson;
+
+    @JoinColumn(name = "item_uuid")
+    @ManyToOne
+    private Item item;
+
+    public String getEventId() {
+        return eventId;
+    }
+
+    public void setEventId(String eventId) {
+        this.eventId = eventId;
+    }
+
+    public Date getEventTimestamp() {
+        return eventTimestamp;
+    }
+
+    public void setEventTimestamp(Date eventTimestamp) {
+        this.eventTimestamp = eventTimestamp;
+    }
+
+    public EPerson getEperson() {
+        return eperson;
+    }
+
+    public void setEperson(EPerson eperson) {
+        this.eperson = eperson;
+    }
+
+    public Item getItem() {
+        return item;
+    }
+
+    public void setItem(Item item) {
+        this.item = item;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/Relationship.java b/dspace-api/src/main/java/org/dspace/content/Relationship.java
index 77c418a23d..05e4b00718 100644
--- a/dspace-api/src/main/java/org/dspace/content/Relationship.java
+++ b/dspace-api/src/main/java/org/dspace/content/Relationship.java
@@ -7,19 +7,20 @@
  */
 package org.dspace.content;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  * This class represents a relationship
@@ -96,6 +97,7 @@ public class Relationship implements ReloadableEntity<Integer> {
      * This column affects what version of an item appears on search pages or the relationship listings of other items.
      */
     @Column(name = "latest_version_status")
+    @JdbcTypeCode(SqlTypes.INTEGER)
     private LatestVersionStatus latestVersionStatus = LatestVersionStatus.BOTH;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipType.java b/dspace-api/src/main/java/org/dspace/content/RelationshipType.java
index 5e6941052b..bcabc98cff 100644
--- a/dspace-api/src/main/java/org/dspace/content/RelationshipType.java
+++ b/dspace-api/src/main/java/org/dspace/content/RelationshipType.java
@@ -7,20 +7,21 @@
  */
 package org.dspace.content;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 /**
  * Class representing a RelationshipType
@@ -97,7 +98,7 @@ public class RelationshipType implements ReloadableEntity<Integer> {
     private Integer rightMinCardinality;
 
     /**
-     * Tha maximum amount of relations for the rightItem that can be present at all times
+     * The maximum amount of relations for the rightItem that can be present at all times
      */
     @Column(name = "right_max_cardinality")
     private Integer rightMaxCardinality;
@@ -118,6 +119,7 @@ public class RelationshipType implements ReloadableEntity<Integer> {
      * The value indicating whether relationships of this type should be ignored on the right/left/neither.
      */
     @Column(name = "tilted")
+    @JdbcTypeCode(SqlTypes.INTEGER)
     private Tilted tilted;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/content/Site.java b/dspace-api/src/main/java/org/dspace/content/Site.java
index 0bdab6ffe5..904c1d3e6b 100644
--- a/dspace-api/src/main/java/org/dspace/content/Site.java
+++ b/dspace-api/src/main/java/org/dspace/content/Site.java
@@ -7,28 +7,23 @@
  */
 package org.dspace.content;
 
-import javax.persistence.Cacheable;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
-
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.SiteService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
 
 /**
  * Represents the root of the DSpace Archive.
  * By default, the handle suffix "0" represents the Site, e.g. "1721.1/0"
  */
 @Entity
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
 @Table(name = "site")
-public class Site extends DSpaceObject {
+public class Site extends CacheableDSpaceObject {
 
     @Transient
     private transient SiteService siteService;
diff --git a/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java b/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java
index a4c880173b..355e182694 100644
--- a/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java
+++ b/dspace-api/src/main/java/org/dspace/content/WorkspaceItem.java
@@ -8,23 +8,23 @@
 package org.dspace.content;
 
 import java.io.Serializable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.eperson.EPerson;
 import org.dspace.workflow.WorkflowItem;
-import org.hibernate.proxy.HibernateProxyHelper;
 
 /**
  * Class representing an item in the process of being submitted by a user
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/Choice.java b/dspace-api/src/main/java/org/dspace/content/authority/Choice.java
index 6d73bdb5ea..9f6bff03bc 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/Choice.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/Choice.java
@@ -77,7 +77,7 @@ public class Choice {
 
     /**
      * Constructor for common need of Hierarchical authorities that want to
-     * explicitely set the selectable flag
+     * explicitly set the selectable flag
      * 
      * @param authority  the authority key
      * @param value      the text value to store in the metadata
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthority.java b/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthority.java
index 750e761f3d..fddd85cea3 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthority.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthority.java
@@ -131,7 +131,7 @@ public interface ChoiceAuthority extends NameAwarePlugin {
      * Build the preferred choice associated with the authKey. The default
      * implementation delegate the creato to the {@link #getLabel(String, String)}
      * {@link #getValue(String, String)} and {@link #getExtra(String, String)}
-     * methods but can be directly overriden for better efficiency or special
+     * methods but can be directly overridden for better efficiency or special
      * scenario
      * 
      * @param authKey authority key known to this authority.
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthorityServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthorityServiceImpl.java
index f4d1f02710..f4201c1e28 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthorityServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/ChoiceAuthorityServiceImpl.java
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * Broker for ChoiceAuthority plugins, and for other information configured
  * about the choice aspect of authority control for a metadata field.
  *
- * Configuration keys, per metadata field (e.g. "dc.contributer.author")
+ * Configuration keys, per metadata field (e.g. "dc.contributor.author")
  *
  * {@code
  * # names the ChoiceAuthority plugin called for this field
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/DCInputAuthority.java b/dspace-api/src/main/java/org/dspace/content/authority/DCInputAuthority.java
index 902bded33e..17548d808b 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/DCInputAuthority.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/DCInputAuthority.java
@@ -30,7 +30,7 @@ import org.dspace.core.SelfNamedPlugin;
  * configurable submission.
  *
  * Configuration:
- * This MUST be configured aas a self-named plugin, e.g.:
+ * This MUST be configured as a self-named plugin, e.g.:
  * {@code
  * plugin.selfnamed.org.dspace.content.authority.ChoiceAuthority = \
  * org.dspace.content.authority.DCInputAuthority
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOJournalTitle.java b/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOJournalTitle.java
index da5c743c5b..418000e51e 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOJournalTitle.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOJournalTitle.java
@@ -59,7 +59,37 @@ public class SHERPARoMEOJournalTitle implements ChoiceAuthority {
 
     @Override
     public Choices getBestMatch(String text, String locale) {
-        return getMatches(text, 0, 1, locale);
+        // punt if there is no query text
+        if (text == null || text.trim().length() == 0) {
+            return new Choices(true);
+        }
+        int limit = 10;
+        SHERPAService sherpaService = new DSpace().getSingletonService(SHERPAService.class);
+        SHERPAResponse sherpaResponse = sherpaService.performRequest("publication", "title",
+            "equals", text, 0, limit);
+        Choices result;
+        if (CollectionUtils.isNotEmpty(sherpaResponse.getJournals())) {
+            List<Choice> list = sherpaResponse
+                .getJournals().stream()
+                .map(sherpaJournal -> new Choice(sherpaJournal.getIssns().get(0),
+                    sherpaJournal.getTitles().get(0), sherpaJournal.getTitles().get(0)))
+                .collect(Collectors.toList());
+            int total = sherpaResponse.getJournals().size();
+
+            int confidence;
+            if (list.isEmpty()) {
+                confidence = Choices.CF_NOTFOUND;
+            } else if (list.size() == 1) {
+                confidence = Choices.CF_UNCERTAIN;
+            } else {
+                confidence = Choices.CF_AMBIGUOUS;
+            }
+            result = new Choices(list.toArray(new Choice[list.size()]), 0, total, confidence,
+                total > limit);
+        } else {
+            result = new Choices(false);
+        }
+        return result;
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOPublisher.java b/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOPublisher.java
index 0f93dff498..d1001ce5db 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOPublisher.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/SHERPARoMEOPublisher.java
@@ -60,7 +60,38 @@ public class SHERPARoMEOPublisher implements ChoiceAuthority {
 
     @Override
     public Choices getBestMatch(String text, String locale) {
-        return getMatches(text, 0, 1, locale);
+        // punt if there is no query text
+        if (text == null || text.trim().length() == 0) {
+            return new Choices(true);
+        }
+        int limit = 10;
+        SHERPAService sherpaService = new DSpace().getSingletonService(SHERPAService.class);
+        SHERPAPublisherResponse sherpaResponse = sherpaService.performPublisherRequest("publisher", "name",
+                "equals", text, 0, limit);
+        Choices result;
+        if (CollectionUtils.isNotEmpty(sherpaResponse.getPublishers())) {
+            List<Choice> list = sherpaResponse
+                    .getPublishers().stream()
+                    .map(sherpaPublisher ->
+                            new Choice(sherpaPublisher.getIdentifier(),
+                                    sherpaPublisher.getName(), sherpaPublisher.getName()))
+                    .collect(Collectors.toList());
+            int total = sherpaResponse.getPublishers().size();
+
+            int confidence;
+            if (list.isEmpty()) {
+                confidence = Choices.CF_NOTFOUND;
+            } else if (list.size() == 1) {
+                confidence = Choices.CF_UNCERTAIN;
+            } else {
+                confidence = Choices.CF_AMBIGUOUS;
+            }
+            result = new Choices(list.toArray(new Choice[list.size()]), 0, total, confidence,
+                    total > limit);
+        } else {
+            result = new Choices(false);
+        }
+        return result;
     }
 
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java b/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java
index 123626cd09..a8631ba1f0 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/SolrAuthority.java
@@ -76,7 +76,7 @@ public class SolrAuthority implements ChoiceAuthority {
                 Integer.parseInt(locale);
                 locale = null;
             } catch (NumberFormatException e) {
-                //Everything is allright
+                //Everything is alright
             }
             if (locale != null && !"".equals(locale)) {
                 localSearchField = searchField + "_" + locale;
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/service/ChoiceAuthorityService.java b/dspace-api/src/main/java/org/dspace/content/authority/service/ChoiceAuthorityService.java
index 94e5ca57a0..f7325744c4 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/service/ChoiceAuthorityService.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/service/ChoiceAuthorityService.java
@@ -22,7 +22,7 @@ import org.dspace.content.authority.DSpaceControlledVocabularyIndex;
  * Broker for ChoiceAuthority plugins, and for other information configured
  * about the choice aspect of authority control for a metadata field.
  *
- * Configuration keys, per metadata field (e.g. "dc.contributer.author")
+ * Configuration keys, per metadata field (e.g. "dc.contributor.author")
  * {@code
  * # names the ChoiceAuthority plugin called for this field
  * choices.plugin.<FIELD> = name-of-plugin
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/service/MetadataAuthorityService.java b/dspace-api/src/main/java/org/dspace/content/authority/service/MetadataAuthorityService.java
index 2ba6791de5..e40bb978d6 100644
--- a/dspace-api/src/main/java/org/dspace/content/authority/service/MetadataAuthorityService.java
+++ b/dspace-api/src/main/java/org/dspace/content/authority/service/MetadataAuthorityService.java
@@ -14,7 +14,7 @@ import org.dspace.content.MetadataField;
 /**
  * Broker for metadata authority settings configured for each metadata field.
  *
- * Configuration keys, per metadata field (e.g. "dc.contributer.author")
+ * Configuration keys, per metadata field (e.g. "dc.contributor.author")
  *
  * # is field authority controlled (i.e. store authority, confidence values)?
  * {@code authority.controlled.<FIELD> = true}
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java
index 4365d9a485..76738118f6 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/DIMDisseminationCrosswalk.java
@@ -36,7 +36,7 @@ import org.jdom2.Namespace;
  */
 public class DIMDisseminationCrosswalk
     implements DisseminationCrosswalk {
-    // Non-existant XSD schema
+    // Non-existent XSD schema
     public static final String DIM_XSD = "null";
 
     // Namespaces
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java
index bb73c83c45..a8d9836972 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/IngestionCrosswalk.java
@@ -37,7 +37,7 @@ public interface IngestionCrosswalk {
      * internal representations.  This version accepts metadata as a
      * <code>List</code> of JDOM XML elements.  It interprets the
      * contents of each element and adds the appropriate values to the
-     * DSpace Object's internal metadata represenation.
+     * DSpace Object's internal metadata representation.
      * <p>
      * Note that this method may be called several times for the same target
      * Item, if the metadata comes as several lists of elements, so it should
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
index 1e63be5ba1..6315f73a7c 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/MODSDisseminationCrosswalk.java
@@ -202,7 +202,7 @@ public class MODSDisseminationCrosswalk extends SelfNamedPlugin
      * e.g.  dc.contributor.author
      *
      * 2. XML fragment is prototype of metadata element, with empty or "%s"
-     * placeholders for value(s).  NOTE: Leave the %s's in becaue
+     * placeholders for value(s).  NOTE: Leave the %s's in because
      * it's much easier then to see if something is broken.
      *
      * 3. XPath expression listing point(s) in the above XML where
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
index f756aae225..aa9096517b 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/OREIngestionCrosswalk.java
@@ -173,7 +173,7 @@ public class OREIngestionCrosswalk
                 try {
                     // Make sure the url string escapes all the oddball characters
                     String processedURL = encodeForURL(href);
-                    // Generate a requeset for the aggregated resource
+                    // Generate a request for the aggregated resource
                     ARurl = new URL(processedURL);
                     in = ARurl.openStream();
                 } catch (FileNotFoundException fe) {
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
index 2fdbaaad00..fa582fd62f 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/QDCCrosswalk.java
@@ -113,7 +113,7 @@ public class QDCCrosswalk extends SelfNamedPlugin
     private static final Namespace DCTERMS_NS =
         Namespace.getNamespace("dcterms", "http://purl.org/dc/terms/");
 
-    // sentinal: done init?
+    // sentinel: done init?
     private boolean inited = false;
 
     // my plugin name
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/SubscriptionDsoMetadataForEmailCompose.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/SubscriptionDsoMetadataForEmailCompose.java
index ad92018b22..29baa980fc 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/SubscriptionDsoMetadataForEmailCompose.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/SubscriptionDsoMetadataForEmailCompose.java
@@ -47,12 +47,12 @@ public class SubscriptionDsoMetadataForEmailCompose implements StreamDisseminati
             Item item = (Item) dso;
             PrintStream printStream = new PrintStream(out);
             for (String actualMetadata : metadata) {
-                String[] splitted = actualMetadata.split("\\.");
+                String[] split = actualMetadata.split("\\.");
                 String qualifier = null;
-                if (splitted.length == 3) {
-                    qualifier = splitted[2];
+                if (split.length == 3) {
+                    qualifier = split[2];
                 }
-                var metadataValue = itemService.getMetadataFirstValue(item, splitted[0], splitted[1], qualifier, ANY);
+                var metadataValue = itemService.getMetadataFirstValue(item, split[0], split[1], qualifier, ANY);
                 printStream.print(metadataValue + " ");
             }
             String itemURL = HandleServiceFactory.getInstance()
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
index d4ccebf82e..1d07da0e51 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTCrosswalk.java
@@ -18,12 +18,12 @@ import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.stream.StreamSource;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.core.SelfNamedPlugin;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.jdom2.Namespace;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Configurable XSLT-driven Crosswalk
@@ -88,7 +88,7 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
     /**
      * log4j category
      */
-    private static final Logger LOG = LoggerFactory.getLogger(XSLTCrosswalk.class);
+    private static final Logger LOG = LogManager.getLogger();
 
     /**
      * DSpace XML Namespace in JDOM form.
@@ -168,8 +168,8 @@ public abstract class XSLTCrosswalk extends SelfNamedPlugin {
             transformFile.lastModified() > transformLastModified) {
             try {
                 LOG.debug(
-                    (transformer == null ? "Loading {} XSLT stylesheet from {}" : "Reloading {} XSLT stylesheet from " +
-                        "{}"),
+                    (transformer == null ? "Loading {} XSLT stylesheet from {}"
+                            : "Reloading {} XSLT stylesheet from {}"),
                     getPluginInstanceName(), transformFile.toString());
 
                 Source transformSource
diff --git a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
index 26371b46aa..70bb3f1316 100644
--- a/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
+++ b/dspace-api/src/main/java/org/dspace/content/crosswalk/XSLTDisseminationCrosswalk.java
@@ -23,6 +23,8 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
@@ -51,8 +53,6 @@ import org.jdom2.output.Format;
 import org.jdom2.output.XMLOutputter;
 import org.jdom2.transform.JDOMResult;
 import org.jdom2.transform.JDOMSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Configurable XSLT-driven dissemination Crosswalk
@@ -88,7 +88,7 @@ public class XSLTDisseminationCrosswalk
     /**
      * log4j category
      */
-    private static final Logger LOG = LoggerFactory.getLogger(XSLTDisseminationCrosswalk.class);
+    private static final Logger LOG = LogManager.getLogger();
 
     /**
      * DSpace context, will be created if XSLTDisseminationCrosswalk had been started by command-line.
@@ -140,12 +140,13 @@ public class XSLTDisseminationCrosswalk
         // right format for value of "schemaLocation" attribute.
         schemaLocation = configurationService.getProperty(prefix + "schemaLocation");
         if (schemaLocation == null) {
-            LOG.warn("No schemaLocation for crosswalk=" + myAlias + ", key=" + prefix + "schemaLocation");
+            LOG.warn("No schemaLocation for crosswalk={}, key={}schemaLocation", myAlias, prefix);
         } else if (schemaLocation.length() > 0 && schemaLocation.indexOf(' ') < 0) {
             // sanity check: schemaLocation should have space.
-            LOG.warn("Possible INVALID schemaLocation (no space found) for crosswalk=" +
-                         myAlias + ", key=" + prefix + "schemaLocation" +
-                         "\n\tCorrect format is \"{namespace} {schema-URL}\"");
+            LOG.warn("Possible INVALID schemaLocation (no space found) for crosswalk={},"
+                         + " key={}schemaLocation"
+                         + "\n\tCorrect format is \"{namespace} {schema-URL}\"",
+                    myAlias, prefix);
         }
 
         // grovel for namespaces of the form:
@@ -172,7 +173,7 @@ public class XSLTDisseminationCrosswalk
         try {
             init();
         } catch (CrosswalkInternalException e) {
-            LOG.error(e.toString());
+            LOG.error(e::toString);
         }
         return (Namespace[]) ArrayUtils.clone(namespaces);
     }
@@ -187,7 +188,7 @@ public class XSLTDisseminationCrosswalk
         try {
             init();
         } catch (CrosswalkInternalException e) {
-            LOG.error(e.toString());
+            LOG.error(e::toString);
         }
         return schemaLocation;
     }
@@ -220,7 +221,7 @@ public class XSLTDisseminationCrosswalk
         }
 
         for (Map.Entry<String, String> parameter : parameters.entrySet()) {
-            LOG.debug("Setting parameter {} to {}", parameter.getKey(), parameter.getValue());
+            LOG.debug("Setting parameter {} to {}", parameter::getKey, parameter::getValue);
             xform.setParameter(parameter.getKey(), parameter.getValue());
         }
 
@@ -232,7 +233,7 @@ public class XSLTDisseminationCrosswalk
             root.detach();
             return root;
         } catch (TransformerException e) {
-            LOG.error("Got error: " + e.toString());
+            LOG.error("Got error: ()", e::toString);
             throw new CrosswalkInternalException("XSL translation failed: " + e.toString(), e);
         }
     }
@@ -278,13 +279,13 @@ public class XSLTDisseminationCrosswalk
                                                    .map(Element.class::cast).collect(Collectors.toList());
             return elementList;
         } catch (TransformerException e) {
-            LOG.error("Got error: " + e.toString());
+            LOG.error("Got error: {}", e::toString);
             throw new CrosswalkInternalException("XSL translation failed: " + e.toString(), e);
         }
     }
 
     /**
-     * Determine is this crosswalk can dessiminate the given object.
+     * Determine is this crosswalk can disseminate the given object.
      *
      * @see DisseminationCrosswalk
      */
@@ -304,7 +305,7 @@ public class XSLTDisseminationCrosswalk
         try {
             init();
         } catch (CrosswalkInternalException e) {
-            LOG.error(e.toString());
+            LOG.error(e::toString);
         }
         return preferList;
     }
@@ -312,7 +313,7 @@ public class XSLTDisseminationCrosswalk
     /**
      * Generate an intermediate representation of a DSpace object.
      *
-     * @param dso  The dspace object to build a representation of.
+     * @param dso  The DSpace object to build a representation of.
      * @param dcvs list of metadata
      * @return element
      */
@@ -480,9 +481,7 @@ public class XSLTDisseminationCrosswalk
         if (reason == null) {
             return value;
         } else {
-            if (LOG.isDebugEnabled()) {
-                LOG.debug("Filtering out non-XML characters in string, reason=" + reason);
-            }
+            LOG.debug("Filtering out non-XML characters in string, reason={}", reason);
             StringBuilder result = new StringBuilder(value.length());
             for (int i = 0; i < value.length(); ++i) {
                 char c = value.charAt(i);
@@ -567,11 +566,11 @@ public class XSLTDisseminationCrosswalk
             System.err.println("===  Stack Trace  ===");
             e.printStackTrace(System.err);
             System.err.println("=====================");
-            LOG.error("Caught: {}.", e.toString());
-            LOG.error(e.getMessage());
+            LOG.error("Caught: {}.", e::toString);
+            LOG.error(e::getMessage);
             CharArrayWriter traceWriter = new CharArrayWriter(2048);
             e.printStackTrace(new PrintWriter(traceWriter));
-            LOG.error(traceWriter.toString());
+            LOG.error(traceWriter::toString);
             System.exit(1);
         }
 
@@ -588,11 +587,11 @@ public class XSLTDisseminationCrosswalk
             System.err.println("===  Stack Trace  ===");
             e.printStackTrace(System.err);
             System.err.println("=====================");
-            LOG.error("Caught: {}.", e.toString());
-            LOG.error(e.getMessage());
+            LOG.error("Caught: {}.", e::toString);
+            LOG.error(e::getMessage);
             CharArrayWriter traceWriter = new CharArrayWriter(2048);
             e.printStackTrace(new PrintWriter(traceWriter));
-            LOG.error(traceWriter.toString());
+            LOG.error(traceWriter::toString);
             System.exit(1);
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java b/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
index d7cc9c6079..7cba88c0ba 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/ItemDAO.java
@@ -17,6 +17,7 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataField;
+import org.dspace.contentreport.QueryPredicate;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 
@@ -28,12 +29,11 @@ import org.dspace.eperson.EPerson;
  * @author kevinvandevelde at atmire.com
  */
 public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
-    public Iterator<Item> findAll(Context context, boolean archived) throws SQLException;
+    Iterator<Item> findAll(Context context, boolean archived) throws SQLException;
 
-    public Iterator<Item> findAll(Context context, boolean archived, int limit, int offset) throws SQLException;
+    Iterator<Item> findAll(Context context, boolean archived, int limit, int offset) throws SQLException;
 
-    @Deprecated
-    public Iterator<Item> findAll(Context context, boolean archived, boolean withdrawn) throws SQLException;
+    @Deprecated Iterator<Item> findAll(Context context, boolean archived, boolean withdrawn) throws SQLException;
 
     /**
      * Find all items that are:
@@ -46,7 +46,7 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
      * @return iterator over all regular items.
      * @throws SQLException if database error.
      */
-    public Iterator<Item> findAllRegularItems(Context context) throws SQLException;
+    Iterator<Item> findAllRegularItems(Context context) throws SQLException;
 
     /**
      * Find all Items modified since a Date.
@@ -56,10 +56,10 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
      * @return iterator over items
      * @throws SQLException if database error
      */
-    public Iterator<Item> findByLastModifiedSince(Context context, Date since)
+    Iterator<Item> findByLastModifiedSince(Context context, Date since)
         throws SQLException;
 
-    public Iterator<Item> findBySubmitter(Context context, EPerson eperson) throws SQLException;
+    Iterator<Item> findBySubmitter(Context context, EPerson eperson) throws SQLException;
 
     /**
      * Find all the items by a given submitter. The order is
@@ -71,23 +71,40 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
      * @return an iterator over the items submitted by eperson
      * @throws SQLException if database error
      */
-    public Iterator<Item> findBySubmitter(Context context, EPerson eperson, boolean retrieveAllItems)
+    Iterator<Item> findBySubmitter(Context context, EPerson eperson, boolean retrieveAllItems)
         throws SQLException;
 
-    public Iterator<Item> findBySubmitter(Context context, EPerson eperson, MetadataField metadataField, int limit)
+    Iterator<Item> findBySubmitter(Context context, EPerson eperson, MetadataField metadataField, int limit)
         throws SQLException;
 
-    public Iterator<Item> findByMetadataField(Context context, MetadataField metadataField, String value,
+    Iterator<Item> findByMetadataField(Context context, MetadataField metadataField, String value,
                                               boolean inArchive) throws SQLException;
 
-    public Iterator<Item> findByMetadataQuery(Context context, List<List<MetadataField>> listFieldList,
-                                              List<String> query_op, List<String> query_val, List<UUID> collectionUuids,
-                                              String regexClause, int offset, int limit) throws SQLException;
+    /**
+     * Returns all the Items that belong to the specified aollections (if any)
+     * and match the provided predicates.
+     * @param context The relevant DSpace context
+     * @param queryPredicates List of predicates that returned items are required to match
+     * @param collectionUuids UUIDs of the collections to search.
+     *        If none are provided, the entire repository will be searched.
+     * @param regexClause Syntactic expression used to query the database using a regular expression
+     *        (e.g.: "value ~ ?")
+     * @param offset The offset for the query
+     * @param limit Maximum number of items to return
+     * @return A list containing the items that match the provided criteria
+     * @throws SQLException if something goes wrong
+     */
+    List<Item> findByMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+                                          List<UUID> collectionUuids, String regexClause,
+                                          long offset, int limit) throws SQLException;
 
-    public Iterator<Item> findByAuthorityValue(Context context, MetadataField metadataField, String authority,
+    long countForMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids, String regexClause) throws SQLException;
+
+    Iterator<Item> findByAuthorityValue(Context context, MetadataField metadataField, String authority,
                                                boolean inArchive) throws SQLException;
 
-    public Iterator<Item> findArchivedByCollection(Context context, Collection collection, Integer limit,
+    Iterator<Item> findArchivedByCollection(Context context, Collection collection, Integer limit,
                                                    Integer offset) throws SQLException;
 
     /**
@@ -100,7 +117,7 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
      * @return              An iterator containing the items for which the constraints hold true
      * @throws SQLException If something goes wrong
      */
-    public Iterator<Item> findArchivedByCollectionExcludingOwning(Context context, Collection collection, Integer limit,
+    Iterator<Item> findArchivedByCollectionExcludingOwning(Context context, Collection collection, Integer limit,
                                                                   Integer offset) throws SQLException;
 
     /**
@@ -111,11 +128,11 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
      * @return              The total amount of items that fit the constraints
      * @throws SQLException If something goes wrong
      */
-    public int countArchivedByCollectionExcludingOwning(Context context, Collection collection) throws SQLException;
+    int countArchivedByCollectionExcludingOwning(Context context, Collection collection) throws SQLException;
 
-    public Iterator<Item> findAllByCollection(Context context, Collection collection) throws SQLException;
+    Iterator<Item> findAllByCollection(Context context, Collection collection) throws SQLException;
 
-    public Iterator<Item> findAllByCollection(Context context, Collection collection, Integer limit, Integer offset)
+    Iterator<Item> findAllByCollection(Context context, Collection collection, Integer limit, Integer offset)
         throws SQLException;
 
     /**
@@ -159,7 +176,7 @@ public interface ItemDAO extends DSpaceObjectLegacySupportDAO<Item> {
      * @return iterator over items
      * @throws SQLException if database error
      */
-    public Iterator<Item> findAll(Context context, boolean archived,
+    Iterator<Item> findAll(Context context, boolean archived,
                                   boolean withdrawn, boolean discoverable, Date lastModified)
         throws SQLException;
 
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
index 276ea2b343..25f102f6de 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamDAOImpl.java
@@ -13,16 +13,21 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bitstream_;
+import org.dspace.content.Bundle;
+import org.dspace.content.Bundle_;
 import org.dspace.content.Collection;
+import org.dspace.content.Collection_;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
+import org.dspace.content.Item_;
 import org.dspace.content.dao.BitstreamDAO;
 import org.dspace.core.AbstractHibernateDSODAO;
 import org.dspace.core.Constants;
@@ -78,14 +83,21 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO<Bitstream> impleme
 
     @Override
     public Iterator<Bitstream> findByCommunity(Context context, Community community) throws SQLException {
-        Query query = createQuery(context, "select b.id from Bitstream b " +
-            "join b.bundles bitBundles " +
-            "join bitBundles.items item " +
-            "join item.collections itemColl " +
-            "join itemColl.communities community " +
-            "WHERE :community IN community");
+        // Select UUID of all bitstreams, joining from Bitstream -> Bundle -> Item -> Collection -> Community
+        // to find all that exist under the given community.
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<UUID> criteriaQuery = criteriaBuilder.createQuery(UUID.class);
+        Root<Bitstream> bitstreamRoot = criteriaQuery.from(Bitstream.class);
+        criteriaQuery.select(bitstreamRoot.get(Bitstream_.id));
+        // Joins from Bitstream -> Bundle -> Item -> Collection
+        Join<Bitstream, Bundle> joinBundle = bitstreamRoot.join(Bitstream_.bundles);
+        Join<Bundle, Item> joinItem = joinBundle.join(Bundle_.items);
+        Join<Item, Collection> joinCollection = joinItem.join(Item_.collections);
+        // Where "community" is a member of the list of Communities linked by the collection(s)
+        criteriaQuery.where(criteriaBuilder.isMember(community, joinCollection.get(Collection_.COMMUNITIES)));
 
-        query.setParameter("community", community);
+        // Transform into a query object to execute
+        Query query = createQuery(context, criteriaQuery);
         @SuppressWarnings("unchecked")
         List<UUID> uuids = query.getResultList();
         return new UUIDIterator<Bitstream>(context, uuids, Bitstream.class, this);
@@ -93,13 +105,20 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO<Bitstream> impleme
 
     @Override
     public Iterator<Bitstream> findByCollection(Context context, Collection collection) throws SQLException {
-        Query query = createQuery(context, "select b.id from Bitstream b " +
-            "join b.bundles bitBundles " +
-            "join bitBundles.items item " +
-            "join item.collections c " +
-            "WHERE :collection IN c");
+        // Select UUID of all bitstreams, joining from Bitstream -> Bundle -> Item -> Collection
+        // to find all that exist under the given collection.
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<UUID> criteriaQuery = criteriaBuilder.createQuery(UUID.class);
+        Root<Bitstream> bitstreamRoot = criteriaQuery.from(Bitstream.class);
+        criteriaQuery.select(bitstreamRoot.get(Bitstream_.id));
+        // Joins from Bitstream -> Bundle -> Item
+        Join<Bitstream, Bundle> joinBundle = bitstreamRoot.join(Bitstream_.bundles);
+        Join<Bundle, Item> joinItem = joinBundle.join(Bundle_.items);
+        // Where "collection" is a member of the list of Collections linked by the item(s)
+        criteriaQuery.where(criteriaBuilder.isMember(collection, joinItem.get(Item_.collections)));
 
-        query.setParameter("collection", collection);
+        // Transform into a query object to execute
+        Query query = createQuery(context, criteriaQuery);
         @SuppressWarnings("unchecked")
         List<UUID> uuids = query.getResultList();
         return new UUIDIterator<Bitstream>(context, uuids, Bitstream.class, this);
@@ -107,12 +126,19 @@ public class BitstreamDAOImpl extends AbstractHibernateDSODAO<Bitstream> impleme
 
     @Override
     public Iterator<Bitstream> findByItem(Context context, Item item) throws SQLException {
-        Query query = createQuery(context, "select b.id from Bitstream b " +
-            "join b.bundles bitBundles " +
-            "join bitBundles.items item " +
-            "WHERE :item IN item");
+        // Select UUID of all bitstreams, joining from Bitstream -> Bundle -> Item
+        // to find all that exist under the given item.
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<UUID> criteriaQuery = criteriaBuilder.createQuery(UUID.class);
+        Root<Bitstream> bitstreamRoot = criteriaQuery.from(Bitstream.class);
+        criteriaQuery.select(bitstreamRoot.get(Bitstream_.id));
+        // Join from Bitstream -> Bundle
+        Join<Bitstream, Bundle> joinBundle = bitstreamRoot.join(Bitstream_.bundles);
+        // Where "item" is a member of the list of Items linked by the bundle(s)
+        criteriaQuery.where(criteriaBuilder.isMember(item, joinBundle.get(Bundle_.items)));
 
-        query.setParameter("item", item);
+        // Transform into a query object to execute
+        Query query = createQuery(context, criteriaQuery);
         @SuppressWarnings("unchecked")
         List<UUID> uuids = query.getResultList();
         return new UUIDIterator<Bitstream>(context, uuids, Bitstream.class, this);
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java
index 4d9283bbec..eaf58fbb88 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/BitstreamFormatDAOImpl.java
@@ -10,11 +10,11 @@ package org.dspace.content.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.BitstreamFormat;
 import org.dspace.content.BitstreamFormat_;
 import org.dspace.content.dao.BitstreamFormatDAO;
@@ -119,7 +119,7 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO<BitstreamFormat
         );
 
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.desc(bitstreamFormatRoot.get(BitstreamFormat_.supportLevel)));
         orderList.add(criteriaBuilder.asc(bitstreamFormatRoot.get(BitstreamFormat_.shortDescription)));
         criteriaQuery.orderBy(orderList);
@@ -142,13 +142,10 @@ public class BitstreamFormatDAOImpl extends AbstractHibernateDAO<BitstreamFormat
     public List<BitstreamFormat> findAll(Context context, Class clazz) throws SQLException {
 
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, BitstreamFormat.class);
+        CriteriaQuery<BitstreamFormat> criteriaQuery = getCriteriaQuery(criteriaBuilder, BitstreamFormat.class);
         Root<BitstreamFormat> bitstreamFormatRoot = criteriaQuery.from(BitstreamFormat.class);
         criteriaQuery.select(bitstreamFormatRoot);
-
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
-        orderList.add(criteriaBuilder.asc(bitstreamFormatRoot.get(BitstreamFormat_.id)));
-        criteriaQuery.orderBy(orderList);
+        criteriaQuery.orderBy(criteriaBuilder.asc(bitstreamFormatRoot.get(BitstreamFormat_.id)));
 
         return list(context, criteriaQuery, false, BitstreamFormat.class, -1, -1);
     }
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
index befa1397a8..841da319f0 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/CollectionDAOImpl.java
@@ -12,13 +12,13 @@ import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.ResourcePolicy_;
 import org.dspace.content.Collection;
@@ -71,12 +71,12 @@ public class CollectionDAOImpl extends AbstractHibernateDSODAO<Collection> imple
         query.append("SELECT c" +
                                 " FROM Collection c" +
                                 " left join c.metadata title on title.metadataField = :sortField and" +
-                                " title.dSpaceObject = c.id and" +
+                                " title.dSpaceObject = c and" +
                                 " title.place = (select min(internal.place) " +
                                 "from c.metadata internal " +
                                 "where internal.metadataField = :sortField and" +
-                                " internal.dSpaceObject = c.id)" +
-                                " ORDER BY LOWER(title.value)");
+                                " internal.dSpaceObject = c)" +
+                                " ORDER BY LOWER(CAST(title.value as string))");
         Query hibernateQuery = createQuery(context, query.toString());
         if (offset != null) {
             hibernateQuery.setFirstResult(offset);
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
index 7a37504851..5712b89859 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/CommunityDAOImpl.java
@@ -10,13 +10,13 @@ package org.dspace.content.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.ResourcePolicy_;
 import org.dspace.content.Community;
@@ -68,12 +68,12 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO<Community> impleme
         queryBuilder.append("SELECT c" +
                                 " FROM Community c" +
                                 " left join c.metadata title on title.metadataField = :sortField and" +
-                                " title.dSpaceObject = c.id and" +
+                                " title.dSpaceObject = c and" +
                                 " title.place = (select min(internal.place) " +
                                                 "from c.metadata internal " +
                                                 "where internal.metadataField = :sortField and" +
-                                                    " internal.dSpaceObject = c.id)" +
-                                " ORDER BY LOWER(title.value)");
+                                                    " internal.dSpaceObject = c)" +
+                                " ORDER BY LOWER(CAST(title.value as string))");
         Query query = createQuery(context, queryBuilder.toString());
         if (offset != null) {
             query.setFirstResult(offset);
@@ -108,13 +108,13 @@ public class CommunityDAOImpl extends AbstractHibernateDSODAO<Community> impleme
         queryBuilder.append("SELECT c" +
                                 " FROM Community c" +
                                 " left join c.metadata title on title.metadataField = :sortField and" +
-                                " title.dSpaceObject = c.id and" +
+                                " title.dSpaceObject = c and" +
                                 " title.place = (select min(internal.place) " +
                                                 "from c.metadata internal " +
                                                 "where internal.metadataField = :sortField and" +
-                                                        " internal.dSpaceObject = c.id)" +
+                                                        " internal.dSpaceObject = c)" +
                                 " WHERE c.parentCommunities IS EMPTY " +
-                                " ORDER BY LOWER(title.value)");
+                                " ORDER BY LOWER(CAST(title.value as string))");
         Query query = createQuery(context, queryBuilder.toString());
         query.setParameter("sortField", sortField);
         query.setHint("org.hibernate.cacheable", Boolean.TRUE);
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/EntityTypeDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/EntityTypeDAOImpl.java
index 489f4cd066..32af7ed35c 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/EntityTypeDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/EntityTypeDAOImpl.java
@@ -10,11 +10,11 @@ package org.dspace.content.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Order;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Order;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.EntityType;
 import org.dspace.content.EntityType_;
 import org.dspace.content.dao.EntityTypeDAO;
@@ -59,9 +59,9 @@ public class EntityTypeDAOImpl extends AbstractHibernateDAO<EntityType> implemen
     @Override
     public int countEntityTypesByNames(Context context, List<String> names) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, EntityType.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<EntityType> entityTypeRoot = criteriaQuery.from(EntityType.class);
-        criteriaQuery.select(entityTypeRoot);
+        criteriaQuery.select(criteriaBuilder.count(entityTypeRoot));
         criteriaQuery.where(entityTypeRoot.get(EntityType_.LABEL).in(names));
         return count(context, criteriaQuery, criteriaBuilder, entityTypeRoot);
     }
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
index a92e089302..bd04264838 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
@@ -8,37 +8,37 @@
 package org.dspace.content.dao.impl;
 
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Query;
-import javax.persistence.TemporalType;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaBuilder.In;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
+import jakarta.persistence.criteria.Subquery;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.Collection;
+import org.dspace.content.DSpaceObject_;
 import org.dspace.content.Item;
 import org.dspace.content.Item_;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataValue;
+import org.dspace.content.MetadataValue_;
 import org.dspace.content.dao.ItemDAO;
+import org.dspace.contentreport.QueryOperator;
+import org.dspace.contentreport.QueryPredicate;
 import org.dspace.core.AbstractHibernateDSODAO;
 import org.dspace.core.Context;
 import org.dspace.core.UUIDIterator;
 import org.dspace.eperson.EPerson;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.DetachedCriteria;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Projections;
-import org.hibernate.criterion.Property;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.criterion.Subqueries;
-import org.hibernate.type.StandardBasicTypes;
+import org.dspace.util.JpaCriteriaBuilderKit;
 
 /**
  * Hibernate implementation of the Database Access Object interface class for the Item object.
@@ -51,7 +51,6 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemDAOImpl.class);
 
     protected ItemDAOImpl() {
-        super();
     }
 
     @Override
@@ -112,7 +111,7 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
         queryStr.append(" AND discoverable = :discoverable");
 
         if (lastModified != null) {
-            queryStr.append(" AND last_modified > :last_modified");
+            queryStr.append(" AND lastModified > :last_modified");
         }
         queryStr.append(" ORDER BY i.id");
 
@@ -193,118 +192,102 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
         return new UUIDIterator<Item>(context, uuids, Item.class, this);
     }
 
-    enum OP {
-        equals {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return Property.forName("mv.value").eq(val);
-            }
-        },
-        not_equals {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return OP.equals.buildPredicate(val, regexClause);
-            }
-        },
-        like {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return Property.forName("mv.value").like(val);
-            }
-        },
-        not_like {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return OP.like.buildPredicate(val, regexClause);
-            }
-        },
-        contains {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return Property.forName("mv.value").like("%" + val + "%");
-            }
-        },
-        doesnt_contain {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return OP.contains.buildPredicate(val, regexClause);
-            }
-        },
-        exists {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return Property.forName("mv.value").isNotNull();
-            }
-        },
-        doesnt_exist {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return OP.exists.buildPredicate(val, regexClause);
-            }
-        },
-        matches {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return Restrictions.sqlRestriction(regexClause, val, StandardBasicTypes.STRING);
-            }
-        },
-        doesnt_match {
-            public Criterion buildPredicate(String val, String regexClause) {
-                return OP.matches.buildPredicate(val, regexClause);
-            }
-
-        };
-        public abstract Criterion buildPredicate(String val, String regexClause);
+    @Override
+    public List<Item> findByMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids, String regexClause, long offset, int limit) throws SQLException {
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<Item> criteriaQuery = getCriteriaQuery(criteriaBuilder, Item.class);
+        Root<Item> itemRoot = criteriaQuery.from(Item.class);
+        criteriaQuery.select(itemRoot);
+        List<Predicate> predicates = toPredicates(criteriaBuilder, criteriaQuery, itemRoot,
+                queryPredicates, collectionUuids, regexClause);
+        criteriaQuery.where(criteriaBuilder.and(predicates.stream().toArray(Predicate[]::new)));
+        criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id)));
+        try {
+            return list(context, criteriaQuery, false, Item.class, limit, (int) offset);
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw e;
+        }
     }
 
     @Override
-    @Deprecated
-    public Iterator<Item> findByMetadataQuery(Context context, List<List<MetadataField>> listFieldList,
-                                              List<String> query_op, List<String> query_val, List<UUID> collectionUuids,
-                                              String regexClause, int offset, int limit) throws SQLException {
+    public long countForMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids, String regexClause) throws SQLException {
+        // Build the query infrastructure
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        // Select
+        Root<Item> itemRoot = criteriaQuery.from(Item.class);
+        // Apply the selected predicates
+        List<Predicate> predicates = toPredicates(criteriaBuilder, criteriaQuery, itemRoot,
+                queryPredicates, collectionUuids, regexClause);
+        criteriaQuery.where(criteriaBuilder.and(predicates.stream().toArray(Predicate[]::new)));
+        // Execute the query
+        return countLong(context, criteriaQuery, criteriaBuilder, itemRoot);
+    }
 
-        Criteria criteria = getHibernateSession(context).createCriteria(Item.class, "item");
-        criteria.setFirstResult(offset);
-        criteria.setMaxResults(limit);
+    private <T> List<Predicate> toPredicates(CriteriaBuilder criteriaBuilder, CriteriaQuery<T> query,
+            Root<Item> root, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids, String regexClause) {
+        List<Predicate> predicates = new ArrayList<>();
 
         if (!collectionUuids.isEmpty()) {
-            DetachedCriteria dcollCriteria = DetachedCriteria.forClass(Collection.class, "coll");
-            dcollCriteria.setProjection(Projections.property("coll.id"));
-            dcollCriteria.add(Restrictions.eqProperty("coll.id", "item.owningCollection"));
-            dcollCriteria.add(Restrictions.in("coll.id", collectionUuids));
-            criteria.add(Subqueries.exists(dcollCriteria));
+            Subquery<Collection> scollQuery = query.subquery(Collection.class);
+            Root<Collection> collRoot = scollQuery.from(Collection.class);
+            In<UUID> inColls = criteriaBuilder.in(collRoot.get(DSpaceObject_.ID));
+            collectionUuids.forEach(inColls::value);
+            scollQuery.select(collRoot.get(DSpaceObject_.ID))
+                    .where(criteriaBuilder.and(
+                            criteriaBuilder.equal(collRoot.get(DSpaceObject_.ID),
+                                    root.get(Item_.OWNING_COLLECTION).get(DSpaceObject_.ID)),
+                            collRoot.get(DSpaceObject_.ID).in(collectionUuids)
+                    ));
+            predicates.add(criteriaBuilder.exists(scollQuery));
         }
 
-        int index = Math.min(listFieldList.size(), Math.min(query_op.size(), query_val.size()));
-        StringBuilder sb = new StringBuilder();
-
-        for (int i = 0; i < index; i++) {
-            OP op = OP.valueOf(query_op.get(i));
+        for (int i = 0; i < queryPredicates.size(); i++) {
+            QueryPredicate predicate = queryPredicates.get(i);
+            QueryOperator op = predicate.getOperator();
             if (op == null) {
-                log.warn("Skipping Invalid Operator: " + query_op.get(i));
+                log.warn("Skipping Invalid Operator: null");
                 continue;
             }
 
-            if (op == OP.matches || op == OP.doesnt_match) {
+            if (op.getUsesRegex()) {
                 if (regexClause.isEmpty()) {
-                    log.warn("Skipping Unsupported Regex Operator: " + query_op.get(i));
+                    log.warn("Skipping Unsupported Regex Operator: " + op);
                     continue;
                 }
             }
 
-            DetachedCriteria subcriteria = DetachedCriteria.forClass(MetadataValue.class, "mv");
-            subcriteria.add(Property.forName("mv.dSpaceObject").eqProperty("item.id"));
-            subcriteria.setProjection(Projections.property("mv.dSpaceObject"));
+            List<Predicate> mvPredicates = new ArrayList<>();
+            Subquery<MetadataValue> mvQuery = query.subquery(MetadataValue.class);
+            Root<MetadataValue> mvRoot = mvQuery.from(MetadataValue.class);
+            mvPredicates.add(criteriaBuilder.equal(
+                    mvRoot.get(MetadataValue_.D_SPACE_OBJECT), root));
 
-            if (!listFieldList.get(i).isEmpty()) {
-                subcriteria.add(Restrictions.in("metadataField", listFieldList.get(i)));
+            if (!predicate.getFields().isEmpty()) {
+                In<MetadataField> inFields = criteriaBuilder.in(mvRoot.get(MetadataValue_.METADATA_FIELD));
+                predicate.getFields().forEach(inFields::value);
+                mvPredicates.add(inFields);
             }
 
-            subcriteria.add(op.buildPredicate(query_val.get(i), regexClause));
+            JpaCriteriaBuilderKit<MetadataValue> jpaKit = new JpaCriteriaBuilderKit<>(criteriaBuilder, mvQuery, mvRoot);
+            mvPredicates.add(op.buildJpaPredicate(predicate.getValue(), regexClause, jpaKit));
 
-            if (op == OP.exists || op == OP.equals || op == OP.like || op == OP.contains || op == OP.matches) {
-                criteria.add(Subqueries.exists(subcriteria));
+            mvQuery.select(mvRoot.get(MetadataValue_.D_SPACE_OBJECT))
+                    .where(mvPredicates.stream().toArray(Predicate[]::new));
+
+            if (op.getNegate()) {
+                predicates.add(criteriaBuilder.not(criteriaBuilder.exists(mvQuery)));
             } else {
-                criteria.add(Subqueries.notExists(subcriteria));
+                predicates.add(criteriaBuilder.exists(mvQuery));
             }
         }
-        criteria.addOrder(Order.asc("item.id"));
-
-        log.debug(String.format("Running custom query with %d filters", index));
-
-        return ((List<Item>) criteria.list()).iterator();
 
+        log.debug(String.format("Running custom query with %d filters", queryPredicates.size()));
+        return predicates;
     }
 
     @Override
@@ -325,11 +308,18 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
     @Override
     public Iterator<Item> findArchivedByCollection(Context context, Collection collection, Integer limit,
                                                    Integer offset) throws SQLException {
-        Query query = createQuery(context,
-              "select i.id from Item i join i.collections c " +
-              "WHERE :collection IN c AND i.inArchive=:in_archive ORDER BY i.id");
-        query.setParameter("collection", collection);
-        query.setParameter("in_archive", true);
+        // Select UUID of all items which have this "collection" in their list of collections and are in_archive
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<UUID> criteriaQuery = criteriaBuilder.createQuery(UUID.class);
+        Root<Item> itemRoot = criteriaQuery.from(Item.class);
+        criteriaQuery.select(itemRoot.get(Item_.id));
+        criteriaQuery.where(criteriaBuilder.and(
+            criteriaBuilder.isTrue((itemRoot.get(Item_.inArchive))),
+            criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections))));
+        criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get((Item_.id))));
+
+        // Transform into a query object to execute
+        Query query = createQuery(context, criteriaQuery);
         if (offset != null) {
             query.setFirstResult(offset);
         }
@@ -345,24 +335,23 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
     public Iterator<Item> findArchivedByCollectionExcludingOwning(Context context, Collection collection, Integer limit,
                                                                   Integer offset) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Item.class);
+        CriteriaQuery<Item> criteriaQuery = getCriteriaQuery(criteriaBuilder, Item.class);
         Root<Item> itemRoot = criteriaQuery.from(Item.class);
         criteriaQuery.select(itemRoot);
         criteriaQuery.where(criteriaBuilder.and(
                 criteriaBuilder.notEqual(itemRoot.get(Item_.owningCollection), collection),
                 criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)),
                 criteriaBuilder.isTrue(itemRoot.get(Item_.inArchive))));
-        criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(Item_.id)));
-        criteriaQuery.groupBy(itemRoot.get(Item_.id));
+        criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id)));
         return list(context, criteriaQuery, false, Item.class, limit, offset).iterator();
     }
 
     @Override
     public int countArchivedByCollectionExcludingOwning(Context context, Collection collection) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Item.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Item> itemRoot = criteriaQuery.from(Item.class);
-        criteriaQuery.select(itemRoot);
+        criteriaQuery.select(criteriaBuilder.count(itemRoot));
         criteriaQuery.where(criteriaBuilder.and(
                 criteriaBuilder.notEqual(itemRoot.get(Item_.owningCollection), collection),
                 criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)),
@@ -372,9 +361,16 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
 
     @Override
     public Iterator<Item> findAllByCollection(Context context, Collection collection) throws SQLException {
-        Query query = createQuery(context,
-                "select i.id from Item i join i.collections c WHERE :collection IN c ORDER BY i.id");
-        query.setParameter("collection", collection);
+        // Select UUID of all items which have this "collection" in their list of collections
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<UUID> criteriaQuery = criteriaBuilder.createQuery(UUID.class);
+        Root<Item> itemRoot = criteriaQuery.from(Item.class);
+        criteriaQuery.select(itemRoot.get(Item_.id));
+        criteriaQuery.where(criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)));
+        criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get((Item_.id))));
+
+        // Transform into a query object to execute
+        Query query = createQuery(context, criteriaQuery);
         @SuppressWarnings("unchecked")
         List<UUID> uuids = query.getResultList();
         return new UUIDIterator<Item>(context, uuids, Item.class, this);
@@ -383,10 +379,16 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
     @Override
     public Iterator<Item> findAllByCollection(Context context, Collection collection, Integer limit, Integer offset)
         throws SQLException {
-        Query query = createQuery(context,
-                "select i.id from Item i join i.collections c WHERE :collection IN c ORDER BY i.id");
-        query.setParameter("collection", collection);
+        // Build Query to select UUID of all items which have this "collection" in their list of collections.
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<UUID> criteriaQuery = criteriaBuilder.createQuery(UUID.class);
+        Root<Item> itemRoot = criteriaQuery.from(Item.class);
+        criteriaQuery.select(itemRoot.get(Item_.id));
+        criteriaQuery.where(criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)));
+        criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get((Item_.id))));
 
+        // Transform into a query object to execute
+        Query query = createQuery(context, criteriaQuery);
         if (offset != null) {
             query.setFirstResult(offset);
         }
@@ -402,16 +404,19 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
     public int countItems(Context context, Collection collection, boolean includeArchived, boolean includeWithdrawn,
                           boolean discoverable)
         throws SQLException {
-        Query query = createQuery(context,
-              "select count(i) from Item i join i.collections c " +
-              "WHERE :collection IN c AND i.inArchive=:in_archive AND i.withdrawn=:withdrawn " +
-                  "AND discoverable=:discoverable");
-        query.setParameter("collection", collection);
-        query.setParameter("in_archive", includeArchived);
-        query.setParameter("withdrawn", includeWithdrawn);
-        query.setParameter("discoverable", discoverable);
-
-        return count(query);
+        // Build query to select all Items have this "collection" in their list of collections
+        // AND also have the inArchive or isWithdrawn set as specified
+        CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
+        Root<Item> itemRoot = criteriaQuery.from(Item.class);
+        criteriaQuery.select(criteriaBuilder.count(itemRoot));
+        criteriaQuery.where(criteriaBuilder.and(
+            criteriaBuilder.equal(itemRoot.get(Item_.inArchive), includeArchived),
+            criteriaBuilder.equal(itemRoot.get(Item_.withdrawn), includeWithdrawn),
+            criteriaBuilder.equal(itemRoot.get(Item_.discoverable), discoverable),
+            criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections))));
+        // Execute and return count
+        return count(context, criteriaQuery, criteriaBuilder, itemRoot);
     }
 
     @Override
@@ -436,7 +441,7 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
     public Iterator<Item> findByLastModifiedSince(Context context, Date since)
         throws SQLException {
         Query query = createQuery(context,
-                "SELECT i.id FROM Item i WHERE last_modified > :last_modified ORDER BY id");
+                "SELECT i.id FROM Item i WHERE lastModified > :last_modified ORDER BY id");
         query.setParameter("last_modified", since, TemporalType.TIMESTAMP);
         @SuppressWarnings("unchecked")
         List<UUID> uuids = query.getResultList();
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
index e64aaa4dd2..ddbde361d5 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataFieldDAOImpl.java
@@ -12,12 +12,12 @@ import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.MetadataField;
@@ -158,7 +158,7 @@ public class MetadataFieldDAOImpl extends AbstractHibernateDAO<MetadataField> im
         Join<MetadataField, MetadataSchema> join = metadataFieldRoot.join("metadataSchema");
         criteriaQuery.select(metadataFieldRoot);
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(join.get(MetadataSchema_.name)));
         orderList.add(criteriaBuilder.asc(metadataFieldRoot.get(MetadataField_.element)));
         orderList.add(criteriaBuilder.asc(metadataFieldRoot.get(MetadataField_.qualifier)));
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java
index 71eb487b83..4630bed90b 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataSchemaDAOImpl.java
@@ -10,11 +10,11 @@ package org.dspace.content.dao.impl;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.MetadataSchema;
 import org.dspace.content.MetadataSchema_;
 import org.dspace.content.dao.MetadataSchemaDAO;
@@ -63,7 +63,7 @@ public class MetadataSchemaDAOImpl extends AbstractHibernateDAO<MetadataSchema>
         Root<MetadataSchema> metadataSchemaRoot = criteriaQuery.from(MetadataSchema.class);
         criteriaQuery.select(metadataSchemaRoot);
 
-        List<javax.persistence.criteria.Order> orderList = new ArrayList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new ArrayList<>();
         orderList.add(criteriaBuilder.asc(metadataSchemaRoot.get(MetadataSchema_.id)));
         criteriaQuery.orderBy(orderList);
 
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java
index f37ced9ab7..dc624c98c6 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/MetadataValueDAOImpl.java
@@ -10,12 +10,12 @@ package org.dspace.content.dao.impl;
 import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataField_;
 import org.dspace.content.MetadataValue;
@@ -53,7 +53,7 @@ public class MetadataValueDAOImpl extends AbstractHibernateDAO<MetadataValue> im
                                                                  MetadataField metadataField, String value)
             throws SQLException {
         String queryString = "SELECT m from MetadataValue m " +
-                "join Item i on m.dSpaceObject = i.id where m.metadataField.id = :metadata_field_id " +
+                "join Item i on m.dSpaceObject = i where m.metadataField.id = :metadata_field_id " +
                 "and m.value = :text_value";
         Query query = createQuery(context, queryString);
         query.setParameter("metadata_field_id", metadataField.getID());
@@ -84,7 +84,7 @@ public class MetadataValueDAOImpl extends AbstractHibernateDAO<MetadataValue> im
     public MetadataValue getMinimum(Context context, int metadataFieldId)
         throws SQLException {
         String queryString = "SELECT m FROM MetadataValue m JOIN FETCH m.metadataField WHERE m.metadataField.id = " +
-            ":metadata_field_id ORDER BY text_value";
+            ":metadata_field_id ORDER BY value";
         Query query = createQuery(context, queryString);
         query.setParameter("metadata_field_id", metadataFieldId);
         query.setMaxResults(1);
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java
index d719b5006c..829dd32800 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/ProcessDAOImpl.java
@@ -14,11 +14,11 @@ import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.ProcessStatus;
 import org.dspace.content.dao.ProcessDAO;
@@ -75,9 +75,9 @@ public class ProcessDAOImpl extends AbstractHibernateDAO<Process> implements Pro
     public int countRows(Context context) throws SQLException {
 
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Process.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Process> processRoot = criteriaQuery.from(Process.class);
-        criteriaQuery.select(processRoot);
+        criteriaQuery.select(criteriaBuilder.count(processRoot));
 
         return count(context, criteriaQuery, criteriaBuilder, processRoot);
 
@@ -143,9 +143,9 @@ public class ProcessDAOImpl extends AbstractHibernateDAO<Process> implements Pro
         throws SQLException {
 
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Process.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Process> processRoot = criteriaQuery.from(Process.class);
-        criteriaQuery.select(processRoot);
+        criteriaQuery.select(criteriaBuilder.count(processRoot));
 
         addProcessQueryParameters(processQueryParameterContainer, criteriaBuilder, criteriaQuery, processRoot);
         return count(context, criteriaQuery, criteriaBuilder, processRoot);
@@ -178,7 +178,7 @@ public class ProcessDAOImpl extends AbstractHibernateDAO<Process> implements Pro
         criteriaQuery.select(processRoot);
         criteriaQuery.where(criteriaBuilder.equal(processRoot.get(Process_.E_PERSON), user));
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.desc(processRoot.get(Process_.PROCESS_ID)));
         criteriaQuery.orderBy(orderList);
 
@@ -188,10 +188,10 @@ public class ProcessDAOImpl extends AbstractHibernateDAO<Process> implements Pro
     @Override
     public int countByUser(Context context, EPerson user) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery<Process> criteriaQuery = getCriteriaQuery(criteriaBuilder, Process.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
 
         Root<Process> processRoot = criteriaQuery.from(Process.class);
-        criteriaQuery.select(processRoot);
+        criteriaQuery.select(criteriaBuilder.count(processRoot));
         criteriaQuery.where(criteriaBuilder.equal(processRoot.get(Process_.E_PERSON), user));
         return count(context, criteriaQuery, criteriaBuilder, processRoot);
     }
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java
index e2f84bc1cb..43bbc15c31 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java
@@ -12,13 +12,13 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.persistence.Query;
-import javax.persistence.Tuple;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Item;
 import org.dspace.content.Item_;
 import org.dspace.content.Relationship;
@@ -167,9 +167,9 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
         Context context, Item item, boolean excludeTilted, boolean excludeNonLatest
     ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
-        criteriaQuery.select(relationshipRoot);
+        criteriaQuery.select(criteriaBuilder.count(relationshipRoot));
 
         criteriaQuery.where(
             criteriaBuilder.or(
@@ -355,9 +355,9 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
     public int countByRelationshipType(Context context, RelationshipType relationshipType) throws SQLException {
 
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
-        criteriaQuery.select(relationshipRoot);
+        criteriaQuery.select(criteriaBuilder.count(relationshipRoot));
         criteriaQuery
                 .where(criteriaBuilder.equal(relationshipRoot.get(Relationship_.relationshipType), relationshipType));
         return count(context, criteriaQuery, criteriaBuilder, relationshipRoot);
@@ -366,9 +366,9 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
     @Override
     public int countRows(Context context) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
-        criteriaQuery.select(relationshipRoot);
+        criteriaQuery.select(criteriaBuilder.count(relationshipRoot));
         return count(context, criteriaQuery, criteriaBuilder, relationshipRoot);
     }
 
@@ -377,9 +377,9 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
         Context context, Item item, RelationshipType relationshipType, boolean isLeft, boolean excludeNonLatest
     ) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
-        criteriaQuery.select(relationshipRoot);
+        criteriaQuery.select(criteriaBuilder.count(relationshipRoot));
 
         if (isLeft) {
             criteriaQuery.where(
@@ -407,8 +407,9 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
             ids.add(relationshipType.getID());
         }
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Relationship.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<Relationship> relationshipRoot = criteriaQuery.from(Relationship.class);
+        criteriaQuery.select(criteriaBuilder.count(relationshipRoot));
         criteriaQuery.where(relationshipRoot.get(Relationship_.relationshipType).in(ids));
         return count(context, criteriaQuery, criteriaBuilder, relationshipRoot);
     }
@@ -417,14 +418,14 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
     public List<Relationship> findByItemAndRelationshipTypeAndList(Context context, UUID focusUUID,
             RelationshipType relationshipType, List<UUID> items, boolean isLeft,
             int offset, int limit) throws SQLException {
-        String side = isLeft ? "left_id" : "right_id";
-        String otherSide = !isLeft ? "left_id" : "right_id";
+        String side = isLeft ? "leftItem.id" : "rightItem.id";
+        String otherSide = !isLeft ? "leftItem.id" : "rightItem.id";
         Query query = createQuery(context, "FROM " + Relationship.class.getSimpleName() +
-                                          " WHERE type_id = (:typeId) " +
+                                          " WHERE relationshipType = :type " +
                                            "AND " + side + " = (:focusUUID) " +
                                            "AND " + otherSide + " in (:list) " +
                                            "ORDER BY id");
-        query.setParameter("typeId", relationshipType.getID());
+        query.setParameter("type", relationshipType);
         query.setParameter("focusUUID", focusUUID);
         query.setParameter("list", items);
         return list(query, limit, offset);
@@ -433,14 +434,14 @@ public class RelationshipDAOImpl extends AbstractHibernateDAO<Relationship> impl
     @Override
     public int countByItemAndRelationshipTypeAndList(Context context, UUID focusUUID, RelationshipType relationshipType,
             List<UUID> items, boolean isLeft) throws SQLException {
-        String side = isLeft ? "left_id" : "right_id";
-        String otherSide = !isLeft ? "left_id" : "right_id";
+        String side = isLeft ? "leftItem.id" : "rightItem.id";
+        String otherSide = !isLeft ? "leftItem.id" : "rightItem.id";
         Query query = createQuery(context, "SELECT count(*) " +
                                            "FROM " + Relationship.class.getSimpleName() +
-                                          " WHERE type_id = (:typeId) " +
+                                          " WHERE relationshipType = :type " +
                                            "AND " + side + " = (:focusUUID) " +
                                            "AND " + otherSide + " in (:list)");
-        query.setParameter("typeId", relationshipType.getID());
+        query.setParameter("type", relationshipType);
         query.setParameter("focusUUID", focusUUID);
         query.setParameter("list", items);
         return count(query);
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java
index 7fff2a1f57..7b0e33fd41 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java
@@ -10,10 +10,10 @@ package org.dspace.content.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.EntityType;
 import org.dspace.content.RelationshipType;
 import org.dspace.content.RelationshipType_;
@@ -93,7 +93,7 @@ public class RelationshipTypeDAOImpl extends AbstractHibernateDAO<RelationshipTy
                                    .equal(relationshipTypeRoot.get(RelationshipType_.rightType), entityType)
             )
         );
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(relationshipTypeRoot.get(RelationshipType_.ID)));
         criteriaQuery.orderBy(orderList);
         return list(context, criteriaQuery, false, RelationshipType.class, limit, offset);
@@ -128,9 +128,9 @@ public class RelationshipTypeDAOImpl extends AbstractHibernateDAO<RelationshipTy
     @Override
     public int countByEntityType(Context context, EntityType entityType) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, RelationshipType.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<RelationshipType> relationshipTypeRoot = criteriaQuery.from(RelationshipType.class);
-        criteriaQuery.select(relationshipTypeRoot);
+        criteriaQuery.select(criteriaBuilder.count(relationshipTypeRoot));
         criteriaQuery.where(criteriaBuilder.or(
                             criteriaBuilder.equal(relationshipTypeRoot.get(RelationshipType_.leftType), entityType),
                             criteriaBuilder.equal(relationshipTypeRoot.get(RelationshipType_.rightType), entityType)
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java
index 8889909b1a..ebaa78ae37 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/SiteDAOImpl.java
@@ -8,10 +8,10 @@
 package org.dspace.content.dao.impl;
 
 import java.sql.SQLException;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Site;
 import org.dspace.content.dao.SiteDAO;
 import org.dspace.core.AbstractHibernateDAO;
diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java
index 1384513655..0862a81e86 100644
--- a/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/WorkspaceItemDAOImpl.java
@@ -12,11 +12,11 @@ import java.util.AbstractMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.content.WorkspaceItem;
@@ -88,7 +88,7 @@ public class WorkspaceItemDAOImpl extends AbstractHibernateDAO<WorkspaceItem> im
         Root<WorkspaceItem> workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
         criteriaQuery.select(workspaceItemRoot);
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
         criteriaQuery.orderBy(orderList);
 
@@ -103,7 +103,7 @@ public class WorkspaceItemDAOImpl extends AbstractHibernateDAO<WorkspaceItem> im
         Root<WorkspaceItem> workspaceItemRoot = criteriaQuery.from(WorkspaceItem.class);
         criteriaQuery.select(workspaceItemRoot);
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(workspaceItemRoot.get(WorkspaceItem_.workspaceItemId)));
         criteriaQuery.orderBy(orderList);
 
diff --git a/dspace-api/src/main/java/org/dspace/content/dto/MetadataValueDTO.java b/dspace-api/src/main/java/org/dspace/content/dto/MetadataValueDTO.java
index 2ef0ab0b23..952aa799d2 100644
--- a/dspace-api/src/main/java/org/dspace/content/dto/MetadataValueDTO.java
+++ b/dspace-api/src/main/java/org/dspace/content/dto/MetadataValueDTO.java
@@ -7,6 +7,9 @@
  */
 package org.dspace.content.dto;
 
+import java.util.Comparator;
+import java.util.Objects;
+
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataSchema;
 import org.dspace.content.MetadataValue;
@@ -49,7 +52,7 @@ public class MetadataValueDTO {
      * @param schema        The schema to be assigned to this MetadataValueDTO object
      * @param element       The element to be assigned to this MetadataValueDTO object
      * @param qualifier     The qualifier to be assigned to this MetadataValueDTO object
-     * @param language      The language to be assigend to this MetadataValueDTO object
+     * @param language      The language to be assigned to this MetadataValueDTO object
      * @param value         The value to be assigned to this MetadataValueDTO object
      * @param authority     The authority to be assigned to this MetadataValueDTO object
      * @param confidence    The confidence to be assigned to this MetadataValueDTO object
@@ -70,7 +73,7 @@ public class MetadataValueDTO {
      * @param schema        The schema to be assigned to this MetadataValueDTO object
      * @param element       The element to be assigned to this MetadataValueDTO object
      * @param qualifier     The qualifier to be assigned to this MetadataValueDTO object
-     * @param language      The language to be assigend to this MetadataValueDTO object
+     * @param language      The language to be assigned to this MetadataValueDTO object
      * @param value         The value to be assigned to this MetadataValueDTO object
      */
     public MetadataValueDTO(String schema, String element, String qualifier, String language, String value) {
@@ -136,4 +139,62 @@ public class MetadataValueDTO {
     public void setConfidence(int confidence) {
         this.confidence = confidence;
     }
+
+    @Override
+    public String toString() {
+        return "MetadataValueDTO{" +
+                "schema='" + schema + '\'' +
+                ", element='" + element + '\'' +
+                ", qualifier='" + qualifier + '\'' +
+                ", language='" + language + '\'' +
+                ", value='" + value + '\'' +
+                ", authority='" + authority + '\'' +
+                ", confidence=" + confidence +
+                "}\n";
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        MetadataValueDTO that = (MetadataValueDTO) o;
+        return confidence == that.confidence &&
+                Objects.equals(schema, that.schema) && Objects.equals(element, that.element) &&
+                Objects.equals(qualifier, that.qualifier) && Objects.equals(language, that.language) &&
+                Objects.equals(value, that.value) && Objects.equals(authority, that.authority);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(schema, element, qualifier, language, value, authority, confidence);
+    }
+
+    /**
+     * Build a comparator to support proper sorting of MetadataValueDTO objects.
+     * Order of sorting is based on how these things are normally sorted in human-readable formats, with
+     * field name -> value -> lang/auth/etc being the usual order we use. In all these individual tests, nulls are
+     * sorted first (eg. dc.title before dc.title.alternative)
+     * @see org.dspace.external.model.ExternalDataObject#equals(Object)
+     * 1. Qualifier
+     * 2. Element
+     * 3. Schema
+     * 4. Value
+     * 5. Language
+     * 6. Authority
+     * @return comparator
+     */
+    public static Comparator<MetadataValueDTO> comparator() {
+        return Comparator.comparing(MetadataValueDTO::getQualifier, Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(MetadataValueDTO::getElement, Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(MetadataValueDTO::getSchema, Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(MetadataValueDTO::getValue, Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(MetadataValueDTO::getLanguage, Comparator.nullsFirst(Comparator.naturalOrder()))
+                .thenComparing(MetadataValueDTO::getAuthority, Comparator.nullsFirst(Comparator.naturalOrder()));
+    }
+
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java
index 0b06b34038..3a897081f0 100644
--- a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java
+++ b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactory.java
@@ -20,6 +20,7 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.DSpaceObjectLegacySupportService;
 import org.dspace.content.service.DSpaceObjectService;
+import org.dspace.content.service.DuplicateDetectionService;
 import org.dspace.content.service.EntityService;
 import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.InProgressSubmissionService;
@@ -113,6 +114,13 @@ public abstract class ContentServiceFactory {
         }
     }
 
+    /**
+     * Return the implementation of the DuplicateDetectionService interface
+     *
+     * @return the DuplicateDetectionService
+     */
+    public abstract DuplicateDetectionService getDuplicateDetectionService();
+
     public <T extends DSpaceObject> DSpaceObjectService<T> getDSpaceObjectService(T dso) {
         return getDSpaceObjectService(dso.getType());
     }
diff --git a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
index e970f0bdab..3c3c2bf162 100644
--- a/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/content/factory/ContentServiceFactoryImpl.java
@@ -18,6 +18,7 @@ import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
 import org.dspace.content.service.DSpaceObjectLegacySupportService;
 import org.dspace.content.service.DSpaceObjectService;
+import org.dspace.content.service.DuplicateDetectionService;
 import org.dspace.content.service.EntityService;
 import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.InstallItemService;
@@ -81,6 +82,8 @@ public class ContentServiceFactoryImpl extends ContentServiceFactory {
     private EntityTypeService entityTypeService;
     @Autowired(required = true)
     private EntityService entityService;
+    @Autowired(required = true)
+    private DuplicateDetectionService duplicateDetectionService;
 
     @Override
     public List<DSpaceObjectService<? extends DSpaceObject>> getDSpaceObjectServices() {
@@ -181,4 +184,9 @@ public class ContentServiceFactoryImpl extends ContentServiceFactory {
     public RelationshipMetadataService getRelationshipMetadataService() {
         return relationshipMetadataService;
     }
+
+    @Override
+    public DuplicateDetectionService getDuplicateDetectionService() {
+        return duplicateDetectionService;
+    }
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java b/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java
index a878d69e6e..96ec827267 100644
--- a/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java
+++ b/dspace-api/src/main/java/org/dspace/content/logic/FilterUtils.java
@@ -74,7 +74,7 @@ public class FilterUtils {
         Map<Class<? extends Identifier>, Filter> filters = new HashMap<>();
         // Put DOI 'can we create DOI on install / workspace?' filter
         Filter filter = FilterUtils.getFilterFromConfiguration("identifiers.submission.filter." + configurationSuffix);
-        // A null filter should be handled safely by the identifier provier (default, or "always true")
+        // A null filter should be handled safely by the identifier provider (default, or "always true")
         filters.put(DOI.class, filter);
         // This won't have an affect until handle providers implement filtering, but is an example of
         // how the filters can be used for other types
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java
index e7be7ab511..e231c30809 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/DSpaceAIPIngester.java
@@ -139,7 +139,7 @@ public class DSpaceAIPIngester
             }
         }
 
-        // MODS is acceptable otehrwise..
+        // MODS is acceptable otherwise..
         if (found == -1) {
             for (int i = 0; i < dmds.length; ++i) {
                 //NOTE: METS standard actually says this should be MODS (all uppercase). But,
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java b/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java
index 6c7baad454..c9105f8afe 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/PDFPackager.java
@@ -360,7 +360,7 @@ public class PDFPackager
              *   CreationDate -> date.created
              *   ModDate -> date.created
              *   Creator -> description.provenance (application that created orig)
-             *   Producer -> description.provenance (convertor to pdf)
+             *   Producer -> description.provenance (converter to pdf)
              *   Subject -> description.abstract
              *   Keywords -> subject.other
              *    date is java.util.Calendar
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/PackageDisseminator.java b/dspace-api/src/main/java/org/dspace/content/packager/PackageDisseminator.java
index c5ebffc9f8..6c82c639a0 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/PackageDisseminator.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/PackageDisseminator.java
@@ -38,7 +38,7 @@ import org.dspace.core.Context;
  * format output by <code>disseminate</code> may be affected by
  * parameters, it is given to the <code>getMIMEType</code> method as well.
  * The parameters list is a generalized mechanism to pass parameters
- * from the package requestor to the packager, since different packagers will
+ * from the package requester to the packager, since different packagers will
  * understand different sets of parameters.
  *
  * @author Larry Stone
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/PackageIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/PackageIngester.java
index 9b1d9f4f49..c28bd98e18 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/PackageIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/PackageIngester.java
@@ -34,7 +34,7 @@ import org.dspace.workflow.WorkflowException;
  * The ingest methods are also given an attribute-value
  * list of "parameters"  which may modify their actions.
  * The parameters list is a generalized mechanism to pass parameters
- * from the requestor to the packager, since different packagers will
+ * from the requester to the packager, since different packagers will
  * understand different sets of parameters.
  *
  * @author Larry Stone
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/PackageParameters.java b/dspace-api/src/main/java/org/dspace/content/packager/PackageParameters.java
index b472a52c3b..f2b9511867 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/PackageParameters.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/PackageParameters.java
@@ -9,7 +9,8 @@ package org.dspace.content.packager;
 
 import java.util.Enumeration;
 import java.util.Properties;
-import javax.servlet.ServletRequest;
+
+import jakarta.servlet.ServletRequest;
 
 /**
  * Parameter list for SIP and DIP packagers. It's really just
diff --git a/dspace-api/src/main/java/org/dspace/content/packager/RoleIngester.java b/dspace-api/src/main/java/org/dspace/content/packager/RoleIngester.java
index 2ce3f50a3c..ca27abe206 100644
--- a/dspace-api/src/main/java/org/dspace/content/packager/RoleIngester.java
+++ b/dspace-api/src/main/java/org/dspace/content/packager/RoleIngester.java
@@ -19,6 +19,8 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.codec.DecoderException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
@@ -36,8 +38,6 @@ import org.dspace.eperson.PasswordHash;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NamedNodeMap;
@@ -51,8 +51,7 @@ import org.xml.sax.SAXException;
  * @author mwood
  */
 public class RoleIngester implements PackageIngester {
-    private static final Logger log = LoggerFactory
-        .getLogger(RoleIngester.class);
+    private static final Logger log = LogManager.getLogger();
 
     protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
     protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
@@ -217,10 +216,10 @@ public class RoleIngester implements PackageIngester {
                 // Community or Collection that doesn't currently exist in the
                 // system.  So, log a warning & skip it for now.
                 log.warn(
-                    "Skipping group named '" + name + "' as it seems to correspond to a Community or Collection that " +
+                    "Skipping group named '{}' as it seems to correspond to a Community or Collection that " +
                         "does not exist in the system.  " +
                         "If you are performing an AIP restore, you can ignore this warning as the " +
-                        "Community/Collection AIP will likely create this group once it is processed.");
+                        "Community/Collection AIP will likely create this group once it is processed.", name);
                 continue;
             }
             log.debug("Translated group name:  {}", name);
@@ -307,7 +306,7 @@ public class RoleIngester implements PackageIngester {
                 // Always set the name:  parent.createBlop() is guessing
                 groupService.setName(groupObj, name);
 
-                log.info("Created Group {}.", groupObj.getName());
+                log.info("Created Group {}.", groupObj::getName);
             }
 
             // Add EPeople to newly created Group
diff --git a/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java b/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java
index 8effabf284..c22428f11a 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/BitstreamService.java
@@ -13,8 +13,8 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.content.BitstreamFormat;
diff --git a/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java b/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
index fd681f68f0..3a865d9d63 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/CollectionService.java
@@ -416,6 +416,34 @@ public interface CollectionService
     public List<Collection> findCollectionsWithSubmit(String q, Context context, Community community,
         int offset, int limit) throws SQLException, SearchServiceException;
 
+    /**
+     * Retrieve the first collection in the community or its descending that support
+     * the provided entityType
+     *
+     * @param  context    the DSpace context
+     * @param  community  the root from where the search start
+     * @param  entityType the requested entity type
+     * @return            the first collection in the community or its descending
+     *                    that support the provided entityType
+     */
+    public Collection retrieveCollectionWithSubmitByCommunityAndEntityType(Context context, Community community,
+        String entityType);
+
+    /**
+     * Retrieve the close collection to the item for which the current user has
+     * 'submit' privileges that support the provided entityType. Close mean the
+     * collection that can be reach with the minimum steps starting from the item
+     * (owningCollection, brothers collections, etc)
+     *
+     * @param  context    the DSpace context
+     * @param  item       the item from where the search start
+     * @param  entityType the requested entity type
+     * @return            the first collection in the community or its descending
+     *                    that support the provided entityType
+     */
+    public Collection retrieveCollectionWithSubmitByEntityType(Context context, Item item, String entityType)
+        throws SQLException;
+
     /**
      * Counts the number of Collection for which the current user has 'submit' privileges.
      * NOTE: for better performance, this method retrieves its results from an index (cache)
diff --git a/dspace-api/src/main/java/org/dspace/content/service/CommunityService.java b/dspace-api/src/main/java/org/dspace/content/service/CommunityService.java
index 163baedf5f..5734d5a9d9 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/CommunityService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/CommunityService.java
@@ -181,7 +181,7 @@ public interface CommunityService extends DSpaceObjectService<Community>, DSpace
 
 
     /**
-     * Add an exisiting collection to the community
+     * Add an existing collection to the community
      *
      * @param context    context
      * @param community  community
diff --git a/dspace-api/src/main/java/org/dspace/content/service/DuplicateDetectionService.java b/dspace-api/src/main/java/org/dspace/content/service/DuplicateDetectionService.java
new file mode 100644
index 0000000000..1f0d3495b1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/service/DuplicateDetectionService.java
@@ -0,0 +1,85 @@
+/**
+ * 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.content.service;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.DuplicateDetectionServiceImpl;
+import org.dspace.content.Item;
+import org.dspace.content.virtual.PotentialDuplicate;
+import org.dspace.core.Context;
+import org.dspace.discovery.DiscoverResult;
+import org.dspace.discovery.IndexableObject;
+import org.dspace.discovery.SearchServiceException;
+
+/**
+ * Duplicate Detection Service handles get, search and validation operations for duplicate detection.
+ * @see DuplicateDetectionServiceImpl for implementation details
+ *
+ * @author Kim Shepherd
+ */
+public interface DuplicateDetectionService {
+
+    /**
+     * Logger
+     */
+    Logger log = LogManager.getLogger(DuplicateDetectionService.class);
+
+    /**
+     * Get a list of PotentialDuplicate objects (wrappers with some metadata included for previewing) that
+     * are identified as potential duplicates of the given item
+     *
+     * @param context DSpace context
+     * @param item    Item to check
+     * @return        List of potential duplicates (empty if none found)
+     * @throws SearchServiceException if an error occurs performing the discovery search
+     */
+    List<PotentialDuplicate> getPotentialDuplicates(Context context, Item item)
+            throws SearchServiceException;
+
+    /**
+     * Validate an indexable object (returned by discovery search) to ensure it is permissible, readable and valid
+     * and can be added to a list of results.
+     * An Optional is returned, if it is empty then it was invalid or did not pass validation.
+     *
+     * @param context The DSpace context
+     * @param indexableObject The discovery search result
+     * @param original The original item (to compare IDs, submitters, etc)
+     * @return An Optional potential duplicate
+     * @throws SQLException
+     * @throws AuthorizeException
+     */
+    Optional<PotentialDuplicate> validateDuplicateResult(Context context, IndexableObject indexableObject,
+                                                                Item original) throws SQLException, AuthorizeException;
+
+    /**
+     * Search discovery for potential duplicates of a given item. The search uses levenshtein distance (configurable)
+     * and a single-term "comparison value" constructed out of the item title
+     *
+     * @param context DSpace context
+     * @param item The item to check
+     * @return DiscoverResult as a result of performing search. Null if invalid.
+     *
+     * @throws SearchServiceException if an error was encountered during the discovery search itself.
+     */
+    DiscoverResult searchDuplicates(Context context, Item item) throws SearchServiceException;
+
+    /**
+     * Build a comparison value string made up of values of configured fields, used when indexing and querying
+     * items for deduplication
+     * @param context DSpace context
+     * @param item The DSpace item
+     * @return a constructed, normalised string
+     */
+    String buildComparisonValue(Context context, Item item);
+}
diff --git a/dspace-api/src/main/java/org/dspace/content/service/FeedbackService.java b/dspace-api/src/main/java/org/dspace/content/service/FeedbackService.java
index d21afd6780..68bb0b1558 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/FeedbackService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/FeedbackService.java
@@ -7,9 +7,9 @@
  */
 package org.dspace.content.service;
 import java.io.IOException;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 
 /**
@@ -20,7 +20,7 @@ import org.dspace.core.Context;
 public interface FeedbackService {
 
     /**
-     * This method sends the feeback email to the recipient passed as parameter
+     * This method sends the feedback email to the recipient passed as parameter
      * @param context current DSpace application context
      * @param request current servlet request
      * @param recipientEmail recipient to which mail is sent
diff --git a/dspace-api/src/main/java/org/dspace/content/service/ItemService.java b/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
index 12867ad18c..47d2d5bdaa 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/ItemService.java
@@ -23,10 +23,10 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.EntityType;
 import org.dspace.content.Item;
-import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.Thumbnail;
 import org.dspace.content.WorkspaceItem;
+import org.dspace.contentreport.QueryPredicate;
 import org.dspace.core.Context;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.eperson.EPerson;
@@ -42,7 +42,7 @@ import org.dspace.eperson.Group;
 public interface ItemService
         extends DSpaceObjectService<Item>, DSpaceObjectLegacySupportService<Item> {
 
-    public Thumbnail getThumbnail(Context context, Item item, boolean requireOriginal) throws SQLException;
+    Thumbnail getThumbnail(Context context, Item item, boolean requireOriginal) throws SQLException;
 
     /**
      * Create a new item, with a new internal ID. Authorization is done
@@ -54,7 +54,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public Item create(Context context, WorkspaceItem workspaceItem) throws SQLException, AuthorizeException;
+    Item create(Context context, WorkspaceItem workspaceItem) throws SQLException, AuthorizeException;
 
     /**
      * Create a new item, with a provided ID. Authorisation is done
@@ -67,7 +67,7 @@ public interface ItemService
      * @throws SQLException if database error
      * @throws AuthorizeException if authorization error
      */
-    public Item create(Context context, WorkspaceItem workspaceItem, UUID uuid) throws SQLException, AuthorizeException;
+    Item create(Context context, WorkspaceItem workspaceItem, UUID uuid) throws SQLException, AuthorizeException;
 
     /**
      * Create an empty template item for this collection. If one already exists,
@@ -81,7 +81,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public Item createTemplateItem(Context context, Collection collection) throws SQLException, AuthorizeException;
+    Item createTemplateItem(Context context, Collection collection) throws SQLException, AuthorizeException;
 
     /**
      * Populate the given item with all template item specified metadata.
@@ -103,7 +103,7 @@ public interface ItemService
      * @return an iterator over the items in the archive.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findAll(Context context) throws SQLException;
+    Iterator<Item> findAll(Context context) throws SQLException;
 
     /**
      * Get all the items in the archive. Only items with the "in archive" flag
@@ -115,7 +115,7 @@ public interface ItemService
      * @return an iterator over the items in the archive.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findAll(Context context, Integer limit, Integer offset) throws SQLException;
+    Iterator<Item> findAll(Context context, Integer limit, Integer offset) throws SQLException;
 
     /**
      * Get all "final" items in the archive, both archived ("in archive" flag) or
@@ -125,8 +125,7 @@ public interface ItemService
      * @return an iterator over the items in the archive.
      * @throws SQLException if database error
      */
-    @Deprecated
-    public Iterator<Item> findAllUnfiltered(Context context) throws SQLException;
+    @Deprecated Iterator<Item> findAllUnfiltered(Context context) throws SQLException;
 
     /**
      * Find all items that are:
@@ -139,7 +138,7 @@ public interface ItemService
      * @return iterator over all regular items.
      * @throws SQLException if database error.
      */
-    public Iterator<Item> findAllRegularItems(Context context) throws SQLException;
+    Iterator<Item> findAllRegularItems(Context context) throws SQLException;
 
     /**
      * Find all the items in the archive by a given submitter. The order is
@@ -150,7 +149,7 @@ public interface ItemService
      * @return an iterator over the items submitted by eperson
      * @throws SQLException if database error
      */
-    public Iterator<Item> findBySubmitter(Context context, EPerson eperson)
+    Iterator<Item> findBySubmitter(Context context, EPerson eperson)
         throws SQLException;
 
     /**
@@ -165,7 +164,7 @@ public interface ItemService
      * @return an iterator over the items submitted by eperson
      * @throws SQLException if database error
      */
-    public Iterator<Item> findBySubmitter(Context context, EPerson eperson, boolean retrieveAllItems)
+    Iterator<Item> findBySubmitter(Context context, EPerson eperson, boolean retrieveAllItems)
             throws SQLException;
 
     /**
@@ -177,7 +176,7 @@ public interface ItemService
      * @return an iterator over the items submitted by eperson
      * @throws SQLException if database error
      */
-    public Iterator<Item> findBySubmitterDateSorted(Context context, EPerson eperson, Integer limit)
+    Iterator<Item> findBySubmitterDateSorted(Context context, EPerson eperson, Integer limit)
         throws SQLException;
 
     /**
@@ -188,7 +187,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findByCollection(Context context, Collection collection) throws SQLException;
+    Iterator<Item> findByCollection(Context context, Collection collection) throws SQLException;
 
     /**
      * Get all the archived items in this collection. The order is indeterminate.
@@ -200,7 +199,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findByCollection(Context context, Collection collection, Integer limit, Integer offset)
+    Iterator<Item> findByCollection(Context context, Collection collection, Integer limit, Integer offset)
         throws SQLException;
 
     /**
@@ -213,7 +212,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findByCollectionMapping(Context context, Collection collection, Integer limit, Integer offset)
+    Iterator<Item> findByCollectionMapping(Context context, Collection collection, Integer limit, Integer offset)
             throws SQLException;
 
     /**
@@ -224,7 +223,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public int countByCollectionMapping(Context context, Collection collection) throws SQLException;
+    int countByCollectionMapping(Context context, Collection collection) throws SQLException;
 
     /**
      * Get all the items (including private and withdrawn) in this collection. The order is indeterminate.
@@ -236,7 +235,7 @@ public interface ItemService
      * @param offset offset value
      * @throws SQLException if database error
      */
-    public Iterator<Item> findAllByCollection(Context context, Collection collection, Integer limit, Integer offset)
+    Iterator<Item> findAllByCollection(Context context, Collection collection, Integer limit, Integer offset)
         throws SQLException;
 
     /**
@@ -247,7 +246,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findInArchiveOrWithdrawnDiscoverableModifiedSince(Context context, Date since)
+    Iterator<Item> findInArchiveOrWithdrawnDiscoverableModifiedSince(Context context, Date since)
         throws SQLException;
 
     /**
@@ -257,7 +256,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findInArchiveOrWithdrawnNonDiscoverableModifiedSince(Context context, Date since)
+    Iterator<Item> findInArchiveOrWithdrawnNonDiscoverableModifiedSince(Context context, Date since)
         throws SQLException;
 
     /**
@@ -268,7 +267,7 @@ public interface ItemService
      * @return an iterator over the items in the collection.
      * @throws SQLException if database error
      */
-    public Iterator<Item> findAllByCollection(Context context, Collection collection) throws SQLException;
+    Iterator<Item> findAllByCollection(Context context, Collection collection) throws SQLException;
 
     /**
      * See whether this Item is contained by a given Collection.
@@ -278,7 +277,7 @@ public interface ItemService
      * @return true if {@code collection} contains this Item.
      * @throws SQLException if database error
      */
-    public boolean isIn(Item item, Collection collection) throws SQLException;
+    boolean isIn(Item item, Collection collection) throws SQLException;
 
     /**
      * Get the communities this item is in. Returns an unordered array of the
@@ -290,7 +289,7 @@ public interface ItemService
      * @return the communities this item is in.
      * @throws SQLException if database error
      */
-    public List<Community> getCommunities(Context context, Item item) throws SQLException;
+    List<Community> getCommunities(Context context, Item item) throws SQLException;
 
 
     /**
@@ -301,7 +300,7 @@ public interface ItemService
      * @return the bundles in an unordered array
      * @throws SQLException if database error
      */
-    public List<Bundle> getBundles(Item item, String name) throws SQLException;
+    List<Bundle> getBundles(Item item, String name) throws SQLException;
 
     /**
      * Add an existing bundle to this item. This has immediate effect.
@@ -312,7 +311,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public void addBundle(Context context, Item item, Bundle bundle) throws SQLException, AuthorizeException;
+    void addBundle(Context context, Item item, Bundle bundle) throws SQLException, AuthorizeException;
 
     /**
      * Remove a bundle. This may result in the bundle being deleted, if the
@@ -325,7 +324,7 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public void removeBundle(Context context, Item item, Bundle bundle) throws SQLException, AuthorizeException,
+    void removeBundle(Context context, Item item, Bundle bundle) throws SQLException, AuthorizeException,
         IOException;
 
     /**
@@ -338,7 +337,7 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public void removeAllBundles(Context context, Item item) throws AuthorizeException, SQLException, IOException;
+    void removeAllBundles(Context context, Item item) throws AuthorizeException, SQLException, IOException;
 
     /**
      * Create a single bitstream in a new bundle. Provided as a convenience
@@ -353,7 +352,7 @@ public interface ItemService
      * @throws IOException        if IO error
      * @throws SQLException       if database error
      */
-    public Bitstream createSingleBitstream(Context context, InputStream is, Item item, String name)
+    Bitstream createSingleBitstream(Context context, InputStream is, Item item, String name)
         throws AuthorizeException, IOException, SQLException;
 
     /**
@@ -367,7 +366,7 @@ public interface ItemService
      * @throws IOException        if IO error
      * @throws SQLException       if database error
      */
-    public Bitstream createSingleBitstream(Context context, InputStream is, Item item)
+    Bitstream createSingleBitstream(Context context, InputStream is, Item item)
         throws AuthorizeException, IOException, SQLException;
 
     /**
@@ -380,7 +379,7 @@ public interface ItemService
      * @return non-internal bitstreams.
      * @throws SQLException if database error
      */
-    public List<Bitstream> getNonInternalBitstreams(Context context, Item item) throws SQLException;
+    List<Bitstream> getNonInternalBitstreams(Context context, Item item) throws SQLException;
 
     /**
      * Remove just the DSpace license from an item This is useful to update the
@@ -395,7 +394,7 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public void removeDSpaceLicense(Context context, Item item) throws SQLException, AuthorizeException,
+    void removeDSpaceLicense(Context context, Item item) throws SQLException, AuthorizeException,
         IOException;
 
     /**
@@ -407,7 +406,7 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public void removeLicenses(Context context, Item item) throws SQLException, AuthorizeException, IOException;
+    void removeLicenses(Context context, Item item) throws SQLException, AuthorizeException, IOException;
 
     /**
      * Withdraw the item from the archive. It is kept in place, and the content
@@ -418,7 +417,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public void withdraw(Context context, Item item) throws SQLException, AuthorizeException;
+    void withdraw(Context context, Item item) throws SQLException, AuthorizeException;
 
 
     /**
@@ -429,7 +428,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public void reinstate(Context context, Item item) throws SQLException, AuthorizeException;
+    void reinstate(Context context, Item item) throws SQLException, AuthorizeException;
 
     /**
      * Return true if this Collection 'owns' this item
@@ -438,7 +437,7 @@ public interface ItemService
      * @param collection Collection
      * @return true if this Collection owns this item
      */
-    public boolean isOwningCollection(Item item, Collection collection);
+    boolean isOwningCollection(Item item, Collection collection);
 
     /**
      * remove all of the policies for item and replace them with a new list of
@@ -452,7 +451,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public void replaceAllItemPolicies(Context context, Item item, List<ResourcePolicy> newpolicies)
+    void replaceAllItemPolicies(Context context, Item item, List<ResourcePolicy> newpolicies)
         throws SQLException,
         AuthorizeException;
 
@@ -468,7 +467,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public void replaceAllBitstreamPolicies(Context context, Item item, List<ResourcePolicy> newpolicies)
+    void replaceAllBitstreamPolicies(Context context, Item item, List<ResourcePolicy> newpolicies)
         throws SQLException, AuthorizeException;
 
 
@@ -482,7 +481,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public void removeGroupPolicies(Context context, Item item, Group group) throws SQLException, AuthorizeException;
+    void removeGroupPolicies(Context context, Item item, Group group) throws SQLException, AuthorizeException;
 
     /**
      * Remove all policies on an item and its contents, and replace them with
@@ -497,7 +496,7 @@ public interface ItemService
      *                            draconian, but default policies must be enforced.
      * @throws AuthorizeException if authorization error
      */
-    public void inheritCollectionDefaultPolicies(Context context, Item item, Collection collection)
+    void inheritCollectionDefaultPolicies(Context context, Item item, Collection collection)
         throws java.sql.SQLException, AuthorizeException;
 
     /**
@@ -516,7 +515,7 @@ public interface ItemService
      *                            draconian, but default policies must be enforced.
      * @throws AuthorizeException if authorization error
      */
-    public void inheritCollectionDefaultPolicies(Context context, Item item, Collection collection,
+    void inheritCollectionDefaultPolicies(Context context, Item item, Collection collection,
                                                  boolean overrideItemReadPolicies)
         throws java.sql.SQLException, AuthorizeException;
 
@@ -529,14 +528,14 @@ public interface ItemService
      * already applied to the bundle/bitstream. Collection's policies are inherited
      * if there are no other policies defined or if the append mode is defined by
      * the configuration via the core.authorization.installitem.inheritance-read.append-mode property
-     * 
+     *
      * @param context             DSpace context object
      * @param item                Item to adjust policies on
      * @param collection          Collection
      * @throws SQLException       If database error
      * @throws AuthorizeException If authorization error
      */
-    public void adjustBundleBitstreamPolicies(Context context, Item item, Collection collection)
+    void adjustBundleBitstreamPolicies(Context context, Item item, Collection collection)
         throws SQLException, AuthorizeException;
 
     /**
@@ -557,7 +556,7 @@ public interface ItemService
      * @throws SQLException       If database error
      * @throws AuthorizeException If authorization error
      */
-    public void adjustBundleBitstreamPolicies(Context context, Item item, Collection collection,
+    void adjustBundleBitstreamPolicies(Context context, Item item, Collection collection,
                                               boolean replaceReadRPWithCollectionRP)
         throws SQLException, AuthorizeException;
 
@@ -578,7 +577,7 @@ public interface ItemService
      * @throws SQLException       If database error
      * @throws AuthorizeException If authorization error
      */
-    public void adjustBitstreamPolicies(Context context, Item item, Collection collection, Bitstream bitstream)
+    void adjustBitstreamPolicies(Context context, Item item, Collection collection, Bitstream bitstream)
         throws SQLException, AuthorizeException;
 
     /**
@@ -600,7 +599,7 @@ public interface ItemService
      * @throws SQLException       If database error
      * @throws AuthorizeException If authorization error
      */
-    public void adjustBitstreamPolicies(Context context, Item item, Collection collection, Bitstream bitstream,
+    void adjustBitstreamPolicies(Context context, Item item, Collection collection, Bitstream bitstream,
                                         boolean replaceReadRPWithCollectionRP)
         throws SQLException, AuthorizeException;
 
@@ -612,14 +611,14 @@ public interface ItemService
      * inherited as appropriate. Collection's policies are inherited if there are no
      * other policies defined or if the append mode is defined by the configuration
      * via the core.authorization.installitem.inheritance-read.append-mode property
-     * 
+     *
      * @param context              DSpace context object
      * @param item                 Item to adjust policies on
      * @param collection           Collection
      * @throws SQLException        If database error
      * @throws AuthorizeException  If authorization error
      */
-    public void adjustItemPolicies(Context context, Item item, Collection collection)
+    void adjustItemPolicies(Context context, Item item, Collection collection)
         throws SQLException, AuthorizeException;
 
     /**
@@ -638,7 +637,7 @@ public interface ItemService
      * @throws SQLException        If database error
      * @throws AuthorizeException  If authorization error
      */
-    public void adjustItemPolicies(Context context, Item item, Collection collection,
+    void adjustItemPolicies(Context context, Item item, Collection collection,
                                    boolean replaceReadRPWithCollectionRP)
         throws SQLException, AuthorizeException;
 
@@ -653,7 +652,7 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public void move(Context context, Item item, Collection from, Collection to)
+    void move(Context context, Item item, Collection from, Collection to)
         throws SQLException, AuthorizeException, IOException;
 
     /**
@@ -668,7 +667,7 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public void move(Context context, Item item, Collection from, Collection to, boolean inheritDefaultPolicies)
+    void move(Context context, Item item, Collection from, Collection to, boolean inheritDefaultPolicies)
         throws SQLException, AuthorizeException, IOException;
 
     /**
@@ -679,7 +678,7 @@ public interface ItemService
      * bitstreams inside
      * @throws SQLException if database error
      */
-    public boolean hasUploadedFiles(Item item) throws SQLException;
+    boolean hasUploadedFiles(Item item) throws SQLException;
 
     /**
      * Get the collections this item is not in.
@@ -689,7 +688,7 @@ public interface ItemService
      * @return the collections this item is not in, if any.
      * @throws SQLException if database error
      */
-    public List<Collection> getCollectionsNotLinked(Context context, Item item) throws SQLException;
+    List<Collection> getCollectionsNotLinked(Context context, Item item) throws SQLException;
 
     /**
      * return TRUE if context's user can edit item, false otherwise
@@ -699,7 +698,7 @@ public interface ItemService
      * @return boolean true = current user can edit item
      * @throws SQLException if database error
      */
-    public boolean canEdit(Context context, Item item) throws java.sql.SQLException;
+    boolean canEdit(Context context, Item item) throws java.sql.SQLException;
 
     /**
      * return TRUE if context's user can create new version of the item, false
@@ -710,7 +709,7 @@ public interface ItemService
      * @return boolean true = current user can create new version of the item
      * @throws SQLException if database error
      */
-    public boolean canCreateNewVersion(Context context, Item item) throws SQLException;
+    boolean canCreateNewVersion(Context context, Item item) throws SQLException;
 
     /**
      * Returns an iterator of in archive items possessing the passed metadata field, or only
@@ -725,7 +724,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public Iterator<Item> findArchivedByMetadataField(Context context, String schema,
+    Iterator<Item> findArchivedByMetadataField(Context context, String schema,
                                                       String element, String qualifier,
                                                       String value) throws SQLException, AuthorizeException;
 
@@ -740,7 +739,7 @@ public interface ItemService
      * @throws SQLException       if database error
      * @throws AuthorizeException if authorization error
      */
-    public Iterator<Item> findArchivedByMetadataField(Context context, String metadataField, String value)
+    Iterator<Item> findArchivedByMetadataField(Context context, String metadataField, String value)
             throws SQLException, AuthorizeException;
 
     /**
@@ -757,14 +756,41 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public Iterator<Item> findByMetadataField(Context context,
+    Iterator<Item> findByMetadataField(Context context,
                                               String schema, String element, String qualifier, String value)
         throws SQLException, AuthorizeException, IOException;
 
-    public Iterator<Item> findByMetadataQuery(Context context, List<List<MetadataField>> listFieldList,
-                                              List<String> query_op, List<String> query_val, List<UUID> collectionUuids,
-                                              String regexClause, int offset, int limit)
-        throws SQLException, AuthorizeException, IOException;
+    /**
+     * Returns a list of items that match the given predicates, within the
+     * specified collections, if any. This querying method is used by the
+     * Filtered Items report functionality.
+     * @param context DSpace context object
+     * @param queryPredicates metadata field predicates
+     * @param collectionUuids UUIDs of the collections to search
+     * @param offset position in the list to start returning items
+     * @param limit maximum number of items to return
+     * @return a list of matching items in the specified collections,
+     * or in any collection if no collection UUIDs are provided
+     * @throws SQLException if a database error occurs
+     */
+    List<Item> findByMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids, long offset, int limit)
+            throws SQLException;
+
+    /**
+     * Returns the total number of items that match the given predicates, within the
+     * specified collections, if any. This querying method is used for pagination by the
+     * Filtered Items report functionality.
+     * @param context DSpace context object
+     * @param queryPredicates metadata field predicates
+     * @param collectionUuids UUIDs of the collections to search
+     * @return the total number of matching items in the specified collections,
+     * or in any collection if no collection UUIDs are provided
+     * @throws SQLException if a database error occurs
+     */
+    long countForMetadataQuery(Context context, List<QueryPredicate> queryPredicates,
+            List<UUID> collectionUuids)
+            throws SQLException;
 
     /**
      * Find all the items in the archive with a given authority key value
@@ -780,12 +806,12 @@ public interface ItemService
      * @throws AuthorizeException if authorization error
      * @throws IOException        if IO error
      */
-    public Iterator<Item> findByAuthorityValue(Context context,
+    Iterator<Item> findByAuthorityValue(Context context,
                                                String schema, String element, String qualifier, String value)
         throws SQLException, AuthorizeException;
 
 
-    public Iterator<Item> findByMetadataFieldAuthority(Context context, String mdString, String authority)
+    Iterator<Item> findByMetadataFieldAuthority(Context context, String mdString, String authority)
         throws SQLException, AuthorizeException;
 
     /**
@@ -797,7 +823,7 @@ public interface ItemService
      * @param item    item
      * @return true or false
      */
-    public boolean isItemListedForUser(Context context, Item item);
+    boolean isItemListedForUser(Context context, Item item);
 
     /**
      * counts items in the given collection
@@ -807,7 +833,7 @@ public interface ItemService
      * @return total items
      * @throws SQLException if database error
      */
-    public int countItems(Context context, Collection collection) throws SQLException;
+    int countItems(Context context, Collection collection) throws SQLException;
 
     /**
      * counts all items in the given collection including withdrawn items
@@ -817,7 +843,7 @@ public interface ItemService
      * @return total items
      * @throws SQLException if database error
      */
-    public int countAllItems(Context context, Collection collection) throws SQLException;
+    int countAllItems(Context context, Collection collection) throws SQLException;
 
     /**
      * Find all Items modified since a Date.
@@ -827,7 +853,7 @@ public interface ItemService
      * @return iterator over items
      * @throws SQLException if database error
      */
-    public Iterator<Item> findByLastModifiedSince(Context context, Date last)
+    Iterator<Item> findByLastModifiedSince(Context context, Date last)
         throws SQLException;
 
     /**
@@ -838,7 +864,7 @@ public interface ItemService
      * @return total items
      * @throws SQLException if database error
      */
-    public int countItems(Context context, Community community) throws SQLException;
+    int countItems(Context context, Community community) throws SQLException;
 
     /**
      * counts all items in the given community including withdrawn
@@ -848,7 +874,7 @@ public interface ItemService
      * @return total items
      * @throws SQLException if database error
      */
-    public int countAllItems(Context context, Community community) throws SQLException;
+    int countAllItems(Context context, Community community) throws SQLException;
 
     /**
      * counts all items
@@ -895,7 +921,7 @@ public interface ItemService
       * @throws SQLException
       * @throws SearchServiceException
       */
-    public List<Item> findItemsWithEdit(Context context, int offset, int limit)
+    List<Item> findItemsWithEdit(Context context, int offset, int limit)
         throws SQLException, SearchServiceException;
 
     /**
@@ -905,7 +931,7 @@ public interface ItemService
     * @throws SQLException
     * @throws SearchServiceException
     */
-    public int countItemsWithEdit(Context context) throws SQLException, SearchServiceException;
+    int countItemsWithEdit(Context context) throws SQLException, SearchServiceException;
 
     /**
      * Check if the supplied item is an inprogress submission
@@ -965,7 +991,7 @@ public interface ItemService
      *                     relationships.
      * @return metadata fields that match the parameters
      */
-    public List<MetadataValue> getMetadata(Item item, String schema, String element, String qualifier,
+    List<MetadataValue> getMetadata(Item item, String schema, String element, String qualifier,
                                            String lang, boolean enableVirtualMetadata);
 
     /**
@@ -973,7 +999,7 @@ public interface ItemService
      * @param item the item.
      * @return the label of the entity type, taken from the item metadata, or null if not found.
      */
-    public String getEntityTypeLabel(Item item);
+    String getEntityTypeLabel(Item item);
 
     /**
      * Retrieve the entity type of the given item.
@@ -981,6 +1007,6 @@ public interface ItemService
      * @param item the item.
      * @return the entity type of the given item, or null if not found.
      */
-    public EntityType getEntityType(Context context, Item item) throws SQLException;
+    EntityType getEntityType(Context context, Item item) throws SQLException;
 
 }
diff --git a/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java b/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
index 719f966e46..f32e965c62 100644
--- a/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
+++ b/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
@@ -282,7 +282,7 @@ public interface RelationshipService extends DSpaceCRUDService<Relationship> {
     List<Relationship> findByRelationshipType(Context context, RelationshipType relationshipType) throws SQLException;
 
     /**
-     * This method returns a list of Relationship objets for which the relationshipType property is equal to the given
+     * This method returns a list of Relationship objects for which the relationshipType property is equal to the given
      * RelationshipType object
      * NOTE: tilted relationships are NEVER excluded when fetching one relationship type
      * @param context           The relevant DSpace context
diff --git a/dspace-api/src/main/java/org/dspace/content/virtual/Concatenate.java b/dspace-api/src/main/java/org/dspace/content/virtual/Concatenate.java
index b788cbf9fc..0bc7e3cd2a 100644
--- a/dspace-api/src/main/java/org/dspace/content/virtual/Concatenate.java
+++ b/dspace-api/src/main/java/org/dspace/content/virtual/Concatenate.java
@@ -62,16 +62,16 @@ public class Concatenate implements VirtualMetadataConfiguration {
     }
 
     /**
-     * Generic getter for the seperator
-     * @return the seperator to be used by this bean
+     * Generic getter for the separator
+     * @return the separator to be used by this bean
      */
     public String getSeparator() {
         return separator;
     }
 
     /**
-     * Generic setter for the seperator property
-     * @param separator The String seperator value to which this seperator value will be set to
+     * Generic setter for the separator property
+     * @param separator The String separator value to which this separator value will be set to
      */
     public void setSeparator(String separator) {
         this.separator = separator;
diff --git a/dspace-api/src/main/java/org/dspace/content/virtual/PotentialDuplicate.java b/dspace-api/src/main/java/org/dspace/content/virtual/PotentialDuplicate.java
new file mode 100644
index 0000000000..6c193bb285
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/content/virtual/PotentialDuplicate.java
@@ -0,0 +1,176 @@
+/**
+ * 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.content.virtual;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+
+/**
+ * Model of potential duplicate item. Provides as little data as possible, but enough to be useful
+ * about the context / state of the duplicate, and metadata for preview purposes.
+ * This class lives in the virtual package because it is not stored, addressable data, it's a stub / preview
+ * based on an items' search result and metadata.
+ *
+ * @author Kim Shepherd
+ */
+public class PotentialDuplicate {
+    /**
+     * Title of duplicate object
+     */
+    private String title;
+    /**
+     * UUID of duplicate object
+     */
+    private UUID uuid;
+    /**
+     * Owning collection name (title) for duplicate item
+     */
+    private String owningCollectionName;
+    /**
+     * Workspace item ID, if the duplicate is a workspace item
+     */
+    private Integer workspaceItemId;
+    /**
+     * Workflow item ID, if the duplicate is a workflow item
+     */
+    private Integer workflowItemId;
+
+    /**
+     * List of configured metadata values copied across from the duplicate item
+     */
+    private List<MetadataValue> metadataValueList;
+
+    /**
+     * Default constructor
+     */
+    public PotentialDuplicate() {
+        this.metadataValueList = new LinkedList<>();
+    }
+
+    /**
+     * Constructor that accepts an item and sets some values accordingly
+     * @param item the potential duplicate item
+     */
+    public PotentialDuplicate(Item item) {
+        // Throw error if item is null
+        if (item == null) {
+            throw new NullPointerException("Null item passed to potential duplicate constructor");
+        }
+        // Instantiate metadata value list
+        this.metadataValueList = new LinkedList<>();
+        // Set title
+        this.title = item.getName();
+        // Set UUID
+        this.uuid = item.getID();
+        // Set owning collection name
+        if (item.getOwningCollection() != null) {
+            this.owningCollectionName = item.getOwningCollection().getName();
+        }
+    }
+
+    /**
+     * Get UUID of duplicate item
+     * @return UUID of duplicate item
+     */
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Set UUID of duplicate item
+     * @param uuid UUID of duplicate item
+     */
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Get title of duplicate item
+     * @return title of duplicate item
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Set title of duplicate item
+     * @param title of duplicate item
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * Get owning collection name (title) of duplicate item
+     * @return owning collection name (title) of duplicate item
+     */
+    public String getOwningCollectionName() {
+        return owningCollectionName;
+    }
+
+    /**
+     * Set owning collection name (title) of duplicate item
+     * @param owningCollectionName owning collection name (title) of duplicate item
+     */
+    public void setOwningCollectionName(String owningCollectionName) {
+        this.owningCollectionName = owningCollectionName;
+    }
+
+    /**
+     * Get workspace ID for duplicate item, if any
+     * @return workspace item ID or null
+     */
+    public Integer getWorkspaceItemId() {
+        return workspaceItemId;
+    }
+
+    /**
+     * Set workspace ID for duplicate item
+     * @param workspaceItemId workspace item ID
+     */
+    public void setWorkspaceItemId(Integer workspaceItemId) {
+        this.workspaceItemId = workspaceItemId;
+    }
+
+    /**
+     * Get workflow ID for duplicate item, if anh
+     * @return workflow item ID or null
+     */
+    public Integer getWorkflowItemId() {
+        return workflowItemId;
+    }
+
+    /**
+     * Set workflow ID for duplicate item
+     * @param workflowItemId workspace item ID
+     */
+    public void setWorkflowItemId(Integer workflowItemId) {
+        this.workflowItemId = workflowItemId;
+    }
+
+    /**
+     * Get metadata (sorted, field->value list) for duplicate item
+     * @return (sorted, field->value list) for duplicate item
+     */
+    public List<MetadataValue> getMetadataValueList() {
+        return metadataValueList;
+    }
+
+    /**
+     * Set metadata (sorted, field->value list) for duplicate item
+     * @param metadataValueList MetadataRest list of values mapped to field keys
+     */
+    public void setMetadataValueList(List<MetadataValue> metadataValueList) {
+        this.metadataValueList = metadataValueList;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/ContentReportServiceImpl.java b/dspace-api/src/main/java/org/dspace/contentreport/ContentReportServiceImpl.java
new file mode 100644
index 0000000000..e22ac0e96f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/ContentReportServiceImpl.java
@@ -0,0 +1,190 @@
+/**
+ * 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.contentreport;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataField;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.MetadataFieldService;
+import org.dspace.contentreport.service.ContentReportService;
+import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class ContentReportServiceImpl implements ContentReportService {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager
+            .getLogger(ContentReportServiceImpl.class);
+
+    @Autowired
+    protected ConfigurationService configurationService;
+    @Autowired
+    private CollectionService collectionService;
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private MetadataFieldService metadataFieldService;
+
+    /**
+     * Returns <code>true<</code> if Content Reports are enabled.
+     * @return <code>true<</code> if Content Reports are enabled
+     */
+    @Override
+    public boolean getEnabled() {
+        return configurationService.getBooleanProperty("contentreport.enable");
+    }
+
+    /**
+     * Retrieves item statistics per collection according to a set of Boolean filters.
+     * @param context DSpace context
+     * @param filters Set of filters
+     * @return a list of collections with the requested statistics for each of them
+     */
+    @Override
+    public List<FilteredCollection> findFilteredCollections(Context context, java.util.Collection<Filter> filters) {
+        List<FilteredCollection> colls = new ArrayList<>();
+        try {
+            List<Collection> collections = collectionService.findAll(context);
+            for (Collection collection : collections) {
+                FilteredCollection coll = new FilteredCollection();
+                coll.setHandle(collection.getHandle());
+                coll.setLabel(collection.getName());
+                Community community = collection.getCommunities().stream()
+                        .findFirst()
+                        .orElse(null);
+                if (community != null) {
+                    coll.setCommunityLabel(community.getName());
+                    coll.setCommunityHandle(community.getHandle());
+                }
+                colls.add(coll);
+
+                Iterator<Item> items = itemService.findAllByCollection(context, collection);
+                int nbTotalItems = 0;
+                while (items.hasNext()) {
+                    Item item = items.next();
+                    nbTotalItems++;
+                    boolean matchesAllFilters = true;
+                    for (Filter filter : filters) {
+                        if (filter.testItem(context, item)) {
+                            coll.addValue(filter, 1);
+                        } else {
+                            // This ensures the requested filter is present in the collection record
+                            // even when there are no matching items.
+                            coll.addValue(filter, 0);
+                            matchesAllFilters = false;
+                        }
+                    }
+                    if (matchesAllFilters) {
+                        coll.addAllFiltersValue(1);
+                    }
+                }
+                coll.setTotalItems(nbTotalItems);
+                coll.seal();
+            }
+        } catch (SQLException e) {
+            log.error("SQLException trying to receive filtered collections statistics", e);
+        }
+        return colls;
+    }
+
+    /**
+     * Retrieves a list of items according to a set of criteria.
+     * @param context DSpace context
+     * @param query structured query to find items against
+     * @return a list of items filtered according to the provided query
+     */
+    @Override
+    public FilteredItems findFilteredItems(Context context, FilteredItemsQuery query) {
+        FilteredItems report = new FilteredItems();
+
+        List<QueryPredicate> predicates = query.getQueryPredicates();
+        List<UUID> collectionUuids = getUuidsFromStrings(query.getCollections());
+        Set<Filter> filters = query.getFilters();
+
+        try {
+            List<Item> items = itemService.findByMetadataQuery(context, predicates, collectionUuids,
+                    query.getOffset(), query.getPageLimit());
+            items.stream()
+                    .filter(item -> filters.stream().allMatch(f -> f.testItem(context, item)))
+                    .forEach(report::addItem);
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+        }
+        try {
+            long count = itemService.countForMetadataQuery(context, predicates, collectionUuids);
+            report.setItemCount(count);
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+        }
+
+        return report;
+    }
+
+    /**
+     * Converts a metadata field name to a list of {@link MetadataField} instances
+     * (one if no wildcards are used, possibly more otherwise).
+     * @param context DSpace context
+     * @param metadataField field to search for
+     * @return a corresponding list of {@link MetadataField} entries
+     */
+    @Override
+    public List<MetadataField> getMetadataFields(org.dspace.core.Context context, String metadataField)
+            throws SQLException {
+        List<MetadataField> fields = new ArrayList<>();
+        if ("*".equals(metadataField)) {
+            return fields;
+        }
+        String schema = "";
+        String element = "";
+        String qualifier = null;
+        String[] parts = metadataField.split("\\.");
+        if (parts.length > 0) {
+            schema = parts[0];
+        }
+        if (parts.length > 1) {
+            element = parts[1];
+        }
+        if (parts.length > 2) {
+            qualifier = parts[2];
+        }
+
+        if (Item.ANY.equals(qualifier)) {
+            fields.addAll(metadataFieldService.findFieldsByElementNameUnqualified(context, schema, element));
+        } else {
+            MetadataField mf = metadataFieldService.findByElement(context, schema, element, qualifier);
+            if (mf != null) {
+                fields.add(mf);
+            }
+        }
+        return fields;
+    }
+
+    private static List<UUID> getUuidsFromStrings(List<String> collSel) {
+        List<UUID> uuids = new ArrayList<>();
+        for (String s: collSel) {
+            try {
+                uuids.add(UUID.fromString(s));
+            } catch (IllegalArgumentException e) {
+                log.warn("Invalid collection UUID: " + s);
+            }
+        }
+        return uuids;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/Filter.java b/dspace-api/src/main/java/org/dspace/contentreport/Filter.java
new file mode 100644
index 0000000000..e5fa588140
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/Filter.java
@@ -0,0 +1,399 @@
+/**
+ * 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.contentreport;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.BiPredicate;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authorize.factory.AuthorizeServiceFactory;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Bundle;
+import org.dspace.content.Item;
+import org.dspace.contentreport.ItemFilterUtil.BundleName;
+import org.dspace.core.Context;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Available filters for the Filtered Collections and Filtered Items reports.
+ * In this enum, each item corresponds to a separate property, not values of
+ * a single property, hence the @JsonProperty applied to each of them.
+ * For each item, the annotation value is read through reflection and copied into
+ * the id property, which eliminates repetitions, hence reducing the risk or errors.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public enum Filter {
+
+    @JsonProperty("is_item")
+    IS_ITEM(FilterCategory.PROPERTY, (context, item) -> true),
+    @JsonProperty("is_withdrawn")
+    IS_WITHDRAWN(FilterCategory.PROPERTY, (context, item) -> item.isWithdrawn()),
+    @JsonProperty("is_not_withdrawn")
+    IS_NOT_WITHDRAWN(FilterCategory.PROPERTY, (context, item) -> !item.isWithdrawn()),
+    @JsonProperty("is_discoverable")
+    IS_DISCOVERABLE(FilterCategory.PROPERTY, (context, item) -> item.isDiscoverable()),
+    @JsonProperty("is_not_discoverable")
+    IS_NOT_DISCOVERABLE(FilterCategory.PROPERTY, (context, item) -> !item.isDiscoverable()),
+
+    /**
+     * Matches items having multiple original bitstreams.
+     */
+    @JsonProperty("has_multiple_originals")
+    HAS_MULTIPLE_ORIGINALS(FilterCategory.BITSTREAM, (context, item) ->
+        ItemFilterUtil.countOriginalBitstream(item) > 1),
+    /**
+     * Matches items having no original bitstreams.
+     */
+    @JsonProperty("has_no_originals")
+    HAS_NO_ORIGINALS(FilterCategory.BITSTREAM, (context, item) -> ItemFilterUtil.countOriginalBitstream(item) == 0),
+    /**
+     * Matches items having exactly one original bitstream.
+     */
+    @JsonProperty("has_one_original")
+    HAS_ONE_ORIGINAL(FilterCategory.BITSTREAM, (context, item) -> ItemFilterUtil.countOriginalBitstream(item) == 1),
+
+    /**
+     * Matches items having bitstreams with a MIME type that matches one defined in the "rest.report-mime-document"
+     * configuration property.
+     */
+    @JsonProperty("has_doc_original")
+    HAS_DOC_ORIGINAL(FilterCategory.BITSTREAM_MIME, (context, item) ->
+        ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes()) > 0),
+    /**
+     * Matches items having bitstreams with a MIME type starting with "image" (e.g., image/jpeg, image/png).
+     */
+    @JsonProperty("has_image_original")
+    HAS_IMAGE_ORIGINAL(FilterCategory.BITSTREAM_MIME, (context, item) ->
+        ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image") > 0),
+    /**
+     * Matches items having bitstreams with a MIME type other than document (cf. HAS_DOCUMENT above) or image
+     * (cf. HAS_IMAGE_ORIGINAL above).
+     */
+    @JsonProperty("has_unsupp_type")
+    HAS_UNSUPPORTED_TYPE(FilterCategory.BITSTREAM_MIME, (context, item) -> {
+        int bitCount = ItemFilterUtil.countOriginalBitstream(item);
+        if (bitCount == 0) {
+            return false;
+        }
+        int docCount = ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
+        int imgCount = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image");
+        return (bitCount - docCount - imgCount) > 0;
+    }),
+    /**
+     * Matches items having bitstreams of multiple types (document, image, other).
+     */
+    @JsonProperty("has_mixed_original")
+    HAS_MIXED_ORIGINAL(FilterCategory.BITSTREAM_MIME, (context, item) -> {
+        int countBit = ItemFilterUtil.countOriginalBitstream(item);
+        if (countBit <= 1) {
+            return false;
+        }
+        int countDoc = ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
+        if (countDoc > 0) {
+            return countDoc != countBit;
+        }
+        int countImg = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image");
+        if (countImg > 0) {
+            return countImg != countBit;
+        }
+        return false;
+    }),
+    @JsonProperty("has_pdf_original")
+    HAS_PDF_ORIGINAL(FilterCategory.BITSTREAM_MIME, (context, item) ->
+        ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.MIMES_PDF) > 0),
+    @JsonProperty("has_jpg_original")
+    HAS_JPEG_ORIGINAL(FilterCategory.BITSTREAM_MIME, (context, item) ->
+        ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.MIMES_JPG) > 0),
+    /**
+     * Matches items having at least one PDF of size less than 20 kb (configurable in rest.cfg).
+     */
+    @JsonProperty("has_small_pdf")
+    HAS_SMALL_PDF(FilterCategory.BITSTREAM_MIME, (context, item) ->
+        ItemFilterUtil.countBitstreamSmallerThanMinSize(
+                context, BundleName.ORIGINAL, item, ItemFilterUtil.MIMES_PDF, "rest.report-pdf-min-size") > 0),
+    /**
+     * Matches items having at least one PDF of size more than 25 Mb (configurable in rest.cfg).
+     */
+    @JsonProperty("has_large_pdf")
+    HAS_LARGE_PDF(FilterCategory.BITSTREAM_MIME, (context, item) ->
+        ItemFilterUtil.countBitstreamLargerThanMaxSize(
+                context, BundleName.ORIGINAL,  item, ItemFilterUtil.MIMES_PDF, "rest.report-pdf-max-size") > 0),
+    /**
+     * Matches items having at least one non-text bitstream.
+     */
+    @JsonProperty("has_doc_without_text")
+    HAS_DOC_WITHOUT_TEXT(FilterCategory.BITSTREAM_MIME, (context, item) -> {
+        int countDoc = ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
+        if (countDoc == 0) {
+            return false;
+        }
+        int countText = ItemFilterUtil.countBitstream(BundleName.TEXT, item);
+        return countDoc > countText;
+    }),
+
+    /**
+     * Matches items having at least one image, but all of supported types.
+     */
+    @JsonProperty("has_only_supp_image_type")
+    HAS_ONLY_SUPPORTED_IMAGE_TYPE(FilterCategory.MIME, (context, item) -> {
+        int imageCount = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image/");
+        if (imageCount == 0) {
+            return false;
+        }
+        int suppImageCount = ItemFilterUtil.countOriginalBitstreamMime(
+                context, item, ItemFilterUtil.getSupportedImageMimeTypes());
+        return (imageCount == suppImageCount);
+    }),
+    /**
+     * Matches items having at least one image of an unsupported type.
+     */
+    @JsonProperty("has_unsupp_image_type")
+    HAS_UNSUPPORTED_IMAGE_TYPE(FilterCategory.MIME, (context, item) -> {
+        int imageCount = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image/");
+        if (imageCount == 0) {
+            return false;
+        }
+        int suppImageCount = ItemFilterUtil.countOriginalBitstreamMime(
+                context, item, ItemFilterUtil.getSupportedImageMimeTypes());
+        return (imageCount - suppImageCount) > 0;
+    }),
+    /**
+     * Matches items having at least one document, but all of supported types.
+     */
+    @JsonProperty("has_only_supp_doc_type")
+    HAS_ONLY_SUPPORTED_DOC_TYPE(FilterCategory.MIME, (context, item) -> {
+        int docCount = ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
+        if (docCount == 0) {
+            return false;
+        }
+        int suppDocCount = ItemFilterUtil.countOriginalBitstreamMime(
+                context, item, ItemFilterUtil.getSupportedDocumentMimeTypes());
+        return docCount == suppDocCount;
+    }),
+    /**
+     * Matches items having at least one document of an unsupported type.
+     */
+    @JsonProperty("has_unsupp_doc_type")
+    HAS_UNSUPPORTED_DOC_TYPE(FilterCategory.MIME, (context, item) -> {
+        int docCount = ItemFilterUtil.countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
+        if (docCount == 0) {
+            return false;
+        }
+        int suppDocCount = ItemFilterUtil.countOriginalBitstreamMime(
+                context, item, ItemFilterUtil.getSupportedDocumentMimeTypes());
+        return (docCount - suppDocCount) > 0;
+    }),
+
+    /**
+     * Matches items having at least one unsupported bundle.
+     */
+    @JsonProperty("has_unsupported_bundle")
+    HAS_UNSUPPORTED_BUNDLE(FilterCategory.BUNDLE, (context, item) -> {
+        String[] bundleList = DSpaceServicesFactory.getInstance().getConfigurationService()
+                .getArrayProperty("rest.report-supp-bundles");
+        return ItemFilterUtil.hasUnsupportedBundle(item, bundleList);
+    }),
+    /**
+     * Matches items having at least one thumbnail of size less than 400 bytes (configurable in rest.cfg).
+     */
+    @JsonProperty("has_small_thumbnail")
+    HAS_SMALL_THUMBNAIL(FilterCategory.BUNDLE, (context, item) ->
+        ItemFilterUtil.countBitstreamSmallerThanMinSize(
+                context, BundleName.THUMBNAIL, item, ItemFilterUtil.MIMES_JPG, "rest.report-thumbnail-min-size") > 0),
+    /**
+     * Matches items having at least one original without a thumbnail.
+     */
+    @JsonProperty("has_original_without_thumbnail")
+    HAS_ORIGINAL_WITHOUT_THUMBNAIL(FilterCategory.BUNDLE, (context, item) -> {
+        int countBit = ItemFilterUtil.countOriginalBitstream(item);
+        if (countBit == 0) {
+            return false;
+        }
+        int countThumb = ItemFilterUtil.countBitstream(BundleName.THUMBNAIL, item);
+        return countBit > countThumb;
+    }),
+    /**
+     * Matches items having at least one non-JPEG thumbnail.
+     */
+    @JsonProperty("has_invalid_thumbnail_name")
+    HAS_INVALID_THUMBNAIL_NAME(FilterCategory.BUNDLE, (context, item) -> {
+        List<String> originalNames = ItemFilterUtil.getBitstreamNames(BundleName.ORIGINAL, item);
+        List<String> thumbNames = ItemFilterUtil.getBitstreamNames(BundleName.THUMBNAIL, item);
+        if (thumbNames.size() != originalNames.size()) {
+            return false;
+        }
+        return originalNames.stream()
+                .anyMatch(name -> !thumbNames.contains(name + ".jpg") && !thumbNames.contains(name + ".jpeg"));
+    }),
+    /**
+     * Matches items having at least one non-generated thumbnail.
+     */
+    @JsonProperty("has_non_generated_thumb")
+    HAS_NON_GENERATED_THUMBNAIL(FilterCategory.BUNDLE, (context, item) -> {
+        String[] generatedThumbDesc = DSpaceServicesFactory.getInstance().getConfigurationService()
+                .getArrayProperty("rest.report-gen-thumbnail-desc");
+        int countThumb = ItemFilterUtil.countBitstream(BundleName.THUMBNAIL, item);
+        if (countThumb == 0) {
+            return false;
+        }
+        int countGen = ItemFilterUtil.countBitstreamByDesc(BundleName.THUMBNAIL, item, generatedThumbDesc);
+        return (countThumb > countGen);
+    }),
+    /**
+     * Matches items having no licence-typed bitstreams.
+     */
+    @JsonProperty("no_license")
+    NO_LICENSE(FilterCategory.BUNDLE, (context, item) ->
+        ItemFilterUtil.countBitstream(BundleName.LICENSE, item) == 0),
+    /**
+     * Matches items having licence documentation (a licence bitstream named other than license.txt).
+     */
+    @JsonProperty("has_license_documentation")
+    HAS_LICENSE_DOCUMENTATION(FilterCategory.BUNDLE, (context, item) -> {
+        List<String> names = ItemFilterUtil.getBitstreamNames(BundleName.LICENSE, item);
+        return names.stream()
+                .anyMatch(name -> !name.equals("license.txt"));
+    }),
+
+    /**
+     * Matches items having at least one original with restricted access.
+     */
+    @JsonProperty("has_restricted_original")
+    HAS_RESTRICTED_ORIGINAL(FilterCategory.PERMISSION, (context, item) -> {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(BundleName.ORIGINAL.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .anyMatch(bit -> {
+                    try {
+                        if (!getAuthorizeService()
+                                .authorizeActionBoolean(getAnonymousContext(), bit, org.dspace.core.Constants.READ)) {
+                            return true;
+                        }
+                    } catch (SQLException e) {
+                        getLog().warn("SQL Exception testing original bitstream access " + e.getMessage(), e);
+                    }
+                    return false;
+                });
+    }),
+    /**
+     * Matches items having at least one thumbnail with restricted access.
+     */
+    @JsonProperty("has_restricted_thumbnail")
+    HAS_RESTRICTED_THUMBNAIL(FilterCategory.PERMISSION, (context, item) -> {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(BundleName.THUMBNAIL.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .anyMatch(bit -> {
+                    try {
+                        if (!getAuthorizeService()
+                                .authorizeActionBoolean(getAnonymousContext(), bit, org.dspace.core.Constants.READ)) {
+                            return true;
+                        }
+                    } catch (SQLException e) {
+                        getLog().warn("SQL Exception testing thumbnail bitstream access " + e.getMessage(), e);
+                    }
+                    return false;
+                });
+    }),
+    /**
+     * Matches items having metadata with restricted access.
+     */
+    @JsonProperty("has_restricted_metadata")
+    HAS_RESTRICTED_METADATA(FilterCategory.PERMISSION, (context, item) -> {
+        try {
+            return !getAuthorizeService()
+                    .authorizeActionBoolean(getAnonymousContext(), item, org.dspace.core.Constants.READ);
+        } catch (SQLException e) {
+            getLog().warn("SQL Exception testing item metadata access " + e.getMessage(), e);
+            return false;
+        }
+    });
+
+    private static final Logger log = LogManager.getLogger();
+    private static AuthorizeService authorizeService;
+    private static Context anonymousContext;
+
+    private String id;
+    private FilterCategory category;
+    private BiPredicate<Context, Item> itemTester;
+
+    Filter(FilterCategory category, BiPredicate<Context, Item> itemTester) {
+        try {
+            JsonProperty jp = getClass().getField(name()).getAnnotation(JsonProperty.class);
+            id = Optional.ofNullable(jp).map(JsonProperty::value).orElse(name());
+        } catch (Exception e) {
+            id = name();
+        }
+        this.category = category;
+        this.itemTester = itemTester;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public FilterCategory getCategory() {
+        return category;
+    }
+
+    public boolean testItem(Context context, Item item) {
+        return itemTester.test(context, item);
+    }
+
+    private static Logger getLog() {
+        return log;
+    }
+
+    private static AuthorizeService getAuthorizeService() {
+        if (authorizeService == null) {
+            authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
+        }
+        return authorizeService;
+    }
+
+    private static Context getAnonymousContext() {
+        if (anonymousContext == null) {
+            anonymousContext = new Context();
+        }
+        return anonymousContext;
+    }
+
+    @JsonCreator
+    public static Filter get(String id) {
+        return Arrays.stream(values())
+                .filter(item -> Objects.equals(item.id, id))
+                .findFirst()
+                .orElse(null);
+    }
+
+    public static Set<Filter> getFilters(String filters) {
+        String[] ids = Optional.ofNullable(filters).orElse("").split("[^a-z_]+");
+        Set<Filter> set = Arrays.stream(ids)
+                .map(Filter::get)
+                .filter(f -> f != null)
+                .collect(Collectors.toCollection(() -> EnumSet.noneOf(Filter.class)));
+        if (set == null) {
+            set = EnumSet.noneOf(Filter.class);
+        }
+        return set;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/FilterCategory.java b/dspace-api/src/main/java/org/dspace/contentreport/FilterCategory.java
new file mode 100644
index 0000000000..8823ff3141
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/FilterCategory.java
@@ -0,0 +1,50 @@
+/**
+ * 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.contentreport;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Identifies the category/section of filters defined in the {@link Filter} enum.
+ * This enum will be used when/if the structured filter definitions are returned to
+ * the Angular layer through a REST endpoint.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public enum FilterCategory {
+
+    PROPERTY("property"),
+    BITSTREAM("bitstream"),
+    BITSTREAM_MIME("bitstream_mime"),
+    MIME("mime"),
+    BUNDLE("bundle"),
+    PERMISSION("permission");
+
+    private String id;
+    private List<Filter> filters;
+
+    FilterCategory(String id) {
+        this.id = id;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public List<Filter> getFilters() {
+        if (filters == null) {
+            filters = Arrays.stream(Filter.values())
+                    .filter(f -> f.getCategory() == this)
+                    .collect(Collectors.toUnmodifiableList());
+        }
+        return filters;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/FilteredCollection.java b/dspace-api/src/main/java/org/dspace/contentreport/FilteredCollection.java
new file mode 100644
index 0000000000..21a39778ba
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/FilteredCollection.java
@@ -0,0 +1,219 @@
+/**
+ * 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.contentreport;
+
+import java.io.Serializable;
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Optional;
+
+/**
+ * This class represents an entry in the Filtered Collections report.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredCollection implements Cloneable, Serializable {
+
+    private static final long serialVersionUID = -231735620268582719L;
+
+    /** Name of the collection */
+    private String label;
+    /** Handle of the collection, used to make it clickable from the generated report */
+    private String handle;
+    /** Name of the owning community */
+    private String communityLabel;
+    /** Handle of the owning community, used to make it clickable from the generated report */
+    private String communityHandle;
+    /** Total number of items in the collection */
+    private int totalItems;
+    /** Number of filtered items per requested filter in the collection */
+    private Map<Filter, Integer> values = new EnumMap<>(Filter.class);
+    /** Number of items in the collection that match all requested filters */
+    private int allFiltersValue;
+    /**
+     * Indicates whether this object is protected against further changes.
+     * This is used in computing summary data in the parent FilteredCollectionsRest class.
+     */
+    private boolean sealed;
+
+    /**
+     * Shortcut method that builds a FilteredCollectionRest instance
+     * from its building blocks.
+     * @param label Name of the collection
+     * @param handle Handle of the collection
+     * @param communityLabel Name of the owning community
+     * @param communityHandle Handle of the owning community
+     * @param totalItems Total number of items in the collection
+     * @param allFiltersValue Number of items in the collection that match all requested filters
+     * @param values Number of filtered items per requested filter in the collection
+     * @param doSeal true if the collection must be sealed immediately
+     * @return a FilteredCollectionRest instance built from the provided parameters
+     */
+    public static FilteredCollection of(String label, String handle,
+            String communityLabel, String communityHandle,
+            int totalItems, int allFiltersValue, Map<Filter, Integer> values, boolean doSeal) {
+        var coll = new FilteredCollection();
+        coll.label = label;
+        coll.handle = handle;
+        coll.communityLabel = communityLabel;
+        coll.communityHandle = communityHandle;
+        coll.totalItems = totalItems;
+        coll.allFiltersValue = allFiltersValue;
+        Optional.ofNullable(values).ifPresent(vs -> vs.forEach(coll::addValue));
+        if (doSeal) {
+            coll.seal();
+        }
+        return coll;
+    }
+
+    /**
+     * Returns the item counts per filter.
+     * If this object is sealed, a defensive copy will be returned.
+     *
+     * @return the item counts per filter
+     */
+    public Map<Filter, Integer> getValues() {
+        if (sealed) {
+            return new EnumMap<>(values);
+        }
+        return values;
+    }
+
+    /**
+     * Increments a filtered item count for a given filter.
+     *
+     * @param filter Filter to add to the requested filters in this collection
+     * @param delta Number by which the filtered item count must be incremented
+     * for the requested filter
+     */
+    public void addValue(Filter filter, int delta) {
+        checkSealed();
+        Integer oldValue = values.getOrDefault(filter, Integer.valueOf(0));
+        int newValue = oldValue.intValue() + delta;
+        values.put(filter, Integer.valueOf(newValue));
+    }
+
+    /**
+     * Sets all filtered item counts for this collection.
+     * The contents are copied into this object's internal Map, which is protected against
+     * further tampering with the provided Map.
+     *
+     * @param values Values that replace the current ones
+     */
+    public void setValues(Map<? extends Filter, ? extends Integer> values) {
+        checkSealed();
+        this.values.clear();
+        this.values.putAll(values);
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        checkSealed();
+        this.label = label;
+    }
+
+    public String getHandle() {
+        return handle;
+    }
+
+    public void setHandle(String handle) {
+        checkSealed();
+        this.handle = handle;
+    }
+
+    public String getCommunityLabel() {
+        return communityLabel;
+    }
+
+    public void setCommunityLabel(String communityLabel) {
+        checkSealed();
+        this.communityLabel = communityLabel;
+    }
+
+    public String getCommunityHandle() {
+        return communityHandle;
+    }
+
+    public void setCommunityHandle(String communityHandle) {
+        checkSealed();
+        this.communityHandle = communityHandle;
+    }
+
+    public int getTotalItems() {
+        return totalItems;
+    }
+
+    public void setTotalItems(int totalItems) {
+        checkSealed();
+        this.totalItems = totalItems;
+    }
+
+    public int getAllFiltersValue() {
+        return allFiltersValue;
+    }
+
+    /**
+     * Increments the count of items matching all filters.
+     *
+     * @param delta Number by which the count must be incremented
+     */
+    public void addAllFiltersValue(int delta) {
+        checkSealed();
+        allFiltersValue++;
+    }
+
+    /**
+     * Replaces the count of items matching all filters.
+     *
+     * @param allFiltersValue Number that replaces the current item count
+     */
+    public void setAllFiltersValue(int allFiltersValue) {
+        checkSealed();
+        this.allFiltersValue = allFiltersValue;
+    }
+
+    public boolean getSealed() {
+        return sealed;
+    }
+
+    /**
+     * Seals this filtered collection object.
+     * No changes to this object can be made afterwards. Any attempt will throw
+     * an IllegalStateException.
+     */
+    public void seal() {
+        sealed = true;
+    }
+
+    private void checkSealed() {
+        if (sealed) {
+            throw new IllegalStateException("This filtered collection record is sealed"
+                    + " and cannot be modified anymore. You can apply changes to a non-sealed clone.");
+        }
+    }
+
+    /**
+     * Returns a non-sealed clone of this filtered collection record.
+     *
+     * @return a new non-sealed FilteredCollectionRest instance containing
+     * all attribute values of this object
+     */
+    @Override
+    public FilteredCollection clone() {
+        var clone = new FilteredCollection();
+        clone.label = label;
+        clone.handle = handle;
+        clone.values.putAll(values);
+        clone.allFiltersValue = allFiltersValue;
+        return clone;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/FilteredCollections.java b/dspace-api/src/main/java/org/dspace/contentreport/FilteredCollections.java
new file mode 100644
index 0000000000..058d1546d1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/FilteredCollections.java
@@ -0,0 +1,107 @@
+/**
+ * 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.contentreport;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * This class represents the complete result of a Filtered Collections report query.
+ * In addition to the list of FilteredCollection entries, it contains the lazily computed
+ * summary to be included in the completed report.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredCollections implements Serializable {
+
+    private static final long serialVersionUID = 3622651208704009095L;
+
+    /** Collections included in the report */
+    private List<FilteredCollection> collections = new ArrayList<>();
+    /**
+     * Summary generated by adding up data for each filter included in the report.
+     * It will be regenerated if any non-sealed collection item is found in
+     * the {@link #collections} collection attribute.
+     */
+    private FilteredCollection summary;
+
+    /**
+     * Shortcut method that builds a FilteredCollectionsRest instance
+     * from its building blocks.
+     * @param collections a list of FilteredCollectionRest instances
+     * @return a FilteredCollectionsRest instance built from the provided parameters
+     */
+    public static FilteredCollections of(Collection<FilteredCollection> collections) {
+        var colls = new FilteredCollections();
+        Optional.ofNullable(collections).ifPresent(cs -> cs.stream().forEach(colls::addCollection));
+        return colls;
+    }
+
+    /**
+     * Returns a defensive copy of the collections included in this report.
+     *
+     * @return the collections included in this report
+     */
+    public List<FilteredCollection> getCollections() {
+        return new ArrayList<>(collections);
+    }
+
+    /**
+     * Adds a {@link FilteredCollectionRest} object to this report.
+     *
+     * @param coll {@link FilteredCollectionRest} to add to this report
+     */
+    public void addCollection(FilteredCollection coll) {
+        summary = null;
+        collections.add(coll);
+    }
+
+    /**
+     * Sets all collections for this report.
+     * The contents are copied into this object's internal list, which is protected against
+     * further tampering with the provided list.
+     *
+     * @param collections Values that replace the current ones
+     */
+    public void setCollections(List<FilteredCollection> collections) {
+        summary = null;
+        this.collections.clear();
+        this.collections.addAll(collections);
+    }
+
+    /**
+     * Returns the report summary.
+     * If the summary has not been computed yet and/or the report includes non-sealed collections,
+     * it will be regenerated.
+     *
+     * @return the generated report summary
+     */
+    public FilteredCollection getSummary() {
+        boolean needsRefresh = summary == null || collections.stream().anyMatch(c -> !c.getSealed());
+        if (needsRefresh) {
+            summary = new FilteredCollection();
+            for (var coll : collections) {
+                coll.getValues().forEach(summary::addValue);
+            }
+            int total = collections.stream()
+                    .mapToInt(FilteredCollection::getTotalItems)
+                    .sum();
+            summary.setTotalItems(total);
+            int allFilters = collections.stream()
+                    .mapToInt(FilteredCollection::getAllFiltersValue)
+                    .sum();
+            summary.setAllFiltersValue(allFilters);
+            summary.seal();
+        }
+        return summary;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/FilteredItems.java b/dspace-api/src/main/java/org/dspace/contentreport/FilteredItems.java
new file mode 100644
index 0000000000..71c4c74a3e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/FilteredItems.java
@@ -0,0 +1,70 @@
+/**
+ * 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.contentreport;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.content.Item;
+
+/**
+ * This class represents a list of items for a  Filtered Items report query.
+ * Since the underlying list should correspond to only a page of results,
+ * the total number of items found through the query is included in this report.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredItems implements Serializable {
+
+    private static final long serialVersionUID = 7980375013177658249L;
+
+    /** Items included in the report */
+    private List<Item> items = new ArrayList<>();
+    /** Total item count (for pagination) */
+    private long itemCount;
+
+    /**
+     * Returns a defensive copy of the items included in this report.
+     *
+     * @return the items included in this report
+     */
+    public List<Item> getItems() {
+        return new ArrayList<>(items);
+    }
+
+    /**
+     * Adds an {@link ItemRest} object to this report.
+     *
+     * @param item {@link ItemRest} to add to this report
+     */
+    public void addItem(Item item) {
+        items.add(item);
+    }
+
+    /**
+     * Sets all items for this report.
+     * The contents are copied into this object's internal list, which is protected
+     * against further tampering with the provided list.
+     *
+     * @param items Values that replace the current ones
+     */
+    public void setItems(List<Item> items) {
+        this.items.clear();
+        this.items.addAll(items);
+    }
+
+    public long getItemCount() {
+        return itemCount;
+    }
+
+    public void setItemCount(long itemCount) {
+        this.itemCount = itemCount;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/FilteredItemsQuery.java b/dspace-api/src/main/java/org/dspace/contentreport/FilteredItemsQuery.java
new file mode 100644
index 0000000000..3dc9faed1c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/FilteredItemsQuery.java
@@ -0,0 +1,115 @@
+/**
+ * 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.contentreport;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+
+/**
+ * Structured query contents for the Filtered Items report
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredItemsQuery {
+
+    private List<String> collections = new ArrayList<>();
+    private List<QueryPredicate> queryPredicates = new ArrayList<>();
+    private long offset;
+    private int pageLimit;
+    private Set<Filter> filters = EnumSet.noneOf(Filter.class);
+    private List<String> additionalFields = new ArrayList<>();
+
+    /**
+     * Shortcut method that builds a FilteredItemsQuery instance
+     * from its building blocks.
+     * @param collectionUuids collection UUIDs to add
+     * @param predicates query predicates used to filter existing items
+     * @param pageLimit number of items per page
+     * @param filters filters to apply to existing items
+     * The filters mapping to true will be applied, others (either missing or
+     * mapping to false) will not.
+     * @param additionalFields additional fields to display in the resulting report
+     * @return a FilteredItemsQuery instance built from the provided parameters
+     */
+    public static FilteredItemsQuery of(Collection<String> collectionUuids,
+            Collection<QueryPredicate> predicates, long offset, int pageLimit,
+            Collection<Filter> filters, Collection<String> additionalFields) {
+        var query = new FilteredItemsQuery();
+        Optional.ofNullable(collectionUuids).ifPresent(query.collections::addAll);
+        Optional.ofNullable(predicates).ifPresent(query.queryPredicates::addAll);
+        query.offset = offset;
+        query.pageLimit = pageLimit;
+        Optional.ofNullable(filters).ifPresent(query.filters::addAll);
+        Optional.ofNullable(additionalFields).ifPresent(query.additionalFields::addAll);
+        return query;
+    }
+
+    public List<String> getCollections() {
+        return collections;
+    }
+
+    public void setCollections(List<String> collections) {
+        this.collections.clear();
+        if (collections != null) {
+            this.collections.addAll(collections);
+        }
+    }
+
+    public List<QueryPredicate> getQueryPredicates() {
+        return queryPredicates;
+    }
+
+    public void setQueryPredicates(List<QueryPredicate> queryPredicates) {
+        this.queryPredicates.clear();
+        if (queryPredicates != null) {
+            this.queryPredicates.addAll(queryPredicates);
+        }
+    }
+
+    public long getOffset() {
+        return offset;
+    }
+
+    public void setOffset(long offset) {
+        this.offset = offset;
+    }
+
+    public int getPageLimit() {
+        return pageLimit;
+    }
+
+    public void setPageLimit(int pageLimit) {
+        this.pageLimit = pageLimit;
+    }
+
+    public Set<Filter> getFilters() {
+        return filters;
+    }
+
+    public void setFilters(Set<Filter> filters) {
+        this.filters.clear();
+        if (filters != null) {
+            this.filters.addAll(filters);
+        }
+    }
+
+    public List<String> getAdditionalFields() {
+        return additionalFields;
+    }
+
+    public void setAdditionalFields(List<String> additionalFields) {
+        this.additionalFields.clear();
+        if (additionalFields != null) {
+            this.additionalFields.addAll(additionalFields);
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/ItemFilterUtil.java b/dspace-api/src/main/java/org/dspace/contentreport/ItemFilterUtil.java
new file mode 100644
index 0000000000..20c714fcf3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/ItemFilterUtil.java
@@ -0,0 +1,353 @@
+/**
+ * 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.contentreport;
+
+import static org.dspace.content.Item.ANY;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.Item;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Utility methods for applying some of the filters defined in the {@link Filter} enum.
+ *
+ * @author Jean-François Morin (Université Laval) (port to DSpace 7.x)
+ * @author Terry Brady, Georgetown University (original code in DSpace 6.x)
+ */
+public class ItemFilterUtil {
+
+    protected static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+    private static final Logger log = LogManager.getLogger(ItemFilterUtil.class);
+    public static final String[] MIMES_PDF = {"application/pdf"};
+    public static final String[] MIMES_JPG = {"image/jpeg"};
+
+    /**
+     * Supported bundle types.
+     * N.B.: Bundle names are used in metadata as they are named here.
+     * Do NOT change these names, the name() method is invoked at multiple
+     * locations in this class and enum Filter.
+     * If these names are to change, the name() invocations shall be changed
+     * so that they refer to these unchanged names, likely through a String property.
+     */
+    enum BundleName {
+        ORIGINAL, TEXT, LICENSE, THUMBNAIL;
+    }
+
+    private ItemFilterUtil() {}
+
+    static String[] getDocumentMimeTypes() {
+        return DSpaceServicesFactory.getInstance().getConfigurationService()
+                .getArrayProperty("rest.report-mime-document");
+    }
+
+    static String[] getSupportedDocumentMimeTypes() {
+        return DSpaceServicesFactory.getInstance().getConfigurationService()
+                .getArrayProperty("rest.report-mime-document-supported");
+    }
+
+    static String[] getSupportedImageMimeTypes() {
+        return DSpaceServicesFactory.getInstance().getConfigurationService()
+                .getArrayProperty("rest.report-mime-document-image");
+    }
+
+    /**
+     * Counts the original bitstreams of a given item.
+     * @param item Provided item
+     * @return the number of original bitstreams in the item
+     */
+    static int countOriginalBitstream(Item item) {
+        return countBitstream(BundleName.ORIGINAL, item);
+    }
+
+    /**
+     * Counts the bitstreams of a given item for a specific type.
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @return the number of matching bitstreams in the item
+     */
+    static int countBitstream(BundleName bundleName, Item item) {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .mapToInt(bundle -> bundle.getBitstreams().size())
+                .sum();
+    }
+
+    /**
+     * Retrieves the bitstream names of an given item for a specific bundle type.
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @return the names of matching bitstreams in the item
+     */
+    static List<String> getBitstreamNames(BundleName bundleName, Item item) {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .map(Bitstream::getName)
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Counts the original bitstreams of a given item matching one of a list of specific MIME types.
+     * @param context DSpace context
+     * @param item Provided item
+     * @param mimeList List of MIME types to filter bitstreams
+     * @return number of matching original bitstreams
+     */
+    static int countOriginalBitstreamMime(Context context, Item item, String[] mimeList) {
+        return countBitstreamMime(context, BundleName.ORIGINAL, item, mimeList);
+    }
+
+    /**
+     * Counts the bitstreams of a given item for a specific type matching one of a list of specific MIME types.
+     * @param context DSpace context
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @param mimeList List of MIME types to filter bitstreams
+     * @return number of matching bitstreams
+     */
+    static int countBitstreamMime(Context context, BundleName bundleName, Item item, String[] mimeList) {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .mapToInt(bit -> {
+                    int count = 0;
+                    for (String mime : mimeList) {
+                        try {
+                            if (bit.getFormat(context).getMIMEType().equals(mime.trim())) {
+                                count++;
+                            }
+                        } catch (SQLException e) {
+                            log.error("Get format error for bitstream " + bit.getName());
+                        }
+                    }
+                    return count;
+                })
+                .sum();
+    }
+
+    /**
+     * Counts the bitstreams of a given item for a specific type matching one of a list of specific descriptions.
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @param descList List of descriptions to filter bitstreams
+     * @return number of matching bitstreams
+     */
+    static int countBitstreamByDesc(BundleName bundleName, Item item, String[] descList) {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .filter(bit -> bit.getDescription() != null)
+                .mapToInt(bit -> {
+                    int count = 0;
+                    for (String desc : descList) {
+                        String bitDesc = bit.getDescription();
+                        if (bitDesc.equals(desc.trim())) {
+                            count++;
+                        }
+                    }
+                    return count;
+                })
+                .sum();
+    }
+
+    /**
+     * Counts the bitstreams of a given item smaller than a given size for a specific type
+     * matching one of a list of specific MIME types.
+     * @param context DSpace context
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @param mimeList List of MIME types to filter bitstreams
+     * @param prop Configurable property providing the size to filter bitstreams
+     * @return number of matching bitstreams
+     */
+    static int countBitstreamSmallerThanMinSize(
+            Context context, BundleName bundleName, Item item, String[] mimeList, String prop) {
+        long size = DSpaceServicesFactory.getInstance().getConfigurationService().getLongProperty(prop);
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .mapToInt(bit -> {
+                    int count = 0;
+                    for (String mime : mimeList) {
+                        try {
+                            if (bit.getFormat(context).getMIMEType().equals(mime.trim())) {
+                                if (bit.getSizeBytes() < size) {
+                                    count++;
+                                }
+                            }
+                        } catch (SQLException e) {
+                            log.error(e.getMessage(), e);
+                        }
+                    }
+                    return count;
+                })
+                .sum();
+    }
+
+    /**
+     * Counts the bitstreams of a given item larger than a given size for a specific type
+     * matching one of a list of specific MIME types.
+     * @param context DSpace context
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @param mimeList List of MIME types to filter bitstreams
+     * @param prop Configurable property providing the size to filter bitstreams
+     * @return number of matching bitstreams
+     */
+    static int countBitstreamLargerThanMaxSize(
+            Context context, BundleName bundleName, Item item, String[] mimeList, String prop) {
+        long size = DSpaceServicesFactory.getInstance().getConfigurationService().getLongProperty(prop);
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .mapToInt(bit -> {
+                    int count = 0;
+                    for (String mime : mimeList) {
+                        try {
+                            if (bit.getFormat(context).getMIMEType().equals(mime.trim())) {
+                                if (bit.getSizeBytes() > size) {
+                                    count++;
+                                }
+                            }
+                        } catch (SQLException e) {
+                            log.error(e.getMessage(), e);
+                        }
+                    }
+                    return count;
+                })
+                .sum();
+    }
+
+    /**
+     * Counts the original bitstreams of a given item whose MIME type starts with a specific prefix.
+     * @param context DSpace context
+     * @param item Provided item
+     * @param prefix Prefix to filter bitstreams
+     * @return number of matching original bitstreams
+     */
+    static int countOriginalBitstreamMimeStartsWith(Context context, Item item, String prefix) {
+        return countBitstreamMimeStartsWith(context, BundleName.ORIGINAL, item, prefix);
+    }
+
+    /**
+     * Counts the bitstreams of a given item for a specific type whose MIME type starts with a specific prefix.
+     * @param context DSpace context
+     * @param bundleName Type of bundle to filter bitstreams
+     * @param item Provided item
+     * @param prefix Prefix to filter bitstreams
+     * @return number of matching bitstreams
+     */
+    static int countBitstreamMimeStartsWith(Context context, BundleName bundleName, Item item, String prefix) {
+        return item.getBundles().stream()
+                .filter(bundle -> bundle.getName().equals(bundleName.name()))
+                .map(Bundle::getBitstreams)
+                .flatMap(List::stream)
+                .mapToInt(bit -> {
+                    int count = 0;
+                    try {
+                        if (bit.getFormat(context).getMIMEType().startsWith(prefix)) {
+                            count++;
+                        }
+                    } catch (SQLException e) {
+                        log.error(e.getMessage(), e);
+                    }
+                    return count;
+                })
+                .sum();
+    }
+
+    /**
+     * Returns true if a given item has a bundle not matching a specific list of bundles.
+     * @param item Provided item
+     * @param bundleList List of bundle names to filter bundles
+     * @return true if the item has a (non-)matching bundle
+     */
+    static boolean hasUnsupportedBundle(Item item, String[] bundleList) {
+        if (bundleList == null) {
+            return false;
+        }
+        Set<String> bundles = Arrays.stream(bundleList)
+                .collect(Collectors.toSet());
+        return item.getBundles().stream()
+                .anyMatch(bundle -> !bundles.contains(bundle.getName()));
+    }
+
+    static boolean hasOriginalBitstreamMime(Context context, Item item, String[] mimeList) {
+        return hasBitstreamMime(context, BundleName.ORIGINAL, item, mimeList);
+    }
+
+    static boolean hasBitstreamMime(Context context, BundleName bundleName, Item item, String[] mimeList) {
+        return countBitstreamMime(context, bundleName, item, mimeList) > 0;
+    }
+
+    /**
+     * Returns true if a given item has at least one field of a specific list whose value
+     * matches a provided regular expression.
+     * @param item Provided item
+     * @param fieldList List of fields to check
+     * @param regex Regular expression to check field values against
+     * @return true if there is at least one matching field, false otherwise
+     */
+    static boolean hasMetadataMatch(Item item, String fieldList, Pattern regex) {
+        if ("*".equals(fieldList)) {
+            return itemService.getMetadata(item, ANY, ANY, ANY, ANY).stream()
+                    .anyMatch(md -> regex.matcher(md.getValue()).matches());
+        }
+
+        return Arrays.stream(fieldList.split(","))
+                .map(field -> itemService.getMetadataByMetadataString(item, field.trim()))
+                .flatMap(List::stream)
+                .anyMatch(md -> regex.matcher(md.getValue()).matches());
+    }
+
+    /**
+     * Returns true if a given item has at all fields of a specific list whose values
+     * match a provided regular expression.
+     * @param item Provided item
+     * @param fieldList List of fields to check
+     * @param regex Regular expression to check field values against
+     * @return true if all specified fields match, false otherwise
+     */
+    static boolean hasOnlyMetadataMatch(Item item, String fieldList, Pattern regex) {
+        if ("*".equals(fieldList)) {
+            return itemService.getMetadata(item, ANY, ANY, ANY, ANY).stream()
+                    .allMatch(md -> regex.matcher(md.getValue()).matches());
+        }
+
+        return Arrays.stream(fieldList.split(","))
+                .map(field -> itemService.getMetadataByMetadataString(item, field.trim()))
+                .flatMap(List::stream)
+                .allMatch(md -> regex.matcher(md.getValue()).matches());
+    }
+
+    static boolean recentlyModified(Item item, int days) {
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DATE, -days);
+        return cal.getTime().before(item.getLastModified());
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/QueryOperator.java b/dspace-api/src/main/java/org/dspace/contentreport/QueryOperator.java
new file mode 100644
index 0000000000..7cd8606f83
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/QueryOperator.java
@@ -0,0 +1,102 @@
+/**
+ * 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.contentreport;
+
+import java.util.Arrays;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Path;
+import jakarta.persistence.criteria.Predicate;
+import org.apache.commons.lang3.function.TriFunction;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.MetadataValue_;
+import org.dspace.util.DSpacePostgreSQLDialect;
+import org.dspace.util.JpaCriteriaBuilderKit;
+
+/**
+ * Operators available for creating predicates to query the
+ * Filtered Items report
+ * @author Jean-François Morin (Université Laval)
+ */
+public enum QueryOperator {
+
+    EXISTS("exists", true, false,
+        (val, regexClause, jpaKit) -> jpaKit.criteriaBuilder().isNotNull(jpaKit.root().get(MetadataValue_.VALUE))),
+    DOES_NOT_EXIST("doesnt_exist", true, true,
+        (val, regexClause, jpaKit) -> EXISTS.buildJpaPredicate(val, regexClause, jpaKit)),
+    EQUALS("equals", true, false,
+        (val, regexClause, jpaKit) -> jpaKit.criteriaBuilder().equal(jpaKit.root().get(MetadataValue_.VALUE), val)),
+    DOES_NOT_EQUAL("not_equals", true, true,
+        (val, regexClause, jpaKit) -> EQUALS.buildJpaPredicate(val, regexClause, jpaKit)),
+    LIKE("like", true, false,
+        (val, regexClause, jpaKit) -> jpaKit.criteriaBuilder().like(jpaKit.root().get(MetadataValue_.VALUE), val)),
+    NOT_LIKE("not_like", true, true,
+        (val, regexClause, jpaKit) -> LIKE.buildJpaPredicate(val, regexClause, jpaKit)),
+    CONTAINS("contains", true, false,
+        (val, regexClause, jpaKit) -> LIKE.buildJpaPredicate("%" + val + "%", regexClause, jpaKit)),
+    DOES_NOT_CONTAIN("doesnt_contain", true, true,
+        (val, regexClause, jpaKit) -> CONTAINS.buildJpaPredicate(val, regexClause, jpaKit)),
+    MATCHES("matches", false, false,
+        (val, regexClause, jpaKit) -> regexPredicate(val, DSpacePostgreSQLDialect.REGEX_MATCHES, jpaKit)),
+    DOES_NOT_MATCH("doesnt_match", false, false,
+        (val, regexClause, jpaKit) -> regexPredicate(val, DSpacePostgreSQLDialect.REGEX_NOT_MATCHES, jpaKit));
+
+    private final String code;
+    private final TriFunction<String, String, JpaCriteriaBuilderKit<MetadataValue>, Predicate> predicateBuilder;
+    private final boolean usesRegex;
+    private final boolean negate;
+
+    QueryOperator(String code, boolean usesRegex, boolean negate,
+            TriFunction<String, String, JpaCriteriaBuilderKit<MetadataValue>, Predicate> predicateBuilder) {
+        this.code = code;
+        this.usesRegex = usesRegex;
+        this.negate = negate;
+        this.predicateBuilder = predicateBuilder;
+    }
+
+    @JsonProperty
+    public String getCode() {
+        return code;
+    }
+
+    public boolean getUsesRegex() {
+        return usesRegex;
+    }
+
+    public boolean getNegate() {
+        return negate;
+    }
+
+    public Predicate buildJpaPredicate(String val, String regexClause, JpaCriteriaBuilderKit<MetadataValue> jpaKit) {
+        return predicateBuilder.apply(val, regexClause, jpaKit);
+    }
+
+    @JsonCreator
+    public static QueryOperator get(String code) {
+        return Arrays.stream(values())
+                .filter(item -> item.code.equalsIgnoreCase(code))
+                .findFirst()
+                .orElse(null);
+    }
+
+    private static Predicate regexPredicate(String val, String regexFunction,
+            JpaCriteriaBuilderKit<MetadataValue> jpaKit) {
+        // Source: https://stackoverflow.com/questions/24995881/use-regular-expressions-in-jpa-criteriabuilder
+        CriteriaBuilder builder = jpaKit.criteriaBuilder();
+        Expression<String> patternExpression = builder.<String>literal(val);
+        Path<String> path = jpaKit.root().get(MetadataValue_.VALUE);
+        // "matches" comes from the name of the regex function
+        // defined in class DSpacePostgreSQLDialect
+        return builder.equal(builder
+                .function(regexFunction, Boolean.class, path, patternExpression), Boolean.TRUE);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/QueryPredicate.java b/dspace-api/src/main/java/org/dspace/contentreport/QueryPredicate.java
new file mode 100644
index 0000000000..91c9b78255
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/QueryPredicate.java
@@ -0,0 +1,69 @@
+/**
+ * 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.contentreport;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.dspace.content.MetadataField;
+
+/**
+ * Data structure representing a query predicate used by the Filtered Items report
+ * to filter items to retrieve.
+ * @author Jean-François Morin (Université Laval)
+ */
+public class QueryPredicate {
+
+    private List<MetadataField> fields = new ArrayList<>();
+    private QueryOperator operator;
+    private String value;
+
+    /**
+     * Shortcut method that builds a QueryPredicate from a single field, an operator, and a value.
+     * @param field Predicate subject
+     * @param operator Predicate operator
+     * @param value Predicate object
+     * @return a QueryPredicate instance built from the provided parameters
+     */
+    public static QueryPredicate of(MetadataField field, QueryOperator operator, String value) {
+        var predicate = new QueryPredicate();
+        predicate.fields.add(field);
+        predicate.operator = operator;
+        predicate.value = value;
+        return predicate;
+    }
+
+    /**
+     * Shortcut method that builds a QueryPredicate from a list of fields, an operator, and a value.
+     * @param fields Fields that form the predicate subject
+     * @param operator Predicate operator
+     * @param value Predicate object
+     * @return a QueryPredicate instance built from the provided parameters
+     */
+    public static QueryPredicate of(Collection<MetadataField> fields, QueryOperator operator, String value) {
+        var predicate = new QueryPredicate();
+        predicate.fields.addAll(fields);
+        predicate.operator = operator;
+        predicate.value = value;
+        return predicate;
+    }
+
+    public List<MetadataField> getFields() {
+        return fields;
+    }
+
+    public QueryOperator getOperator() {
+        return operator;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/contentreport/service/ContentReportService.java b/dspace-api/src/main/java/org/dspace/contentreport/service/ContentReportService.java
new file mode 100644
index 0000000000..16c01b8b48
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/contentreport/service/ContentReportService.java
@@ -0,0 +1,55 @@
+/**
+ * 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.contentreport.service;
+
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
+
+import org.dspace.content.MetadataField;
+import org.dspace.contentreport.Filter;
+import org.dspace.contentreport.FilteredCollection;
+import org.dspace.contentreport.FilteredItems;
+import org.dspace.contentreport.FilteredItemsQuery;
+import org.dspace.core.Context;
+
+public interface ContentReportService {
+
+    /**
+     * Returns <code>true<</code> if Content Reports are enabled.
+     * @return <code>true<</code> if Content Reports are enabled
+     */
+    boolean getEnabled();
+
+    /**
+     * Retrieves item statistics per collection according to a set of Boolean filters.
+     * @param context DSpace context
+     * @param filters Set of filters
+     * @return a list of collections with the requested statistics for each of them
+     */
+    List<FilteredCollection> findFilteredCollections(Context context, Collection<Filter> filters);
+
+    /**
+     * Retrieves a list of items according to a set of criteria.
+     * @param context DSpace context
+     * @param query structured query to find items against
+     * @return a list of items filtered according to the provided query
+     */
+    FilteredItems findFilteredItems(Context context, FilteredItemsQuery query);
+
+    /**
+     * Converts a metadata field name to a list of {@link MetadataField} instances
+     * (one if no wildcards are used, possibly more otherwise).
+     * @param context DSpace context
+     * @param metadataField field to search for
+     * @return a corresponding list of {@link MetadataField} entries
+     */
+    List<MetadataField> getMetadataFields(org.dspace.core.Context context, String metadataField)
+            throws SQLException;
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
index 32ad747d76..b4347f0969 100644
--- a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
+++ b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDAO.java
@@ -13,13 +13,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.stream.Stream;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Root;
 
 import com.google.common.collect.AbstractIterator;
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Root;
 import org.apache.commons.collections.CollectionUtils;
 import org.hibernate.Session;
 
@@ -102,6 +102,16 @@ public abstract class AbstractHibernateDAO<T> implements GenericDAO<T> {
         return result;
     }
 
+    @Override
+    public T findByID(Context context, Class clazz, String id) throws SQLException {
+        if (id == null) {
+            return null;
+        }
+        @SuppressWarnings("unchecked")
+        T result = (T) getHibernateSession(context).get(clazz, id);
+        return result;
+    }
+
     @Override
     public List<T> findMany(Context context, String query) throws SQLException {
         @SuppressWarnings("unchecked")
@@ -303,7 +313,7 @@ public abstract class AbstractHibernateDAO<T> implements GenericDAO<T> {
         org.hibernate.query.Query hquery = query.unwrap(org.hibernate.query.Query.class);
         Stream<T> stream = hquery.stream();
         Iterator<T> iter = stream.iterator();
-        return new AbstractIterator<T> () {
+        return new AbstractIterator<T>() {
             @Override
             protected T computeNext() {
                 return iter.hasNext() ? iter.next() : endOfData();
@@ -336,7 +346,7 @@ public abstract class AbstractHibernateDAO<T> implements GenericDAO<T> {
 
     /**
      * This method will return the count of items for this query as an integer
-     * This query needs to already be in a formate that'll return one record that contains the amount
+     * This query needs to already be in a format that'll return one record that contains the amount
      *
      * @param query
      *         The query for which the amount of results will be returned.
@@ -461,4 +471,15 @@ public abstract class AbstractHibernateDAO<T> implements GenericDAO<T> {
         return executeCriteriaQuery(context, criteria, cacheable, maxResults, offset);
     }
 
+    /**
+     * Create a Query object from a CriteriaQuery
+     * @param context current Context
+     * @param criteriaQuery CriteriaQuery built via CriteriaBuilder
+     * @return corresponding Query
+     * @throws SQLException if error occurs
+     */
+    public Query createQuery(Context context, CriteriaQuery criteriaQuery) throws SQLException {
+        return this.getHibernateSession(context).createQuery(criteriaQuery);
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java
index e9c6b95b7f..d72a4d6190 100644
--- a/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java
+++ b/dspace-api/src/main/java/org/dspace/core/AbstractHibernateDSODAO.java
@@ -10,10 +10,10 @@ package org.dspace.core;
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/dspace-api/src/main/java/org/dspace/core/Constants.java b/dspace-api/src/main/java/org/dspace/core/Constants.java
index f730ef6545..98bb1b7731 100644
--- a/dspace-api/src/main/java/org/dspace/core/Constants.java
+++ b/dspace-api/src/main/java/org/dspace/core/Constants.java
@@ -55,11 +55,16 @@ public class Constants {
      */
     public static final int EPERSON = 7;
 
+    /**
+     * Type of LDN MESSAGE objects
+     */
+    public static final int LDN_MESSAGE = 8;
+
     /**
      * lets you look up type names from the type IDs
      */
     public static final String[] typeText = { "BITSTREAM", "BUNDLE", "ITEM", "COLLECTION", "COMMUNITY", "SITE", "GROUP",
-        "EPERSON"};
+        "EPERSON", "LDN_MESSAGE"};
 
     /**
      * Special Bundle and Bitstream Names:
diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
index 02a3fee09f..877b7a0055 100644
--- a/dspace-api/src/main/java/org/dspace/core/Context.java
+++ b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -713,7 +713,7 @@ public class Context implements AutoCloseable {
     public void switchContextUser(EPerson newUser) {
         if (currentUserPreviousState != null) {
             throw new IllegalStateException(
-                    "A previous user is already set, you can only switch back and foreward one time");
+                    "A previous user is already set, you can only switch back and forward one time");
         }
 
         currentUserPreviousState = currentUser;
diff --git a/dspace-api/src/main/java/org/dspace/core/Email.java b/dspace-api/src/main/java/org/dspace/core/Email.java
index c157d16d49..bb434c07cb 100644
--- a/dspace-api/src/main/java/org/dspace/core/Email.java
+++ b/dspace-api/src/main/java/org/dspace/core/Email.java
@@ -23,23 +23,23 @@ import java.util.Date;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Properties;
-import javax.activation.DataHandler;
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.mail.Address;
-import javax.mail.BodyPart;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Multipart;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.ContentType;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-import javax.mail.internet.ParseException;
 
+import jakarta.activation.DataHandler;
+import jakarta.activation.DataSource;
+import jakarta.activation.FileDataSource;
+import jakarta.mail.Address;
+import jakarta.mail.BodyPart;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Multipart;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.internet.ContentType;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeBodyPart;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.mail.internet.MimeMultipart;
+import jakarta.mail.internet.ParseException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.velocity.Template;
diff --git a/dspace-api/src/main/java/org/dspace/core/GenericDAO.java b/dspace-api/src/main/java/org/dspace/core/GenericDAO.java
index a04a0ccbdc..9835e18ad3 100644
--- a/dspace-api/src/main/java/org/dspace/core/GenericDAO.java
+++ b/dspace-api/src/main/java/org/dspace/core/GenericDAO.java
@@ -102,6 +102,17 @@ public interface GenericDAO<T> {
      */
     public T findByID(Context context, Class clazz, UUID id) throws SQLException;
 
+    /**
+     * Fetch the entity identified by its String primary key.
+     *
+     * @param context current DSpace context.
+     * @param clazz   class of entity to be found.
+     * @param id      primary key of the database record.
+     * @return the found entity.
+     * @throws SQLException
+     */
+    public T findByID(Context context, Class clazz, String id) throws SQLException;
+
     /**
      * Execute a JPQL query and return a collection of results.
      *
diff --git a/dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java b/dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java
index b371af80ee..a867849077 100644
--- a/dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java
+++ b/dspace-api/src/main/java/org/dspace/core/HibernateDBConnection.java
@@ -27,7 +27,6 @@ import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.Transaction;
 import org.hibernate.engine.spi.SessionFactoryImplementor;
-import org.hibernate.proxy.HibernateProxyHelper;
 import org.hibernate.resource.transaction.spi.TransactionStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
diff --git a/dspace-api/src/main/java/org/dspace/core/HibernateProxyHelper.java b/dspace-api/src/main/java/org/dspace/core/HibernateProxyHelper.java
new file mode 100644
index 0000000000..f9bdd1c014
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/core/HibernateProxyHelper.java
@@ -0,0 +1,39 @@
+/**
+ * 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.core;
+
+import org.hibernate.proxy.HibernateProxy;
+import org.hibernate.proxy.LazyInitializer;
+
+/**
+ * Utility methods for working with Hibernate proxies.
+ * This class existed in Hibernate 5 but was removed from v6.
+ * https://github.com/hibernate/hibernate-orm/blob/5.6/hibernate-core/src/main/java/org/hibernate/proxy/HibernateProxyHelper.java
+ * We've copied it into DSpace to utilize the below utility method.
+ */
+public final class HibernateProxyHelper {
+
+    /**
+     * Get the class of an instance or the underlying class
+     * of a proxy (without initializing the proxy!). It is
+     * almost always better to use the entity name!
+     */
+    public static Class getClassWithoutInitializingProxy(Object object) {
+        if (object instanceof HibernateProxy) {
+            HibernateProxy proxy = (HibernateProxy) object;
+            LazyInitializer li = proxy.getHibernateLazyInitializer();
+            return li.getPersistentClass();
+        } else {
+            return object.getClass();
+        }
+    }
+
+    private HibernateProxyHelper() {
+        //can't instantiate
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
index 76f6a196fc..8a1a26d9c7 100644
--- a/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
+++ b/dspace-api/src/main/java/org/dspace/core/I18nUtil.java
@@ -377,6 +377,22 @@ public class I18nUtil {
         return templateName;
     }
 
+    /**
+     * Get the appropriate localized version of a ldn template according to language settings
+     *
+     * @param locale Locale for this request
+     * @param name   String - base name of the ldn template
+     * @return templateName
+     * String - localized filename of a ldn template
+     */
+    public static String getLDNFilename(Locale locale, String name) {
+        String templateFile =
+            DSpaceServicesFactory.getInstance().getConfigurationService().getProperty("dspace.dir") +
+                File.separator + "config" + File.separator + "ldn" + File.separator + name;
+
+        return getFilename(locale, templateFile, "");
+    }
+
     /**
      * Creates array of Locales from text list of locale-specifications.
      * Used to parse lists in DSpace configuration properties.
diff --git a/dspace-api/src/main/java/org/dspace/core/LDN.java b/dspace-api/src/main/java/org/dspace/core/LDN.java
new file mode 100644
index 0000000000..8ae5cddf5b
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/core/LDN.java
@@ -0,0 +1,212 @@
+/**
+ * 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.core;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+import jakarta.mail.MessagingException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.Velocity;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.exception.MethodInvocationException;
+import org.apache.velocity.exception.ParseErrorException;
+import org.apache.velocity.exception.ResourceNotFoundException;
+import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
+import org.apache.velocity.runtime.resource.util.StringResourceRepository;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+
+/**
+ * Class representing an LDN message json
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDN {
+    /**
+     * The content of the ldn message
+     */
+    private String content;
+    private String contentName;
+
+    /**
+     * The arguments to fill out
+     */
+    private final List<Object> arguments;
+
+    private static final Logger LOG = LogManager.getLogger();
+
+    /** Velocity template settings. */
+    private static final String RESOURCE_REPOSITORY_NAME = "LDN";
+    private static final Properties VELOCITY_PROPERTIES = new Properties();
+    static {
+        VELOCITY_PROPERTIES.put(Velocity.RESOURCE_LOADERS, "string");
+        VELOCITY_PROPERTIES.put("resource.loader.string.description",
+                "Velocity StringResource loader");
+        VELOCITY_PROPERTIES.put("resource.loader.string.class",
+                StringResourceLoader.class.getName());
+        VELOCITY_PROPERTIES.put("resource.loader.string.repository.name",
+                RESOURCE_REPOSITORY_NAME);
+        VELOCITY_PROPERTIES.put("resource.loader.string.repository.static",
+                "false");
+    }
+
+    /** Velocity template for the message*/
+    private Template template;
+
+    /**
+     * Create a new ldn message.
+     */
+    public LDN() {
+        arguments = new ArrayList<>(20);
+        template = null;
+        content = EMPTY;
+    }
+
+    /**
+     * Set the content of the message. Setting this also "resets" the message
+     * formatting - <code>addArgument</code> will start over. Comments and any
+     * "Subject:" line must be stripped.
+     *
+     * @param name a name for this message
+     * @param cnt the content of the message
+     */
+    public void setContent(String name, String cnt) {
+        content = cnt;
+        contentName = name;
+        arguments.clear();
+    }
+
+    /**
+     * Fill out the next argument in the template
+     *
+     * @param arg the value for the next argument
+     */
+    public void addArgument(Object arg) {
+        arguments.add(arg);
+    }
+
+    /**
+     * Generates the ldn message.
+     *
+     * @throws MessagingException if there was a problem sending the mail.
+     * @throws IOException        if IO error
+     */
+    public String generateLDNMessage() {
+        ConfigurationService config
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+        VelocityEngine templateEngine = new VelocityEngine();
+        templateEngine.init(VELOCITY_PROPERTIES);
+
+        VelocityContext vctx = new VelocityContext();
+        vctx.put("config", new LDN.UnmodifiableConfigurationService(config));
+        vctx.put("params", Collections.unmodifiableList(arguments));
+
+        if (null == template) {
+            if (StringUtils.isBlank(content)) {
+                LOG.error("template has no content");
+                throw new RuntimeException("template has no content");
+            }
+            // No template, so use a String of content.
+            StringResourceRepository repo = (StringResourceRepository)
+                templateEngine.getApplicationAttribute(RESOURCE_REPOSITORY_NAME);
+            repo.putStringResource(contentName, content);
+            // Turn content into a template.
+            template = templateEngine.getTemplate(contentName);
+        }
+
+        StringWriter writer = new StringWriter();
+        try {
+            template.merge(vctx, writer);
+        } catch (MethodInvocationException | ParseErrorException
+                | ResourceNotFoundException ex) {
+            LOG.error("Template not merged:  {}", ex.getMessage());
+            throw new RuntimeException("Template not merged", ex);
+        }
+        return writer.toString();
+    }
+
+    /**
+     * Get the VTL template for a ldn message. The message is suitable
+     * for inserting values using Apache Velocity.
+     *
+     * @param ldnMessageFile
+     *            full name for the ldn template, for example "/dspace/config/ldn/request-review".
+     *
+     * @return the ldn object, configured with body.
+     *
+     * @throws IOException if IO error,
+     *                     if the template couldn't be found, or there was some other
+     *                     error reading the template
+     */
+    public static LDN getLDNMessage(String ldnMessageFile)
+        throws IOException {
+        StringBuilder contentBuffer = new StringBuilder();
+        try (
+            InputStream is = new FileInputStream(ldnMessageFile);
+            InputStreamReader ir = new InputStreamReader(is, "UTF-8");
+            BufferedReader reader = new BufferedReader(ir);
+            ) {
+            boolean more = true;
+            while (more) {
+                String line = reader.readLine();
+                if (line == null) {
+                    more = false;
+                } else {
+                    contentBuffer.append(line);
+                    contentBuffer.append("\n");
+                }
+            }
+        }
+        LDN ldn = new LDN();
+        ldn.setContent(ldnMessageFile, contentBuffer.toString());
+        return ldn;
+    }
+
+    /**
+     * Wrap ConfigurationService to prevent templates from modifying
+     * the configuration.
+     */
+    public static class UnmodifiableConfigurationService {
+        private final ConfigurationService configurationService;
+
+        /**
+         * Swallow an instance of ConfigurationService.
+         *
+         * @param cs the real instance, to be wrapped.
+         */
+        public UnmodifiableConfigurationService(ConfigurationService cs) {
+            configurationService = cs;
+        }
+
+        /**
+         * Look up a key in the actual ConfigurationService.
+         *
+         * @param key to be looked up in the DSpace configuration.
+         * @return whatever value ConfigurationService associates with {@code key}.
+         */
+        public String get(String key) {
+            return configurationService.getProperty(key);
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java b/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
index d895f9a764..766e72e941 100644
--- a/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/core/LicenseServiceImpl.java
@@ -17,14 +17,14 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.core.service.LicenseService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.services.model.Request;
 import org.dspace.web.ContextUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Encapsulate the deposit license.
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * @author mhwood
  */
 public class LicenseServiceImpl implements LicenseService {
-    private final Logger log = LoggerFactory.getLogger(LicenseServiceImpl.class);
+    private final Logger log = LogManager.getLogger();
 
     /**
      * The default license
@@ -53,7 +53,7 @@ public class LicenseServiceImpl implements LicenseService {
             out.print(newLicense);
             out.close();
         } catch (IOException e) {
-            log.warn("license_write: " + e.getLocalizedMessage());
+            log.warn("license_write: {}", e::getLocalizedMessage);
         }
         license = newLicense;
     }
@@ -140,7 +140,7 @@ public class LicenseServiceImpl implements LicenseService {
             br.close();
 
         } catch (IOException e) {
-            log.error("Can't load license: " + licenseFile.toString(), e);
+            log.error("Can't load license {}: ", licenseFile.toString(), e);
 
             // FIXME: Maybe something more graceful here, but with the
             // configuration we can't do anything
diff --git a/dspace-api/src/main/java/org/dspace/core/LogHelper.java b/dspace-api/src/main/java/org/dspace/core/LogHelper.java
index 00cc0f2766..5c3f345dfb 100644
--- a/dspace-api/src/main/java/org/dspace/core/LogHelper.java
+++ b/dspace-api/src/main/java/org/dspace/core/LogHelper.java
@@ -50,7 +50,7 @@ public class LogHelper {
 
 
         StringBuilder result = new StringBuilder();
-        // Escape everthing but the extra context info because for some crazy reason two fields
+        // Escape everything but the extra context info because for some crazy reason two fields
         // are generated inside this entry one for the session id, and another for the ip
         // address. Everything else should be escaped.
         result.append(escapeLogField(email)).append(":").append(contextExtraInfo).append(":")
diff --git a/dspace-api/src/main/java/org/dspace/core/NewsServiceImpl.java b/dspace-api/src/main/java/org/dspace/core/NewsServiceImpl.java
index d2bdf787f8..59b4c43fa8 100644
--- a/dspace-api/src/main/java/org/dspace/core/NewsServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/core/NewsServiceImpl.java
@@ -19,11 +19,11 @@ import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.core.service.NewsService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author mhwood
  */
 public class NewsServiceImpl implements NewsService {
-    private final Logger log = LoggerFactory.getLogger(NewsServiceImpl.class);
+    private final Logger log = LogManager.getLogger();
 
     private List<String> acceptableFilenames;
 
@@ -94,7 +94,7 @@ public class NewsServiceImpl implements NewsService {
             ir.close();
             fir.close();
         } catch (IOException e) {
-            log.warn("news_read: " + e.getLocalizedMessage());
+            log.warn("news_read: {}", e::getLocalizedMessage);
         }
 
         return text.toString();
@@ -117,7 +117,7 @@ public class NewsServiceImpl implements NewsService {
             out.print(news);
             out.close();
         } catch (IOException e) {
-            log.warn("news_write: " + e.getLocalizedMessage());
+            log.warn("news_write: {}", e::getLocalizedMessage);
         }
 
         return news;
diff --git a/dspace-api/src/main/java/org/dspace/core/Utils.java b/dspace-api/src/main/java/org/dspace/core/Utils.java
index ea9ed57eca..b5423decf2 100644
--- a/dspace-api/src/main/java/org/dspace/core/Utils.java
+++ b/dspace-api/src/main/java/org/dspace/core/Utils.java
@@ -95,7 +95,7 @@ public final class Utils {
     private static final SimpleDateFormat outFmtSecond
             = new SimpleDateFormat("yyyy'-'MM'-'dd'T'HH':'mm':'ssZ");
 
-    // output format with millsecond precision
+    // output format with millisecond precision
     private static final SimpleDateFormat outFmtMillisec
             = new SimpleDateFormat("yyyy'-'MM'-'dd'T'HH':'mm':'ss.SSSZ");
 
diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/CorrectionType.java b/dspace-api/src/main/java/org/dspace/correctiontype/CorrectionType.java
new file mode 100644
index 0000000000..bc5abaef4e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/correctiontype/CorrectionType.java
@@ -0,0 +1,81 @@
+/**
+ * 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.correctiontype;
+
+import java.sql.SQLException;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+
+/**
+ * Interface class that model the CorrectionType.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public interface CorrectionType {
+
+    /**
+     * Retrieves the unique identifier associated to the CorrectionType.
+     */
+    public String getId();
+
+    /**
+     * Retrieves the topic associated with the to the CorrectionType.
+     */
+    public String getTopic();
+
+    /**
+     * Checks whether the CorrectionType required related item.
+     */
+    public boolean isRequiredRelatedItem();
+
+    /**
+     * Checks whether target item is allowed for current CorrectionType
+     * 
+     * @param context              Current DSpace session
+     * @param targetItem           Target item
+     * @throws AuthorizeException  if authorize error
+     * @throws SQLException        if there's a database problem
+     */
+    public boolean isAllowed(Context context, Item targetItem) throws AuthorizeException, SQLException;
+
+    /**
+     * Checks whether target item and related item are allowed for current CorrectionType
+     * 
+     * @param context               Current DSpace session
+     * @param targetItem            Target item
+     * @param relatedItem           Related item
+     * @throws AuthorizeException   if authorize error
+     * @throws SQLException         if there's a database problem
+     */
+    public boolean isAllowed(Context context, Item targetItem, Item relatedItem) throws AuthorizeException,SQLException;
+
+    /**
+     * Creates a QAEvent for a specific target item.
+     * 
+     * @param context      Current DSpace session
+     * @param targetItem   Target item
+     * @param reason       Reason
+     * @return             QAEvent
+     */
+    public QAEvent createCorrection(Context context, Item targetItem, QAMessageDTO reason);
+
+    /**
+     *  Creates a QAEvent for a target item and related item.
+     * @param context      Current DSpace session
+     * @param targetItem   Target item
+     * @param relatedItem  Related item
+     * @param reason       Reason
+     * @return             QAEvent
+     */
+    public QAEvent createCorrection(Context context, Item targetItem, Item relatedItem, QAMessageDTO reason);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/ReinstateCorrectionType.java b/dspace-api/src/main/java/org/dspace/correctiontype/ReinstateCorrectionType.java
new file mode 100644
index 0000000000..847236d110
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/correctiontype/ReinstateCorrectionType.java
@@ -0,0 +1,141 @@
+/**
+ * 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.correctiontype;
+
+import static org.dspace.content.QAEvent.DSPACE_USERS_SOURCE;
+import static org.dspace.correctiontype.WithdrawnCorrectionType.WITHDRAWAL_REINSTATE_GROUP;
+
+import java.sql.SQLException;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.service.GroupService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.CorrectionTypeMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation class for {@link CorrectionType}
+ * that will reinstate target item if it's withdrawn.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class ReinstateCorrectionType implements CorrectionType, InitializingBean {
+
+    private String id;
+    private String topic;
+    private String creationForm;
+
+    @Autowired
+    private GroupService groupService;
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private AuthorizeService authorizeService;
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public boolean isAllowed(Context context, Item targetItem) throws SQLException {
+        if (!targetItem.isWithdrawn()) {
+            return false;
+        }
+        boolean isAdmin = authorizeService.isAdmin(context);
+        if (!currentUserIsMemberOfwithdrawalReinstateGroup(context) && !isAdmin) {
+            return false;
+        }
+        long tot = qaEventService.countSourcesByTarget(context, targetItem.getID());
+        return tot == 0;
+    }
+
+    private boolean currentUserIsMemberOfwithdrawalReinstateGroup(Context context) throws SQLException {
+        String groupName = configurationService.getProperty(WITHDRAWAL_REINSTATE_GROUP);
+        if (StringUtils.isBlank(groupName)) {
+            return false;
+        }
+        Group withdrawalReinstateGroup = groupService.findByName(context, groupName);
+        return withdrawalReinstateGroup != null && groupService.isMember(context, withdrawalReinstateGroup);
+    }
+
+    @Override
+    public boolean isAllowed(Context context, Item targetItem, Item relatedItem) throws AuthorizeException,
+        SQLException {
+        return isAllowed(context, targetItem);
+    }
+
+    @Override
+    public QAEvent createCorrection(Context context, Item targetItem, QAMessageDTO reason) {
+        ObjectNode reasonJson = createReasonJson(reason);
+        QAEvent qaEvent = new QAEvent(DSPACE_USERS_SOURCE,
+                                      context.getCurrentUser().getID().toString(),
+                                      targetItem.getID().toString(),
+                                      targetItem.getName(),
+                                      this.getTopic(),
+                                      1.0,
+                                      reasonJson.toString(),
+                                      new Date()
+                                      );
+
+        qaEventService.store(context, qaEvent);
+        return qaEvent;
+    }
+
+    private ObjectNode createReasonJson(QAMessageDTO reason) {
+        CorrectionTypeMessageDTO mesasge = (CorrectionTypeMessageDTO) reason;
+        ObjectNode jsonNode = new ObjectMapper().createObjectNode();
+        jsonNode.put("reason", mesasge.getReason());
+        return jsonNode;
+    }
+
+    @Override
+    public QAEvent createCorrection(Context context, Item targetItem, Item relatedItem, QAMessageDTO reason) {
+        return this.createCorrection(context, targetItem, reason);
+    }
+
+    @Override
+    public boolean isRequiredRelatedItem() {
+        return false;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {}
+
+    public void setCreationForm(String creationForm) {
+        this.creationForm = creationForm;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/WithdrawnCorrectionType.java b/dspace-api/src/main/java/org/dspace/correctiontype/WithdrawnCorrectionType.java
new file mode 100644
index 0000000000..e3d074b1d3
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/correctiontype/WithdrawnCorrectionType.java
@@ -0,0 +1,149 @@
+/**
+ * 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.correctiontype;
+
+import static org.dspace.content.QAEvent.DSPACE_USERS_SOURCE;
+import static org.dspace.core.Constants.READ;
+
+import java.sql.SQLException;
+import java.util.Date;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.Group;
+import org.dspace.eperson.service.GroupService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.CorrectionTypeMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation class for {@link CorrectionType}
+ * that will withdrawn target item if it archived and wasn't withdrawn already.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class WithdrawnCorrectionType implements CorrectionType, InitializingBean {
+
+    public static final String WITHDRAWAL_REINSTATE_GROUP = "qaevents.withdraw-reinstate.group";
+
+    private String id;
+    private String topic;
+    private String creationForm;
+
+    @Autowired
+    private GroupService groupService;
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private AuthorizeService authorizeService;
+    @Autowired
+    private ConfigurationService configurationService;
+
+
+    @Override
+    public boolean isAllowed(Context context, Item targetItem) throws SQLException {
+        if (targetItem.isWithdrawn() || !targetItem.isArchived()) {
+            return false;
+        }
+        try {
+            authorizeService.authorizeAction(context, targetItem, READ);
+        } catch (AuthorizeException e) {
+            return false;
+        }
+        boolean isAdmin = authorizeService.isAdmin(context);
+        if (!currentUserIsMemberOfwithdrawalReinstateGroup(context) && !isAdmin) {
+            return false;
+        }
+        long tot = qaEventService.countSourcesByTarget(context, targetItem.getID());
+        return tot == 0;
+    }
+
+    private boolean currentUserIsMemberOfwithdrawalReinstateGroup(Context context) throws SQLException {
+        String groupName = configurationService.getProperty(WITHDRAWAL_REINSTATE_GROUP);
+        if (StringUtils.isBlank(groupName)) {
+            return false;
+        }
+        Group withdrawalReinstateGroup = groupService.findByName(context, groupName);
+        return withdrawalReinstateGroup != null && groupService.isMember(context, withdrawalReinstateGroup);
+    }
+
+    @Override
+    public QAEvent createCorrection(Context context, Item targetItem, QAMessageDTO reason) {
+        ObjectNode reasonJson = createReasonJson(reason);
+        QAEvent qaEvent = new QAEvent(DSPACE_USERS_SOURCE,
+                                      context.getCurrentUser().getID().toString(),
+                                      targetItem.getID().toString(),
+                                      targetItem.getName(),
+                                      this.getTopic(),
+                                      1.0,
+                                      reasonJson.toString(),
+                                      new Date()
+                                      );
+
+        qaEventService.store(context, qaEvent);
+        return qaEvent;
+    }
+
+    private ObjectNode createReasonJson(QAMessageDTO reason) {
+        CorrectionTypeMessageDTO mesasge = (CorrectionTypeMessageDTO) reason;
+        ObjectNode jsonNode = new ObjectMapper().createObjectNode();
+        jsonNode.put("reason", mesasge.getReason());
+        return jsonNode;
+    }
+
+    @Override
+    public boolean isAllowed(Context context, Item targetItem, Item relatedItem)
+            throws AuthorizeException, SQLException {
+        return isAllowed(context, targetItem);
+    }
+
+    @Override
+    public QAEvent createCorrection(Context context, Item targetItem, Item relatedItem, QAMessageDTO reason) {
+        return createCorrection(context, targetItem, reason);
+    }
+
+    @Override
+    public boolean isRequiredRelatedItem() {
+        return false;
+    }
+
+    @Override
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    @Override
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {}
+
+    public void setCreationForm(String creationForm) {
+        this.creationForm = creationForm;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/service/CorrectionTypeService.java b/dspace-api/src/main/java/org/dspace/correctiontype/service/CorrectionTypeService.java
new file mode 100644
index 0000000000..e76e1f7ec1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/correctiontype/service/CorrectionTypeService.java
@@ -0,0 +1,58 @@
+/**
+ * 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.correctiontype.service;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.correctiontype.CorrectionType;
+
+/**
+ * Service interface class for the CorrectionType object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface CorrectionTypeService {
+
+    /**
+     * Retrieves a CorrectionType object from the system based on a unique identifier.
+     * 
+     * @param id The unique identifier of the CorrectionType object to be retrieved.
+     * @return   The CorrectionType object corresponding to the provided identifier,
+     *           or null if no object is found.
+     */
+    public CorrectionType findOne(String id);
+
+    /**
+     * Retrieves a list of all CorrectionType objects available in the system.
+     * 
+     * @return Returns a List containing all CorrectionType objects in the system.
+     */
+    public List<CorrectionType> findAll();
+
+    /**
+     * Retrieves a list of CorrectionType objects related to the provided Item.
+     * 
+     * @param context               Current DSpace session.
+     * @param item                  Target item
+     * @throws AuthorizeException   If authorize error
+     * @throws SQLException         If a database error occurs during the operation.
+     */
+    public List<CorrectionType> findByItem(Context context, Item item) throws AuthorizeException, SQLException;
+
+    /**
+     * Retrieves a CorrectionType object associated with a specific topic.
+     * 
+     * @param topic  The topic for which the CorrectionType object is to be retrieved.
+     */
+    public CorrectionType findByTopic(String topic);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/correctiontype/service/impl/CorrectionTypeServiceImpl.java b/dspace-api/src/main/java/org/dspace/correctiontype/service/impl/CorrectionTypeServiceImpl.java
new file mode 100644
index 0000000000..e64120c46a
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/correctiontype/service/impl/CorrectionTypeServiceImpl.java
@@ -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/
+ */
+package org.dspace.correctiontype.service.impl;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.correctiontype.CorrectionType;
+import org.dspace.correctiontype.service.CorrectionTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Service implementation class for the CorrectionType object.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class CorrectionTypeServiceImpl implements CorrectionTypeService {
+
+    @Autowired
+    private List<CorrectionType> correctionTypes;
+
+    @Override
+    public CorrectionType findOne(String id) {
+        return findAll().stream()
+                        .filter(correctionType -> correctionType.getId().equals(id))
+                        .findFirst()
+                        .orElse(null);
+    }
+
+    @Override
+    public List<CorrectionType> findAll() {
+        return CollectionUtils.isNotEmpty(correctionTypes) ? correctionTypes : List.of();
+    }
+
+    @Override
+    public List<CorrectionType> findByItem(Context context, Item item) throws AuthorizeException, SQLException {
+        List<CorrectionType> correctionTypes = new ArrayList<>();
+        for (CorrectionType correctionType : findAll()) {
+            if (correctionType.isAllowed(context, item)) {
+                correctionTypes.add(correctionType);
+            }
+        }
+        return correctionTypes;
+    }
+
+    @Override
+    public CorrectionType findByTopic(String topic) {
+        return findAll().stream()
+                        .filter(correctionType -> correctionType.getTopic().equals(topic))
+                        .findFirst()
+                        .orElse(null);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/BasicLinkChecker.java b/dspace-api/src/main/java/org/dspace/ctask/general/BasicLinkChecker.java
index a302159ea9..9bd08bffdb 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/general/BasicLinkChecker.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/BasicLinkChecker.java
@@ -161,7 +161,7 @@ public class BasicLinkChecker extends AbstractCurationTask {
     }
 
     /**
-     * Internal utitity method to get a description of the handle
+     * Internal utility method to get a description of the handle
      *
      * @param item The item to get a description of
      * @return The handle, or in workflow
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java b/dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java
index fa630029b8..2455ca0953 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/CitationPage.java
@@ -114,7 +114,7 @@ public class CitationPage extends AbstractCurationTask {
                 // don't inherit now otherwise they will be copied over the moved bitstreams
                 resourcePolicyService.removeAllPolicies(Curator.curationContext(), dBundle);
             } catch (AuthorizeException e) {
-                log.error("User not authroized to create bundle on item \"{}\": {}",
+                log.error("User not authorized to create bundle on item \"{}\": {}",
                         item::getName, e::getMessage);
                 return;
             }
@@ -144,7 +144,7 @@ public class CitationPage extends AbstractCurationTask {
                 // don't inherit now otherwise they will be copied over the moved bitstreams
                 resourcePolicyService.removeAllPolicies(Curator.curationContext(), pBundle);
             } catch (AuthorizeException e) {
-                log.error("User not authroized to create bundle on item \""
+                log.error("User not authorized to create bundle on item \""
                               + item.getName() + "\": " + e.getMessage());
             }
             bundles = itemService.getBundles(item, "ORIGINAL");
@@ -173,7 +173,7 @@ public class CitationPage extends AbstractCurationTask {
                         InputStream citedInputStream =
                             new ByteArrayInputStream(
                                 citationDocument.makeCitedDocument(Curator.curationContext(), bitstream).getLeft());
-                        //Add the cited document to the approiate bundle
+                        //Add the cited document to the appropriate bundle
                         this.addCitedPageToItem(citedInputStream, bundle, pBundle,
                                                 dBundle, item, bitstream);
                         // now set the policies of the preservation and display bundle
diff --git a/dspace-api/src/main/java/org/dspace/ctask/general/ClamScan.java b/dspace-api/src/main/java/org/dspace/ctask/general/ClamScan.java
index d1fa70565d..47fa6ee645 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/general/ClamScan.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/general/ClamScan.java
@@ -19,6 +19,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
@@ -29,8 +31,6 @@ import org.dspace.content.service.BitstreamService;
 import org.dspace.curate.AbstractCurationTask;
 import org.dspace.curate.Curator;
 import org.dspace.curate.Suspendable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * ClamScan.java
@@ -58,7 +58,7 @@ public class ClamScan extends AbstractCurationTask {
     protected final String SCAN_FAIL_MESSAGE = "Error encountered using virus service - check setup";
     protected final String NEW_ITEM_HANDLE = "in workflow";
 
-    private static final Logger log = LoggerFactory.getLogger(ClamScan.class);
+    private static final Logger log = LogManager.getLogger();
 
     protected String host = null;
     protected int port = 0;
@@ -100,7 +100,7 @@ public class ClamScan extends AbstractCurationTask {
 
             try {
                 Bundle bundle = itemService.getBundles(item, "ORIGINAL").get(0);
-                results = new ArrayList<String>();
+                results = new ArrayList<>();
                 for (Bitstream bitstream : bundle.getBitstreams()) {
                     InputStream inputstream = bitstreamService.retrieve(Curator.curationContext(), bitstream);
                     logDebugMessage("Scanning " + bitstream.getName() + " . . . ");
@@ -157,7 +157,7 @@ public class ClamScan extends AbstractCurationTask {
         try {
             socket.setSoTimeout(timeout);
         } catch (SocketException e) {
-            log.error("Could not set socket timeout . . .  " + timeout + "ms", e);
+            log.error("Could not set socket timeout . . .  {}ms", timeout, e);
             throw (new IOException(e));
         }
         try {
@@ -293,8 +293,6 @@ public class ClamScan extends AbstractCurationTask {
 
 
     protected void logDebugMessage(String message) {
-        if (log.isDebugEnabled()) {
-            log.debug(message);
-        }
+        log.debug(message);
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/ctask/test/WorkflowReportTest.java b/dspace-api/src/main/java/org/dspace/ctask/test/WorkflowReportTest.java
index 21ffdd0260..7b47a9fd90 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/test/WorkflowReportTest.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/test/WorkflowReportTest.java
@@ -10,11 +10,11 @@ package org.dspace.ctask.test;
 
 import java.io.IOException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.curate.AbstractCurationTask;
 import org.dspace.curate.Curator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Curation task which simply reports its invocation without changing anything.
@@ -24,13 +24,13 @@ import org.slf4j.LoggerFactory;
  */
 public class WorkflowReportTest
         extends AbstractCurationTask {
-    private static final Logger LOG = LoggerFactory.getLogger(WorkflowReportTest.class);
+    private static final Logger LOG = LogManager.getLogger();
 
     @Override
     public int perform(DSpaceObject dso)
             throws IOException {
         LOG.info("Class {} as task {} received 'perform' for object {}",
-                WorkflowReportTest.class.getSimpleName(), taskId, dso);
+                WorkflowReportTest.class::getSimpleName, () -> taskId, () -> dso);
         curator.report(String.format(
                 "Class %s as task %s received 'perform' for object %s%n",
                 WorkflowReportTest.class.getSimpleName(), taskId, dso));
diff --git a/dspace-api/src/main/java/org/dspace/ctask/testing/PropertyParameterTestingTask.java b/dspace-api/src/main/java/org/dspace/ctask/testing/PropertyParameterTestingTask.java
index 279204cf57..14bd420494 100644
--- a/dspace-api/src/main/java/org/dspace/ctask/testing/PropertyParameterTestingTask.java
+++ b/dspace-api/src/main/java/org/dspace/ctask/testing/PropertyParameterTestingTask.java
@@ -10,12 +10,12 @@ package org.dspace.ctask.testing;
 
 import java.io.IOException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
 import org.dspace.curate.AbstractCurationTask;
 import org.dspace.curate.Curator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Logs what it was asked to do, samples run parameters and task
@@ -32,8 +32,7 @@ import org.slf4j.LoggerFactory;
  */
 public class PropertyParameterTestingTask
         extends AbstractCurationTask {
-    private static final Logger LOG
-            = LoggerFactory.getLogger(PropertyParameterTestingTask.class);
+    private static final Logger LOG = LogManager.getLogger();
 
     @Override
     public void init(Curator curator, String taskId)
diff --git a/dspace-api/src/main/java/org/dspace/curate/Curation.java b/dspace-api/src/main/java/org/dspace/curate/Curation.java
index 4d70286e79..ece1b7738a 100644
--- a/dspace-api/src/main/java/org/dspace/curate/Curation.java
+++ b/dspace-api/src/main/java/org/dspace/curate/Curation.java
@@ -165,7 +165,7 @@ public class Curation extends DSpaceRunnable<CurationScriptConfiguration> {
      * End of curation script; logs script time if -v verbose is set
      *
      * @param timeRun Time script was started
-     * @throws SQLException If DSpace contextx can't complete
+     * @throws SQLException If DSpace context can't complete
      */
     private void endScript(long timeRun) throws SQLException {
         context.complete();
@@ -300,9 +300,17 @@ public class Curation extends DSpaceRunnable<CurationScriptConfiguration> {
         // scope
         if (this.commandLine.getOptionValue('s') != null) {
             this.scope = this.commandLine.getOptionValue('s');
-            if (this.scope != null && Curator.TxScope.valueOf(this.scope.toUpperCase()) == null) {
-                this.handler.logError("Bad transaction scope '" + this.scope + "': only 'object', 'curation' or " +
-                                      "'open' recognized");
+            boolean knownScope;
+            try {
+                Curator.TxScope.valueOf(this.scope.toUpperCase());
+                knownScope = true;
+            } catch (IllegalArgumentException | NullPointerException e) {
+                knownScope = false;
+            }
+            if (!knownScope) {
+                this.handler.logError("Bad transaction scope '"
+                        + this.scope
+                        + "': only 'object', 'curation' or 'open' recognized");
                 throw new IllegalArgumentException(
                     "Bad transaction scope '" + this.scope + "': only 'object', 'curation' or " +
                     "'open' recognized");
diff --git a/dspace-api/src/main/java/org/dspace/curate/LogReporter.java b/dspace-api/src/main/java/org/dspace/curate/LogReporter.java
index bd3ee3cffb..bdf4443576 100644
--- a/dspace-api/src/main/java/org/dspace/curate/LogReporter.java
+++ b/dspace-api/src/main/java/org/dspace/curate/LogReporter.java
@@ -10,8 +10,8 @@ package org.dspace.curate;
 
 import java.io.IOException;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Write curation report records through the logging framework.
@@ -22,7 +22,7 @@ import org.slf4j.LoggerFactory;
  */
 public class LogReporter
         implements Reporter {
-    private static final Logger LOG = LoggerFactory.getLogger("curation");
+    private static final Logger LOG = LogManager.getLogger("curation");
     private final StringBuilder buffer = new StringBuilder();
 
     @Override
@@ -31,7 +31,7 @@ public class LogReporter
         for (int pos = 0; pos < cs.length(); pos++) {
             char c = cs.charAt(pos);
             if (c == '\n') {
-                LOG.info(buffer.toString());
+                LOG.info(buffer::toString);
                 buffer.delete(0, buffer.length()); // Clear the buffer
             } else {
                 buffer.append(c);
@@ -56,7 +56,7 @@ public class LogReporter
     public void close()
             throws Exception {
         if (buffer.length() > 0) {
-            LOG.info(buffer.toString());
+            LOG.info(buffer::toString);
         }
     }
 }
diff --git a/dspace-api/src/main/java/org/dspace/curate/ScriptedTask.java b/dspace-api/src/main/java/org/dspace/curate/ScriptedTask.java
index 7f63cb76dd..8d8ab491d2 100644
--- a/dspace-api/src/main/java/org/dspace/curate/ScriptedTask.java
+++ b/dspace-api/src/main/java/org/dspace/curate/ScriptedTask.java
@@ -16,7 +16,7 @@ import org.dspace.core.Context;
  * ScriptedTask describes a rather generic ability to perform an operation
  * upon a DSpace object. It's semantics are identical to the CurationTask interface,
  * but is designed to be implemented in scripting languages, rather than
- * Java. For this reason, the 'perform' methods are renamed to accomodate
+ * Java. For this reason, the 'perform' methods are renamed to accommodate
  * languages (like Ruby) that lack method overloading.
  *
  * @author richardrodgers
diff --git a/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java b/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java
index 27a162d543..ec32ff92f9 100644
--- a/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/curate/XmlWorkflowCuratorServiceImpl.java
@@ -140,14 +140,14 @@ public class XmlWorkflowCuratorServiceImpl
             item.setOwningCollection(wfi.getCollection());
             for (Task task : step.tasks) {
                 curator.addTask(task.name);
+            }
 
-                // Check whether the task is configured to be queued rather than automatically run
-                if (StringUtils.isNotEmpty(step.queue)) {
-                    // queue attribute has been set in the FlowStep configuration: add task to configured queue
-                    curator.queue(c, item.getID().toString(), step.queue);
-                } else {
-                    // Task is configured to be run automatically
-                    curator.curate(c, item);
+            if (StringUtils.isNotEmpty(step.queue)) { // Step's tasks are to be queued.
+                curator.queue(c, item.getID().toString(), step.queue);
+            } else { // Step's tasks are to be run now.
+                curator.curate(c, item);
+
+                for (Task task : step.tasks) {
                     int status = curator.getStatus(task.name);
                     String result = curator.getResult(task.name);
                     String action = "none";
@@ -184,14 +184,14 @@ public class XmlWorkflowCuratorServiceImpl
                     }
                 }
                 curator.clear();
-            }
 
-            // Record any reporting done by the tasks.
-            if (reporter.length() > 0) {
-                LOG.info("Curation tasks over item {} for step {} report:%n{}",
-                    () -> wfi.getItem().getID(),
-                    () -> step.step,
-                    () -> reporter.toString());
+                // Record any reporting done by the tasks.
+                if (reporter.length() > 0) {
+                    LOG.info("Curation tasks over item {} for step {} report:\n{}",
+                        () -> wfi.getItem().getID(),
+                        () -> step.step,
+                        () -> reporter.toString());
+                }
             }
         }
         return true;
diff --git a/dspace-api/src/main/java/org/dspace/curate/package-info.java b/dspace-api/src/main/java/org/dspace/curate/package-info.java
index 492642f60c..1168bbd283 100644
--- a/dspace-api/src/main/java/org/dspace/curate/package-info.java
+++ b/dspace-api/src/main/java/org/dspace/curate/package-info.java
@@ -20,6 +20,8 @@
  * </dl>
  *
  * <p>Curation requests may be run immediately or queued for batch processing.
+ * See {@link TaskQueue} and its relatives, {@link Curation} and its relatives
+ * for more on queued curation.
  *
  * <p>Tasks may also be attached to a workflow step, so that a set of tasks is
  * applied to each uninstalled Item which passes through that step.  See
@@ -27,5 +29,15 @@
  *
  * <p>A task may return to the Curator a status code, a final status message,
  * and an optional report character stream.
+ *
+ * <p>The {@link Reporter} classes absorb strings of text and preserve it in
+ * various ways.  A Reporter is a simple {@link Appendable} and makes no
+ * assumptions about e.g. whether a string represents a complete line.  If you
+ * want your report formatted, insert appropriate newlines and other whitespace
+ * as needed.  Your tasks can emit marked-up text if you wish, but the stock
+ * Reporter implementations make no attempt to render it.
+ *
+ * <p>Tasks may be annotated to inform the Curator of special properties.  See
+ * {@link Distributive}, {@link Mutative}, {@link Suspendable} etc.
  */
 package org.dspace.curate;
diff --git a/dspace-api/src/main/java/org/dspace/discovery/FullTextContentStreams.java b/dspace-api/src/main/java/org/dspace/discovery/FullTextContentStreams.java
index 21468def68..58abf18698 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/FullTextContentStreams.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/FullTextContentStreams.java
@@ -20,10 +20,10 @@ import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.Nullable;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
+import jakarta.annotation.Nullable;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java b/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
index 661c48d91c..3479c25bf3 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexClient.java
@@ -7,20 +7,27 @@
  */
 package org.dspace.discovery;
 
+import static org.dspace.discovery.IndexClientOptions.TYPE_OPTION;
+
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.discovery.indexobject.IndexableCollection;
 import org.dspace.discovery.indexobject.IndexableCommunity;
@@ -51,6 +58,17 @@ public class IndexClient extends DSpaceRunnable<IndexDiscoveryScriptConfiguratio
             return;
         }
 
+        String type = null;
+        if (commandLine.hasOption(TYPE_OPTION)) {
+            List<String> indexableObjectTypes = IndexObjectFactoryFactory.getInstance().getIndexFactories().stream()
+                    .map((indexFactory -> indexFactory.getType())).collect(Collectors.toList());
+            type = commandLine.getOptionValue(TYPE_OPTION);
+            if (!indexableObjectTypes.contains(type)) {
+                handler.handleException(String.format("%s is not a valid indexable object type, options: %s",
+                        type, Arrays.toString(indexableObjectTypes.toArray())));
+            }
+        }
+
         /** Acquire from dspace-services in future */
         /**
          * new DSpace.getServiceManager().getServiceByName("org.dspace.discovery.SolrIndexer");
@@ -92,7 +110,7 @@ public class IndexClient extends DSpaceRunnable<IndexDiscoveryScriptConfiguratio
                         .getHandleService().resolveToObject(context, param);
                 if (dso != null) {
                     final IndexFactory indexableObjectService = IndexObjectFactoryFactory.getInstance().
-                            getIndexFactoryByType(String.valueOf(dso.getType()));
+                            getIndexFactoryByType(Constants.typeText[dso.getType()]);
                     indexableObject = indexableObjectService.findIndexableObject(context, dso.getID().toString());
                 }
             }
@@ -113,6 +131,10 @@ public class IndexClient extends DSpaceRunnable<IndexDiscoveryScriptConfiguratio
         } else if (indexClientOptions == IndexClientOptions.BUILD ||
             indexClientOptions == IndexClientOptions.BUILDANDSPELLCHECK) {
             handler.logInfo("(Re)building index from scratch.");
+            if (StringUtils.isNotBlank(type)) {
+                handler.logWarning(String.format("Type option, %s, not applicable for entire index rebuild option, b" +
+                        ", type will be ignored", TYPE_OPTION));
+            }
             indexer.deleteIndex();
             indexer.createIndex(context);
             if (indexClientOptions == IndexClientOptions.BUILDANDSPELLCHECK) {
@@ -133,14 +155,14 @@ public class IndexClient extends DSpaceRunnable<IndexDiscoveryScriptConfiguratio
         } else if (indexClientOptions == IndexClientOptions.UPDATE ||
             indexClientOptions == IndexClientOptions.UPDATEANDSPELLCHECK) {
             handler.logInfo("Updating Index");
-            indexer.updateIndex(context, false);
+            indexer.updateIndex(context, false, type);
             if (indexClientOptions == IndexClientOptions.UPDATEANDSPELLCHECK) {
                 checkRebuildSpellCheck(commandLine, indexer);
             }
         } else if (indexClientOptions == IndexClientOptions.FORCEUPDATE ||
             indexClientOptions == IndexClientOptions.FORCEUPDATEANDSPELLCHECK) {
             handler.logInfo("Updating Index");
-            indexer.updateIndex(context, true);
+            indexer.updateIndex(context, true, type);
             if (indexClientOptions == IndexClientOptions.FORCEUPDATEANDSPELLCHECK) {
                 checkRebuildSpellCheck(commandLine, indexer);
             }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java b/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java
index 74d9ba0c3a..b3f72cb772 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexClientOptions.java
@@ -8,8 +8,13 @@
 
 package org.dspace.discovery;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Options;
+import org.dspace.discovery.indexobject.factory.IndexObjectFactoryFactory;
 
 /**
  * This Enum holds all the possible options and combinations for the Index discovery script
@@ -29,6 +34,8 @@ public enum IndexClientOptions {
     FORCEUPDATEANDSPELLCHECK,
     HELP;
 
+    public static final String TYPE_OPTION = "t";
+
     /**
      * This method resolves the CommandLine parameters to figure out which action the index-discovery script should
      * perform
@@ -71,11 +78,15 @@ public enum IndexClientOptions {
 
     protected static Options constructOptions() {
         Options options = new Options();
+        List<String> indexableObjectTypes = IndexObjectFactoryFactory.getInstance().getIndexFactories().stream()
+                .map((indexFactory -> indexFactory.getType())).collect(Collectors.toList());
 
         options
             .addOption("r", "remove", true, "remove an Item, Collection or Community from index based on its handle");
         options.addOption("i", "index", true,
                           "add or update an Item, Collection or Community based on its handle or uuid");
+        options.addOption(TYPE_OPTION, "type", true, "reindex only specific type of " +
+                "(re)indexable objects; options: " + Arrays.toString(indexableObjectTypes.toArray()));
         options.addOption("c", "clean", false,
                           "clean existing index removing any documents that no longer exist in the db");
         options.addOption("d", "delete", false,
@@ -83,7 +94,7 @@ public enum IndexClientOptions {
         options.addOption("b", "build", false, "(re)build index, wiping out current one if it exists");
         options.addOption("s", "spellchecker", false, "Rebuild the spellchecker, can be combined with -b and -f.");
         options.addOption("f", "force", false,
-                          "if updating existing index, force each handle to be reindexed even if uptodate");
+                          "if updating existing index, force each handle to be reindexed even if up-to-date");
         options.addOption("h", "help", false, "print this help message");
         return options;
     }
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
index 80602ac804..611200e62a 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexEventConsumer.java
@@ -73,17 +73,22 @@ public class IndexEventConsumer implements Consumer {
 
         int st = event.getSubjectType();
         if (!(st == Constants.ITEM || st == Constants.BUNDLE
-            || st == Constants.COLLECTION || st == Constants.COMMUNITY || st == Constants.SITE)) {
+            || st == Constants.COLLECTION || st == Constants.COMMUNITY || st == Constants.SITE
+            || st == Constants.LDN_MESSAGE)) {
             log
                 .warn("IndexConsumer should not have been given this kind of Subject in an event, skipping: "
                           + event.toString());
             return;
         }
 
-        DSpaceObject subject = event.getSubject(ctx);
-
-        DSpaceObject object = event.getObject(ctx);
-
+        DSpaceObject subject = null;
+        DSpaceObject object = null;
+        try {
+            subject = event.getSubject(ctx);
+            object = event.getObject(ctx);
+        } catch (Exception e) {
+            log.warn("Could not find the related DSpace Object for event subject: " + st);
+        }
 
         // If event subject is a Bundle and event was Add or Remove,
         // transform the event to be a Modify on the owning Item.
@@ -110,7 +115,7 @@ public class IndexEventConsumer implements Consumer {
             case Event.MODIFY:
             case Event.MODIFY_METADATA:
                 if (subject == null) {
-                    if (st == Constants.SITE) {
+                    if (st == Constants.SITE || st == Constants.LDN_MESSAGE) {
                         // Update the indexable objects of type in event.detail of objects with ids in event.identifiers
                         for (String id : event.getIdentifiers()) {
                             IndexFactory indexableObjectService = IndexObjectFactoryFactory.getInstance().
diff --git a/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java b/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
index 2ef5affa47..6a80d52820 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/IndexingService.java
@@ -79,7 +79,7 @@ public interface IndexingService {
     /**
      * Atomically update the index of a single field for an object
      * @param context       The DSpace context
-     * @param uniqueIndexId The unqiue index ID of the object to update the index for
+     * @param uniqueIndexId The unique index ID of the object to update the index for
      * @param field         The field to update
      * @param fieldModifier The modifiers for the field to update. More information on how to atomically update a solr
      *                      field using a field modifier can be found here: https://yonik.com/solr/atomic-updates/
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java b/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java
index 60bf52836b..e94b1f2fb7 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SearchUtils.java
@@ -88,7 +88,7 @@ public class SearchUtils {
     /**
      * Retrieves the Discovery Configuration with a null prefix for a DSpace object.
      * @param context
-     *              the dabase context
+     *              the database context
      * @param dso
      *              the DSpace object
      * @return the Discovery Configuration for the specified DSpace object
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java b/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java
index f31feab612..6304f39a8c 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrSearchCore.java
@@ -8,8 +8,8 @@
 package org.dspace.discovery;
 
 import java.io.IOException;
-import javax.inject.Named;
 
+import jakarta.inject.Named;
 import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
index cd3797e3e3..67891f122b 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceImpl.java
@@ -30,8 +30,8 @@ import java.util.Map;
 import java.util.Optional;
 import java.util.TimeZone;
 import java.util.UUID;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.Transformer;
@@ -1230,7 +1230,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
         } catch (IOException | SQLException | SolrServerException e) {
             // Any acception that we get ignore it.
             // We do NOT want any crashed to shown by the user
-            log.error(LogHelper.getHeader(context, "Error while quering solr", "Query: " + query), e);
+            log.error(LogHelper.getHeader(context, "Error while querying solr", "Query: " + query), e);
             return new ArrayList<>(0);
         }
     }
@@ -1359,7 +1359,7 @@ public class SolrServiceImpl implements SearchService, IndexingService {
      * Gets the solr field that contains the facet value split on each word break to the end, so can be searched
      * on each word in the value, see {@link org.dspace.discovery.indexobject.ItemIndexFactoryImpl
      * #saveFacetPrefixParts(SolrInputDocument, DiscoverySearchFilter, String, String)}
-     * Ony applicable to facets of type {@link DiscoveryConfigurationParameters.TYPE_TEXT}, otherwise uses the regular
+     * Only applicable to facets of type {@link DiscoveryConfigurationParameters.TYPE_TEXT}, otherwise uses the regular
      * facet filter field
      */
     protected String transformPrefixFacetField(DiscoverFacetField facetFieldConfig, String field,
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexComparisonPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexComparisonPlugin.java
new file mode 100644
index 0000000000..001d1c51a4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceIndexComparisonPlugin.java
@@ -0,0 +1,95 @@
+/**
+ * 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.discovery;
+
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.tika.utils.StringUtils;
+import org.dspace.content.Item;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.service.DuplicateDetectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.discovery.indexobject.IndexableItem;
+import org.dspace.discovery.indexobject.IndexableWorkflowItem;
+import org.dspace.discovery.indexobject.IndexableWorkspaceItem;
+import org.dspace.services.ConfigurationService;
+import org.dspace.workflow.WorkflowItem;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Indexes special normalised values used for comparing items, to be used in e.g. basic duplicate detection
+ *
+ * @author Kim Shepherd
+ */
+public class SolrServiceIndexComparisonPlugin implements SolrServiceIndexPlugin {
+
+    @Autowired
+    ConfigurationService configurationService;
+    @Autowired
+    ItemService itemService;
+    @Autowired
+    DuplicateDetectionService duplicateDetectionService;
+
+    private static final Logger log = org.apache.logging.log4j.LogManager
+        .getLogger(SolrServiceIndexComparisonPlugin.class);
+
+    /**
+     * Index the normalised name of the item to a solr field
+     *
+     * @param context DSpace context
+     * @param idxObj the indexable item
+     * @param document the Solr document
+     */
+    @Override
+    public void additionalIndex(Context context, IndexableObject idxObj, SolrInputDocument document) {
+        // Immediately return if this feature is not configured
+        if (!configurationService.getBooleanProperty("duplicate.enable", false)) {
+            return;
+        }
+        // Otherwise, continue with item indexing. Handle items, workflow items, and workspace items
+        if (idxObj instanceof IndexableItem) {
+            indexItemComparisonValue(context, ((IndexableItem) idxObj).getIndexedObject(), document);
+        } else if (idxObj instanceof IndexableWorkspaceItem) {
+            WorkspaceItem workspaceItem = ((IndexableWorkspaceItem) idxObj).getIndexedObject();
+            if (workspaceItem != null) {
+                Item item = workspaceItem.getItem();
+                if (item != null) {
+                    indexItemComparisonValue(context, item, document);
+                }
+            }
+        } else if (idxObj instanceof IndexableWorkflowItem) {
+            WorkflowItem workflowItem = ((IndexableWorkflowItem) idxObj).getIndexedObject();
+            if (workflowItem != null) {
+                Item item = workflowItem.getItem();
+                if (item != null) {
+                    indexItemComparisonValue(context, item, document);
+                }
+            }
+        }
+    }
+
+    /**
+     * Add the actual comparison value field to the given solr doc
+     *
+     * @param context DSpace context
+     * @param item DSpace item
+     * @param document Solr document
+     */
+    private void indexItemComparisonValue(Context context, Item item, SolrInputDocument document) {
+        if (item != null) {
+            // Build normalised comparison value and add to the document
+            String comparisonValue = duplicateDetectionService.buildComparisonValue(context, item);
+            if (!StringUtils.isBlank(comparisonValue)) {
+                // Add the field to the document
+                document.addField(configurationService.getProperty("duplicate.comparison.solr.field",
+                        "deduplication_keyword"), comparisonValue);
+            }
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
index 746a0cb832..dda041c7b8 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/SolrServiceMetadataBrowseIndexingPlugin.java
@@ -79,7 +79,7 @@ public class SolrServiceMetadataBrowseIndexingPlugin implements SolrServiceIndex
         // Faceting for metadata browsing. It is different than search facet
         // because if there are authority with variants support we want all the
         // variants to go in the facet... they are sorted by count so just the
-        // prefered label is relevant
+        // preferred label is relevant
         for (BrowseIndex bi : bis) {
             log.debug("Indexing for item " + item.getID() + ", for index: "
                           + bi.getTableName());
@@ -280,7 +280,7 @@ public class SolrServiceMetadataBrowseIndexingPlugin implements SolrServiceIndex
             }
         }
 
-        // Add sorting options as configurated for the browse system
+        // Add sorting options as configured for the browse system
         try {
             for (SortOption so : SortOption.getSortOptions()) {
                 List<MetadataValue> dcvalue = itemService.getMetadataByMetadataString(item, so.getMetadata());
diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySearchFilter.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySearchFilter.java
index ac64573c5d..8767ea83da 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySearchFilter.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySearchFilter.java
@@ -57,7 +57,7 @@ public class DiscoverySearchFilter {
       * For the DiscoverySearchFilter only the TYPE_TEXT, TYPE_DATE and TYPE_HIERARCHICAL are allowed
       *
       * @param type  The type for this DiscoverySearchFilter
-      * @throws DiscoveryConfigurationException  If none of the types match, this error will be thrown indiciating this
+      * @throws DiscoveryConfigurationException  If none of the types match, this error will be thrown indicating this
       */
     public void setType(String type) throws DiscoveryConfigurationException {
         if (type.equalsIgnoreCase(DiscoveryConfigurationParameters.TYPE_TEXT)) {
diff --git a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortConfiguration.java b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortConfiguration.java
index cd1a4eecb8..066e3c73e9 100644
--- a/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/discovery/configuration/DiscoverySortConfiguration.java
@@ -9,8 +9,8 @@ package org.dspace.discovery.configuration;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexableLDNNotification.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexableLDNNotification.java
new file mode 100644
index 0000000000..86d600b6c9
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/IndexableLDNNotification.java
@@ -0,0 +1,53 @@
+/**
+ * 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.discovery.indexobject;
+
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.discovery.IndexableObject;
+
+/**
+ * {@link LDNMessageEntity} implementation for the {@link IndexableObject}
+ *
+ * @author Stefano Maffei at 4science.com
+ */
+public class IndexableLDNNotification extends AbstractIndexableObject<LDNMessageEntity, String> {
+
+    private LDNMessageEntity ldnMessage;
+    public static final String TYPE = LDNMessageEntity.class.getSimpleName();
+
+    public IndexableLDNNotification(LDNMessageEntity ldnMessage) {
+        super();
+        this.ldnMessage = ldnMessage;
+    }
+
+    @Override
+    public String getType() {
+        return getTypeText();
+    }
+
+    @Override
+    public String getID() {
+        return ldnMessage.getID();
+    }
+
+    @Override
+    public LDNMessageEntity getIndexedObject() {
+        return ldnMessage;
+    }
+
+    @Override
+    public void setIndexedObject(LDNMessageEntity object) {
+        this.ldnMessage = object;
+    }
+
+    @Override
+    public String getTypeText() {
+        return TYPE;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/discovery/indexobject/LDNMessageEntityIndexFactoryImpl.java b/dspace-api/src/main/java/org/dspace/discovery/indexobject/LDNMessageEntityIndexFactoryImpl.java
new file mode 100644
index 0000000000..7752ae5862
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/discovery/indexobject/LDNMessageEntityIndexFactoryImpl.java
@@ -0,0 +1,157 @@
+/**
+ * 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.discovery.indexobject;
+
+import static org.apache.commons.lang3.time.DateFormatUtils.format;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.solr.common.SolrInputDocument;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Factory implementation implementation for the
+ * {@link IndexableLDNNotification}
+ *
+ * @author Stefano Maffei at 4science.com
+ */
+public class LDNMessageEntityIndexFactoryImpl extends IndexFactoryImpl<IndexableLDNNotification, LDNMessageEntity> {
+
+    @Autowired(required = true)
+    private LDNMessageService ldnMessageService;
+    @Autowired(required = true)
+    private ItemService itemService;
+
+    @Override
+    public Iterator<IndexableLDNNotification> findAll(Context context) throws SQLException {
+        final Iterator<LDNMessageEntity> ldnNotifications = ldnMessageService.findAll(context).iterator();
+        return new Iterator<>() {
+            @Override
+            public boolean hasNext() {
+                return ldnNotifications.hasNext();
+            }
+
+            @Override
+            public IndexableLDNNotification next() {
+                return new IndexableLDNNotification(ldnNotifications.next());
+            }
+        };
+    }
+
+    @Override
+    public String getType() {
+        return IndexableLDNNotification.TYPE;
+    }
+
+    @Override
+    public Optional<IndexableLDNNotification> findIndexableObject(Context context, String id) throws SQLException {
+        final LDNMessageEntity ldnMessage = ldnMessageService.find(context, id);
+        return ldnMessage == null ? Optional.empty() : Optional.of(new IndexableLDNNotification(ldnMessage));
+    }
+
+    @Override
+    public boolean supports(Object object) {
+        return object instanceof LDNMessageEntity;
+    }
+
+    @Override
+    public List<IndexableLDNNotification> getIndexableObjects(Context context, LDNMessageEntity object)
+        throws SQLException {
+        return Arrays.asList(new IndexableLDNNotification(object));
+    }
+
+    @Override
+    public SolrInputDocument buildDocument(Context context, IndexableLDNNotification indexableObject)
+        throws SQLException, IOException {
+        // Add the ID's, types and call the SolrServiceIndexPlugins
+        final SolrInputDocument doc = super.buildDocument(context, indexableObject);
+        final LDNMessageEntity ldnMessage = indexableObject.getIndexedObject();
+        // add schema, element, qualifier and full fieldName
+        doc.addField("notification_id", ldnMessage.getID());
+        doc.addField("queue_status_i", ldnMessage.getQueueStatus());
+        doc.addField("queue_status_s", LDNMessageEntity.getQueueStatus(ldnMessage));
+        addFacetIndex(doc, "queue_status", String.valueOf(ldnMessage.getQueueStatus()),
+            LDNMessageEntity.getQueueStatus(ldnMessage));
+        if (ldnMessage.getObject() != null && ldnMessage.getObject().getID() != null) {
+            Item item = itemService.findByIdOrLegacyId(context, ldnMessage.getObject().getID().toString());
+            if (item != null) {
+                addFacetIndex(doc, "object", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
+                addFacetIndex(doc, "relateditem", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
+            }
+        }
+        if (ldnMessage.getContext() != null && ldnMessage.getContext().getID() != null) {
+            Item item = itemService.findByIdOrLegacyId(context, ldnMessage.getContext().getID().toString());
+            if (item != null) {
+                addFacetIndex(doc, "context", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
+                addFacetIndex(doc, "relateditem", item.getID().toString(), itemService.getMetadata(item, "dc.title"));
+            }
+        }
+        NotifyServiceEntity origin = ldnMessage.getOrigin();
+        if (origin != null) {
+            addFacetIndex(doc, "origin", String.valueOf(origin.getID()),
+                LDNMessageEntity.getServiceNameForNotifyServ(origin));
+            addFacetIndex(doc, "ldn_service", String.valueOf(origin.getID()),
+                LDNMessageEntity.getServiceNameForNotifyServ(origin));
+        }
+        NotifyServiceEntity target = ldnMessage.getTarget();
+        if (target != null) {
+            addFacetIndex(doc, "target", String.valueOf(target.getID()),
+                LDNMessageEntity.getServiceNameForNotifyServ(target));
+            addFacetIndex(doc, "ldn_service", String.valueOf(target.getID()),
+                LDNMessageEntity.getServiceNameForNotifyServ(target));
+        }
+        if (ldnMessage.getInReplyTo() != null) {
+            doc.addField("in_reply_to", ldnMessage.getInReplyTo().getID());
+        }
+        doc.addField("message", ldnMessage.getMessage());
+        doc.addField("type", ldnMessage.getType());
+        addFacetIndex(doc, "activity_stream_type", ldnMessage.getActivityStreamType(),
+            ldnMessage.getActivityStreamType());
+        addFacetIndex(doc, "coar_notify_type", ldnMessage.getCoarNotifyType(), ldnMessage.getCoarNotifyType());
+        doc.addField("queue_attempts", ldnMessage.getQueueAttempts());
+        doc.addField("queue_attempts_sort", ldnMessage.getQueueAttempts());
+
+        indexDateFieldForFacet(doc, ldnMessage.getQueueLastStartTime());
+
+        doc.addField("queue_timeout", ldnMessage.getQueueTimeout());
+        String notificationType = LDNMessageEntity.getNotificationType(ldnMessage);
+        addFacetIndex(doc, "notification_type", notificationType, notificationType);
+
+        return doc;
+    }
+
+    private void indexDateFieldForFacet(SolrInputDocument doc, Date queueLastStartTime) {
+        if (queueLastStartTime != null) {
+            String value = format(queueLastStartTime, "yyyy-MM-dd");
+            addFacetIndex(doc, "queue_last_start_time", value, value);
+            doc.addField("queue_last_start_time", value);
+            doc.addField("queue_last_start_time_dt", queueLastStartTime);
+            doc.addField("queue_last_start_time_min", value);
+            doc.addField("queue_last_start_time_min_sort", value);
+            doc.addField("queue_last_start_time_max", value);
+            doc.addField("queue_last_start_time_max_sort", value);
+            doc.addField("queue_last_start_time.year",
+                Integer.parseInt(format(queueLastStartTime, "yyyy")));
+            doc.addField("queue_last_start_time.year_sort",
+                Integer.parseInt(format(queueLastStartTime, "yyyy")));
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
index 3d4eab125f..4fb95962b2 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/AccountServiceImpl.java
@@ -10,8 +10,8 @@ package org.dspace.eperson;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Locale;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.service.AuthenticationService;
@@ -73,7 +73,7 @@ public class AccountServiceImpl implements AccountService {
      * @param email   Email address to send the registration email to
      * @throws java.sql.SQLException passed through.
      * @throws java.io.IOException passed through.
-     * @throws javax.mail.MessagingException passed through.
+     * @throws jakarta.mail.MessagingException passed through.
      * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Override
@@ -105,7 +105,7 @@ public class AccountServiceImpl implements AccountService {
      * @param email   Email address to send the forgot-password email to
      * @throws java.sql.SQLException passed through.
      * @throws java.io.IOException passed through.
-     * @throws javax.mail.MessagingException passed through.
+     * @throws jakarta.mail.MessagingException passed through.
      * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java
index 0ab66aea5c..b213675b16 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/CaptchaServiceImpl.java
@@ -14,9 +14,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
-import javax.annotation.PostConstruct;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.PostConstruct;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.HttpClient;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPerson.java b/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
index da83a1cafd..f79efebf5f 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPerson.java
@@ -11,27 +11,25 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.content.DSpaceObject;
+import org.dspace.content.CacheableDSpaceObject;
 import org.dspace.content.DSpaceObjectLegacySupport;
 import org.dspace.content.Item;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.proxy.HibernateProxyHelper;
 
 /**
  * Class representing an e-person.
@@ -39,10 +37,8 @@ import org.hibernate.proxy.HibernateProxyHelper;
  * @author David Stuve
  */
 @Entity
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy")
 @Table(name = "eperson")
-public class EPerson extends DSpaceObject implements DSpaceObjectLegacySupport {
+public class EPerson extends CacheableDSpaceObject implements DSpaceObjectLegacySupport {
     @Column(name = "eperson_id", insertable = false, updatable = false)
     private Integer legacyId;
 
@@ -178,7 +174,7 @@ public class EPerson extends DSpaceObject implements DSpaceObjectLegacySupport {
     /**
      * Set the EPerson's language.  Value is expected to be a Unix/POSIX
      * Locale specification of the form {language} or {language}_{territory},
-     * e.g. "en", "en_US", "pt_BR" (the latter is Brazilian Portugese).
+     * e.g. "en", "en_US", "pt_BR" (the latter is Brazilian Portuguese).
      *
      * @param context  The relevant DSpace Context.
      * @param language language code
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
index feefe65717..8970bb2849 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonConsumer.java
@@ -10,8 +10,8 @@ package org.dspace.eperson;
 import java.io.IOException;
 import java.util.Date;
 import java.util.UUID;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Constants;
@@ -47,7 +47,7 @@ public class EPersonConsumer implements Consumer {
             = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     /**
-     * Initalise the consumer
+     * Initialise the consumer
      *
      * @throws Exception if error
      */
diff --git a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
index 453d5d0726..40e0859be1 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/EPersonServiceImpl.java
@@ -33,6 +33,7 @@ import org.dspace.content.DSpaceObjectServiceImpl;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataField;
 import org.dspace.content.MetadataValue;
+import org.dspace.content.QAEventProcessed;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.ItemService;
@@ -47,6 +48,7 @@ import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.SubscribeService;
 import org.dspace.event.Event;
 import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.qaevent.dao.QAEventsDAO;
 import org.dspace.services.ConfigurationService;
 import org.dspace.util.UUIDUtils;
 import org.dspace.versioning.Version;
@@ -106,6 +108,8 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
     protected ConfigurationService configurationService;
     @Autowired
     protected OrcidTokenService orcidTokenService;
+    @Autowired
+    protected QAEventsDAO qaEventsDao;
 
     protected EPersonServiceImpl() {
         super();
@@ -339,11 +343,11 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
         try {
             delete(context, ePerson, true);
         } catch (AuthorizeException ex) {
-            log.error("This AuthorizeException: " + ex + " occured while deleting Eperson with the ID: " +
+            log.error("This AuthorizeException: " + ex + " occurred while deleting Eperson with the ID: " +
                       ePerson.getID());
             throw new AuthorizeException(ex);
         } catch (IOException ex) {
-            log.error("This IOException: " + ex + " occured while deleting Eperson with the ID: " + ePerson.getID());
+            log.error("This IOException: " + ex + " occurred while deleting Eperson with the ID: " + ePerson.getID());
             throw new AuthorizeException(ex);
         } catch (EPersonDeletionException e) {
             throw new IllegalStateException(e);
@@ -447,7 +451,7 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
                                                                               ePerson, task.getStepID());
                             } catch (WorkflowConfigurationException ex) {
                                 log.error("This WorkflowConfigurationException: " + ex +
-                                          " occured while deleting Eperson with the ID: " + ePerson.getID());
+                                          " occurred while deleting Eperson with the ID: " + ePerson.getID());
                                 throw new AuthorizeException(new EPersonDeletionException(Collections
                                                                                           .singletonList(tableName)));
                             }
@@ -492,6 +496,11 @@ public class EPersonServiceImpl extends DSpaceObjectServiceImpl<EPerson> impleme
         // Remove any subscriptions
         subscribeService.deleteByEPerson(context, ePerson);
 
+        List<QAEventProcessed> qaEvents = qaEventsDao.findByEPerson(context, ePerson);
+        for (QAEventProcessed qaEvent : qaEvents) {
+            qaEventsDao.delete(context, qaEvent);
+        }
+
         // Remove ourself
         ePersonDAO.delete(context, ePerson);
 
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Group.java b/dspace-api/src/main/java/org/dspace/eperson/Group.java
index 67655e0e0a..24b44b8149 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Group.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Group.java
@@ -10,23 +10,21 @@ package org.dspace.eperson;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.Cacheable;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
 import org.apache.commons.lang3.StringUtils;
-import org.dspace.content.DSpaceObject;
+import org.dspace.content.CacheableDSpaceObject;
 import org.dspace.content.DSpaceObjectLegacySupport;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
-import org.hibernate.annotations.CacheConcurrencyStrategy;
-import org.hibernate.proxy.HibernateProxyHelper;
+import org.dspace.core.HibernateProxyHelper;
 
 /**
  * Class representing a group of e-people.
@@ -34,10 +32,8 @@ import org.hibernate.proxy.HibernateProxyHelper;
  * @author David Stuve
  */
 @Entity
-@Cacheable
-@org.hibernate.annotations.Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE, include = "non-lazy")
 @Table(name = "epersongroup")
-public class Group extends DSpaceObject implements DSpaceObjectLegacySupport {
+public class Group extends CacheableDSpaceObject implements DSpaceObjectLegacySupport {
 
     @Transient
     public static final String ANONYMOUS = "Anonymous";
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java b/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java
index 09bdf34d4c..a1c12371f5 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Group2GroupCache.java
@@ -8,14 +8,14 @@
 package org.dspace.eperson;
 
 import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
 
-import org.hibernate.proxy.HibernateProxyHelper;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import org.dspace.core.HibernateProxyHelper;
 
 /**
  * Database entity representation of the group2groupcache table
diff --git a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
index 730053e42c..3fb20e2f1e 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/GroupServiceImpl.java
@@ -147,7 +147,7 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
     public void addMember(Context context, Group groupParent, Group groupChild) throws SQLException {
         // don't add if it's already a member
         // and don't add itself
-        if (groupParent.contains(groupChild) || groupParent.getID() == groupChild.getID()) {
+        if (groupParent.contains(groupChild) || groupParent.getID().equals(groupChild.getID())) {
             return;
         }
 
@@ -178,7 +178,7 @@ public class GroupServiceImpl extends DSpaceObjectServiceImpl<Group> implements
                 Role role = stepByName.getRole();
                 for (CollectionRole collectionRole : collectionRoles) {
                     if (StringUtils.equals(collectionRole.getRoleId(), role.getId())
-                            && claimedTask.getWorkflowItem().getCollection() == collectionRole.getCollection()) {
+                            && claimedTask.getWorkflowItem().getCollection().equals(collectionRole.getCollection())) {
                         // Count number of EPersons who are *direct* members of this group
                         int totalDirectEPersons = ePersonService.countByGroups(context, Set.of(group));
                         // Count number of Groups which have this groupParent as a direct parent
diff --git a/dspace-api/src/main/java/org/dspace/eperson/PasswordHash.java b/dspace-api/src/main/java/org/dspace/eperson/PasswordHash.java
index 17340c5a58..ba34df4dae 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/PasswordHash.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/PasswordHash.java
@@ -16,10 +16,10 @@ import java.util.Arrays;
 
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.codec.binary.Hex;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * For handling digested secrets (such as passwords).
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
  * @author mwood
  */
 public class PasswordHash {
-    private static final Logger log = LoggerFactory.getLogger(PasswordHash.class);
+    private static final Logger log = LogManager.getLogger();
     private static final ConfigurationService config
         = DSpaceServicesFactory.getInstance().getConfigurationService();
     private static final Charset UTF_8 = Charset.forName("UTF-8"); // Should always succeed:  UTF-8 is required
@@ -133,7 +133,7 @@ public class PasswordHash {
         try {
             hash = digest(salt, algorithm, password);
         } catch (NoSuchAlgorithmException e) {
-            log.error(e.getMessage());
+            log.error(e::getMessage);
             hash = new byte[] {0};
         }
     }
@@ -149,7 +149,7 @@ public class PasswordHash {
         try {
             candidate = digest(salt, algorithm, secret);
         } catch (NoSuchAlgorithmException e) {
-            log.error(e.getMessage());
+            log.error(e::getMessage);
             return false;
         }
         return Arrays.equals(candidate, hash);
@@ -225,7 +225,7 @@ public class PasswordHash {
         if (null == rng) {
             rng = new SecureRandom();
             log.info("Initialized a random number stream using {} provided by {}",
-                     rng.getAlgorithm(), rng.getProvider());
+                    rng::getAlgorithm, rng::getProvider);
             rngUses = 0;
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/eperson/RegistrationData.java b/dspace-api/src/main/java/org/dspace/eperson/RegistrationData.java
index f4f41bdff2..0d0c5e7db8 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/RegistrationData.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/RegistrationData.java
@@ -8,16 +8,16 @@
 package org.dspace.eperson;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 
diff --git a/dspace-api/src/main/java/org/dspace/eperson/Subscription.java b/dspace-api/src/main/java/org/dspace/eperson/Subscription.java
index 5db63740f4..0f473a5a75 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/Subscription.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/Subscription.java
@@ -9,19 +9,19 @@ package org.dspace.eperson;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java b/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java
index 7526535d7f..8d372966b1 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/SubscriptionParameter.java
@@ -7,16 +7,15 @@
  */
 package org.dspace.eperson;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.ReloadableEntity;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
index 87d6c5869b..7d8e0720c4 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/EPersonDAOImpl.java
@@ -15,11 +15,11 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.ListUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java
index 83fb48aaf0..1cd359188c 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/Group2GroupCacheDAOImpl.java
@@ -10,12 +10,12 @@ package org.dspace.eperson.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.Group;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/GroupDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/GroupDAOImpl.java
index 6aea9ecd8d..abd9fc830f 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/GroupDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/GroupDAOImpl.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Query;
 
+import jakarta.persistence.Query;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.dspace.content.MetadataField;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/RegistrationDataDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/RegistrationDataDAOImpl.java
index 4a15dcc867..63e87400ce 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/RegistrationDataDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/RegistrationDataDAOImpl.java
@@ -8,11 +8,11 @@
 package org.dspace.eperson.dao.impl;
 
 import java.sql.SQLException;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.RegistrationData;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java
index 6c36211f31..d3d4748728 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/dao/impl/SubscriptionDAOImpl.java
@@ -11,12 +11,12 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
@@ -44,11 +44,12 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
     public List<Subscription> findByEPerson(Context context, EPerson eperson, Integer limit, Integer offset)
             throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        javax.persistence.criteria.CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
+        jakarta.persistence.criteria.CriteriaQuery criteriaQuery =
+            getCriteriaQuery(criteriaBuilder, Subscription.class);
         Root<Subscription> subscriptionRoot = criteriaQuery.from(Subscription.class);
         criteriaQuery.select(subscriptionRoot);
         criteriaQuery.where(criteriaBuilder.equal(subscriptionRoot.get(Subscription_.ePerson), eperson));
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.dSpaceObject)));
         criteriaQuery.orderBy(orderList);
         return list(context, criteriaQuery, false, Subscription.class, limit, offset);
@@ -59,7 +60,7 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
                                                   DSpaceObject dSpaceObject,
                                                   Integer limit, Integer offset) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        javax.persistence.criteria.CriteriaQuery criteriaQuery =
+        jakarta.persistence.criteria.CriteriaQuery criteriaQuery =
                 getCriteriaQuery(criteriaBuilder, Subscription.class);
         Root<Subscription> subscriptionRoot = criteriaQuery.from(Subscription.class);
         criteriaQuery.select(subscriptionRoot);
@@ -67,7 +68,7 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
                             subscriptionRoot.get(Subscription_.ePerson), eperson),
                 criteriaBuilder.equal(subscriptionRoot.get(Subscription_.dSpaceObject), dSpaceObject)
         ));
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.dSpaceObject)));
         criteriaQuery.orderBy(orderList);
         return list(context, criteriaQuery, false, Subscription.class, limit, offset);
@@ -104,7 +105,7 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
     public List<Subscription> findAllOrderedByIDAndResourceType(Context context, String resourceType,
                                                                 Integer limit, Integer offset) throws SQLException {
         String hqlQuery = "select s from Subscription s join %s dso " +
-                "ON dso.id = s.dSpaceObject ORDER BY subscription_id";
+                "ON dso = s.dSpaceObject ORDER BY s.id";
         if (resourceType != null) {
             hqlQuery = String.format(hqlQuery, resourceType);
         }
@@ -125,7 +126,7 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
         CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Subscription.class);
         Root<Subscription> subscriptionRoot = criteriaQuery.from(Subscription.class);
         criteriaQuery.select(subscriptionRoot);
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.dSpaceObject)));
         criteriaQuery.orderBy(orderList);
         return list(context, criteriaQuery, false, Subscription.class, limit, offset);
@@ -145,7 +146,7 @@ public class SubscriptionDAOImpl extends AbstractHibernateDAO<Subscription> impl
                 criteriaBuilder.equal(childJoin.get(SubscriptionParameter_.name), "frequency"),
                 criteriaBuilder.equal(childJoin.get(SubscriptionParameter_.value), frequencyValue)
                 ));
-        List<javax.persistence.criteria.Order> orderList = new ArrayList<>(1);
+        List<jakarta.persistence.criteria.Order> orderList = new ArrayList<>(1);
         orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.ePerson)));
         orderList.add(criteriaBuilder.asc(subscriptionRoot.get(Subscription_.id)));
         criteriaQuery.orderBy(orderList);
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java b/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java
index c8ecb0cc67..637b81c41d 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/service/AccountService.java
@@ -9,8 +9,8 @@ package org.dspace.eperson.service;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java b/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
index 2afec161a6..b3583155f3 100644
--- a/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
+++ b/dspace-api/src/main/java/org/dspace/eperson/service/EPersonService.java
@@ -13,8 +13,8 @@ import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
-import javax.validation.constraints.NotNull;
 
+import jakarta.validation.constraints.NotNull;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
diff --git a/dspace-api/src/main/java/org/dspace/event/Event.java b/dspace-api/src/main/java/org/dspace/event/Event.java
index af8b2d4571..1f90381d00 100644
--- a/dspace-api/src/main/java/org/dspace/event/Event.java
+++ b/dspace-api/src/main/java/org/dspace/event/Event.java
@@ -104,8 +104,10 @@ public class Event implements Serializable {
 
     protected static final int EPERSON = 1 << Constants.EPERSON; // 7
 
+    protected static final int LDN_MESSAGE = 1 << Constants.LDN_MESSAGE; // 8
+
     protected static final int ALL_OBJECTS_MASK = BITSTREAM | BUNDLE | ITEM
-        | COLLECTION | COMMUNITY | SITE | GROUP | EPERSON;
+        | COLLECTION | COMMUNITY | SITE | GROUP | EPERSON | LDN_MESSAGE;
 
     protected static Map<Integer, Integer> objTypeToMask = new HashMap<Integer, Integer>();
 
@@ -135,6 +137,9 @@ public class Event implements Serializable {
 
         objTypeToMask.put(Constants.EPERSON, EPERSON);
         objMaskToType.put(EPERSON, Constants.EPERSON);
+
+        objTypeToMask.put(Constants.LDN_MESSAGE, LDN_MESSAGE);
+        objMaskToType.put(LDN_MESSAGE, Constants.LDN_MESSAGE);
     }
 
     /** ---------- Event Fields ------------- * */
@@ -188,7 +193,7 @@ public class Event implements Serializable {
      * Contains all identifiers of the DSpaceObject that was changed (added,
      * modified, deleted, ...).
      *
-     * All events gets fired when a context that contains events gets commited.
+     * All events gets fired when a context that contains events gets committed.
      * When the delete event is fired, a deleted DSpaceObject is already gone.
      * This array contains all identifiers of the object, not only the handle
      * as the detail field does. The field may be an empty array if no
diff --git a/dspace-api/src/main/java/org/dspace/event/EventServiceImpl.java b/dspace-api/src/main/java/org/dspace/event/EventServiceImpl.java
index 1afc0a22f5..575c42250b 100644
--- a/dspace-api/src/main/java/org/dspace/event/EventServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/event/EventServiceImpl.java
@@ -107,7 +107,7 @@ public class EventServiceImpl implements EventService {
         try {
             return (Dispatcher) dispatcherPool.borrowObject(name);
         } catch (Exception e) {
-            throw new IllegalStateException("Unable to aquire dispatcher named " + name, e);
+            throw new IllegalStateException("Unable to acquire dispatcher named " + name, e);
         }
 
     }
@@ -153,7 +153,7 @@ public class EventServiceImpl implements EventService {
         // Prefix of keys in DSpace Configuration
         private static final String PROP_PFX = "event.dispatcher";
 
-        // Cache of event dispatchers, keyed by name, for re-use.
+        // Cache of event dispatchers, keyed by name, for reuse.
         protected Map<String, String> dispatchers = new HashMap<String, String>();
 
         public DispatcherPoolFactory() {
diff --git a/dspace-api/src/main/java/org/dspace/event/service/EventService.java b/dspace-api/src/main/java/org/dspace/event/service/EventService.java
index 5c032c3f74..d8b26e891b 100644
--- a/dspace-api/src/main/java/org/dspace/event/service/EventService.java
+++ b/dspace-api/src/main/java/org/dspace/event/service/EventService.java
@@ -27,7 +27,7 @@ public interface EventService {
      * if one exists.
      *
      * @param name dispatcher name
-     * @return chached instance of dispatcher
+     * @return cached instance of dispatcher
      */
     public Dispatcher getDispatcher(String name);
 
diff --git a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java b/dspace-api/src/main/java/org/dspace/external/OpenaireRestConnector.java
similarity index 91%
rename from dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
rename to dspace-api/src/main/java/org/dspace/external/OpenaireRestConnector.java
index b0aa4aba13..27688df6c7 100644
--- a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestConnector.java
+++ b/dspace-api/src/main/java/org/dspace/external/OpenaireRestConnector.java
@@ -16,7 +16,6 @@ import java.net.URL;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
-import javax.xml.bind.JAXBException;
 
 import eu.openaire.jaxb.helper.OpenAIREHandler;
 import eu.openaire.jaxb.model.Response;
@@ -40,20 +39,20 @@ import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * based on OrcidRestConnector it's a rest connector for OpenAIRE API providing
+ * based on OrcidRestConnector it's a rest connector for Openaire API providing
  * ways to perform searches and token grabbing
  * 
  * @author paulo-graca
  *
  */
-public class OpenAIRERestConnector {
+public class OpenaireRestConnector {
     /**
      * log4j logger
      */
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(OpenAIRERestConnector.class);
+    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(OpenaireRestConnector.class);
 
     /**
-     * OpenAIRE API Url
+     * Openaire API Url
      *  and can be configured with: openaire.api.url
      */
     private String url = "https://api.openaire.eu";
@@ -65,30 +64,30 @@ public class OpenAIRERestConnector {
     boolean tokenEnabled = false;
 
     /**
-     * OpenAIRE Authorization and Authentication Token Service URL
+     * Openaire Authorization and Authentication Token Service URL
      *  and can be configured with: openaire.token.url
      */
     private String tokenServiceUrl;
 
     /**
-     * OpenAIRE clientId
+     * Openaire clientId
      *  and can be configured with: openaire.token.clientId
      */
     private String clientId;
 
     /**
-     * OpenAIRERest access token
+     * OpenaireRest access token
      */
-    private OpenAIRERestToken accessToken;
+    private OpenaireRestToken accessToken;
 
     /**
-     * OpenAIRE clientSecret
+     * Openaire clientSecret
      *  and can be configured with: openaire.token.clientSecret
      */
     private String clientSecret;
 
 
-    public OpenAIRERestConnector(String url) {
+    public OpenaireRestConnector(String url) {
         this.url = url;
     }
 
@@ -99,7 +98,7 @@ public class OpenAIRERestConnector {
      * 
      * @throws IOException
      */
-    public OpenAIRERestToken grabNewAccessToken() throws IOException {
+    public OpenaireRestToken grabNewAccessToken() throws IOException {
 
         if (StringUtils.isBlank(tokenServiceUrl) || StringUtils.isBlank(clientId)
                 || StringUtils.isBlank(clientSecret)) {
@@ -145,13 +144,13 @@ public class OpenAIRERestConnector {
             throw new IOException("Unable to grab the access token using provided service url, client id and secret");
         }
 
-        return new OpenAIRERestToken(responseObject.get("access_token").toString(),
+        return new OpenaireRestToken(responseObject.get("access_token").toString(),
                 Long.valueOf(responseObject.get("expires_in").toString()));
 
     }
 
     /**
-     * Perform a GET request to the OpenAIRE API
+     * Perform a GET request to the Openaire API
      * 
      * @param file
      * @param accessToken
@@ -218,12 +217,12 @@ public class OpenAIRERestConnector {
     }
 
     /**
-     * Perform an OpenAIRE Project Search By Keywords
+     * Perform an Openaire Project Search By Keywords
      * 
      * @param page
      * @param size
      * @param keywords
-     * @return OpenAIRE Response
+     * @return Openaire Response
      */
     public Response searchProjectByKeywords(int page, int size, String... keywords) {
         String path = "search/projects?keywords=" + String.join("+", keywords);
@@ -231,13 +230,13 @@ public class OpenAIRERestConnector {
     }
 
     /**
-     * Perform an OpenAIRE Project Search By ID and by Funder
+     * Perform an Openaire Project Search By ID and by Funder
      * 
      * @param projectID
      * @param projectFunder
      * @param page
      * @param size
-     * @return OpenAIRE Response
+     * @return Openaire Response
      */
     public Response searchProjectByIDAndFunder(String projectID, String projectFunder, int page, int size) {
         String path = "search/projects?grantID=" + projectID + "&funder=" + projectFunder;
@@ -245,12 +244,12 @@ public class OpenAIRERestConnector {
     }
 
     /**
-     * Perform an OpenAIRE Search request
+     * Perform an Openaire Search request
      * 
      * @param path
      * @param page
      * @param size
-     * @return OpenAIRE Response
+     * @return Openaire Response
      */
     public Response search(String path, int page, int size) {
         String[] queryStringPagination = { "page=" + page, "size=" + size };
@@ -278,7 +277,7 @@ public class OpenAIRERestConnector {
         if (result != null) {
             try {
                 return OpenAIREHandler.unmarshal(result);
-            } catch (JAXBException e) {
+            } catch (Exception e) {
                 log.error("Error extracting result from request: " + queryString);
                 getGotError(e, path);
             }
diff --git a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestToken.java b/dspace-api/src/main/java/org/dspace/external/OpenaireRestToken.java
similarity index 89%
rename from dspace-api/src/main/java/org/dspace/external/OpenAIRERestToken.java
rename to dspace-api/src/main/java/org/dspace/external/OpenaireRestToken.java
index 203f09b3c6..f5dc2b27f8 100644
--- a/dspace-api/src/main/java/org/dspace/external/OpenAIRERestToken.java
+++ b/dspace-api/src/main/java/org/dspace/external/OpenaireRestToken.java
@@ -8,13 +8,13 @@
 package org.dspace.external;
 
 /**
- * OpenAIRE rest API token to be used when grabbing an accessToken.<br/>
+ * Openaire rest API token to be used when grabbing an accessToken.<br/>
  * Based on https://develop.openaire.eu/basic.html
  * 
  * @author paulo-graca
  *
  */
-public class OpenAIRERestToken {
+public class OpenaireRestToken {
 
     /**
      * Stored access token
@@ -32,7 +32,7 @@ public class OpenAIRERestToken {
      * @param accessToken
      * @param expiresIn
      */
-    public OpenAIRERestToken(String accessToken, Long expiresIn) {
+    public OpenaireRestToken(String accessToken, Long expiresIn) {
         this.accessToken = accessToken;
         this.setExpirationDate(expiresIn);
     }
diff --git a/dspace-api/src/main/java/org/dspace/external/model/ExternalDataObject.java b/dspace-api/src/main/java/org/dspace/external/model/ExternalDataObject.java
index eac9921df6..66b0b18fbc 100644
--- a/dspace-api/src/main/java/org/dspace/external/model/ExternalDataObject.java
+++ b/dspace-api/src/main/java/org/dspace/external/model/ExternalDataObject.java
@@ -9,7 +9,10 @@ package org.dspace.external.model;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.dto.MetadataValueDTO;
 
 /**
@@ -38,6 +41,8 @@ public class ExternalDataObject {
      */
     private String displayValue;
 
+    private Logger log = LogManager.getLogger(ExternalDataObject.class);
+
     /**
      * Default constructor
      */
@@ -143,4 +148,63 @@ public class ExternalDataObject {
     public void setValue(String value) {
         this.value = value;
     }
+
+    /**
+     * Sort metadata before printing, to help with comparison by eye
+     * @return
+     */
+    @Override
+    public String toString() {
+        List<MetadataValueDTO> thisMetadata = new ArrayList<>(this.metadata);
+        thisMetadata.sort(MetadataValueDTO.comparator());
+        return "ExternalDataObject{" +
+                "id='" + id + '\'' +
+                ", value='" + value + '\'' +
+                ", source='" + source + '\'' +
+                ", displayValue='" + displayValue + '\'' +
+                ", metadata=" + thisMetadata +
+                '}';
+    }
+
+    /**
+     * Equality test for ExternalDataObject takes into account the fact that we might have
+     * lists of metadata values which are identical except for sort order, so we sort and compare these
+     * using a custom comparator.
+     * @param o The other object ("that") with which to compare this object ("this")
+     * @return  true if objects are identical, false if not
+     */
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        ExternalDataObject that = (ExternalDataObject) o;
+        // Compare *sorted* lists
+        List<MetadataValueDTO> thisMetadata = new ArrayList<>(this.metadata);
+        List<MetadataValueDTO> thatMetadata = new ArrayList<>(that.metadata);
+        // Sort both lists using our custom comparator
+        thisMetadata.sort(MetadataValueDTO.comparator());
+        thatMetadata.sort(MetadataValueDTO.comparator());
+
+        // Return straight comparisons of basic member variables
+        return Objects.equals(id, that.id) &&
+                Objects.equals(value, that.value) &&
+                Objects.equals(source, that.source) &&
+                Objects.equals(displayValue, that.displayValue) &&
+                // Compare the sorted lists rather than the raw stored metadata
+                Objects.equals(thisMetadata, thatMetadata);
+    }
+
+    /**
+     * Explicit override of Object hashCode()
+     * @return
+     */
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, value, source, metadata, displayValue);
+    }
+
 }
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenaireFundingDataProvider.java
similarity index 94%
rename from dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java
rename to dspace-api/src/main/java/org/dspace/external/provider/impl/OpenaireFundingDataProvider.java
index 8ca5b7c0ea..62cef508c5 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenAIREFundingDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/OpenaireFundingDataProvider.java
@@ -31,7 +31,7 @@ import eu.openaire.oaf.model.base.Project;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.dto.MetadataValueDTO;
-import org.dspace.external.OpenAIRERestConnector;
+import org.dspace.external.OpenaireRestConnector;
 import org.dspace.external.model.ExternalDataObject;
 import org.dspace.external.provider.AbstractExternalDataProvider;
 import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
@@ -39,13 +39,13 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * This class is the implementation of the ExternalDataProvider interface that
- * will deal with the OpenAIRE External Data lookup
+ * will deal with the Openaire External Data lookup
  * 
  * @author paulo-graca
  */
-public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
+public class OpenaireFundingDataProvider extends AbstractExternalDataProvider {
 
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(OpenAIREFundingDataProvider.class);
+    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(OpenaireFundingDataProvider.class);
 
     /**
      * GrantAgreement prefix
@@ -75,7 +75,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
     /**
      * Connector to handle token and requests
      */
-    protected OpenAIRERestConnector connector;
+    protected OpenaireRestConnector connector;
 
     protected Map<String, MetadataFieldConfig> metadataFields;
 
@@ -93,7 +93,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
         // characters that must be escaped for the <:entry-id>
         String decodedId = new String(Base64.getDecoder().decode(id));
         if (!isValidProjectURI(decodedId)) {
-            log.error("Invalid ID for OpenAIREFunding - " + id);
+            log.error("Invalid ID for OpenaireFunding - " + id);
             return Optional.empty();
         }
         Response response = searchByProjectURI(decodedId);
@@ -101,7 +101,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
         try {
             if (response.getHeader() != null && Integer.parseInt(response.getHeader().getTotal()) > 0) {
                 Project project = response.getResults().getResult().get(0).getMetadata().getEntity().getProject();
-                ExternalDataObject externalDataObject = new OpenAIREFundingDataProvider
+                ExternalDataObject externalDataObject = new OpenaireFundingDataProvider
                         .ExternalDataObjectBuilder(project)
                         .setId(generateProjectURI(project))
                         .setSource(sourceIdentifier)
@@ -123,7 +123,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
             limit = LIMIT_DEFAULT;
         }
 
-        // OpenAIRE uses pages and first page starts with 1
+        // Openaire uses pages and first page starts with 1
         int page = (start / limit) + 1;
 
         // escaping query
@@ -148,7 +148,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
 
         if (projects.size() > 0) {
             return projects.stream()
-                    .map(project -> new OpenAIREFundingDataProvider
+                    .map(project -> new OpenaireFundingDataProvider
                             .ExternalDataObjectBuilder(project)
                             .setId(generateProjectURI(project))
                             .setSource(sourceIdentifier)
@@ -176,24 +176,24 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
      * Generic setter for the sourceIdentifier
      * 
      * @param sourceIdentifier The sourceIdentifier to be set on this
-     *                         OpenAIREFunderDataProvider
+     *                         OpenaireFunderDataProvider
      */
     @Autowired(required = true)
     public void setSourceIdentifier(String sourceIdentifier) {
         this.sourceIdentifier = sourceIdentifier;
     }
 
-    public OpenAIRERestConnector getConnector() {
+    public OpenaireRestConnector getConnector() {
         return connector;
     }
 
     /**
-     * Generic setter for OpenAIRERestConnector
+     * Generic setter for OpenaireRestConnector
      * 
      * @param connector
      */
     @Autowired(required = true)
-    public void setConnector(OpenAIRERestConnector connector) {
+    public void setConnector(OpenaireRestConnector connector) {
         this.connector = connector;
     }
 
@@ -219,7 +219,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
     }
 
     /**
-     * This method returns an URI based on OpenAIRE 3.0 guidelines
+     * This method returns an URI based on Openaire 3.0 guidelines
      * https://guidelines.openaire.eu/en/latest/literature/field_projectid.html that
      * can be used as an ID if is there any missing part, that part it will be
      * replaced by the character '+'
@@ -281,7 +281,7 @@ public class OpenAIREFundingDataProvider extends AbstractExternalDataProvider {
     }
 
     /**
-     * OpenAIRE Funding External Data Builder Class
+     * Openaire Funding External Data Builder Class
      * 
      * @author pgraca
      */
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java
index 4fdf15a8a3..05dabe0a5b 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/OrcidPublicationDataProvider.java
@@ -28,6 +28,8 @@ import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.dto.MetadataValueDTO;
@@ -63,13 +65,11 @@ import org.orcid.jaxb.model.v3.release.record.WorkTitle;
 import org.orcid.jaxb.model.v3.release.record.summary.WorkGroup;
 import org.orcid.jaxb.model.v3.release.record.summary.WorkSummary;
 import org.orcid.jaxb.model.v3.release.record.summary.Works;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Implementation of {@link ExternalDataProvider} that search for all the works
- * of the profile with the given orcid id that hava a source other than DSpace.
+ * of the profile with the given orcid id that have a source other than DSpace.
  * The id of the external data objects returned by the methods of this class is
  * the concatenation of the orcid id and the put code associated with the
  * publication, separated by :: (example 0000-0000-0123-4567::123456)
@@ -79,7 +79,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class OrcidPublicationDataProvider extends AbstractExternalDataProvider {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(OrcidPublicationDataProvider.class);
+    private final static Logger LOGGER = LogManager.getLogger();
 
     /**
      * Examples of valid ORCID IDs:
@@ -335,7 +335,8 @@ public class OrcidPublicationDataProvider extends AbstractExternalDataProvider {
         try {
             addMetadataValuesFromCitation(externalDataObject, work.getWorkCitation());
         } catch (Exception e) {
-            LOGGER.error("An error occurs reading the following citation: " + work.getWorkCitation().getCitation(), e);
+            LOGGER.error("An error occurs reading the following citation: {}",
+                    work.getWorkCitation().getCitation(), e);
         }
 
         return externalDataObject;
@@ -484,7 +485,7 @@ public class OrcidPublicationDataProvider extends AbstractExternalDataProvider {
 
     private boolean hasRole(Contributor contributor, ContributorRole role) {
         ContributorAttributes attributes = contributor.getContributorAttributes();
-        return attributes != null ? role.equals(attributes.getContributorRole()) : false;
+        return attributes != null ? role.value().equals(attributes.getContributorRole()) : false;
     }
 
     private Optional<String> getContributorName(Contributor contributor) {
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/impl/SHERPAv2JournalISSNDataProvider.java b/dspace-api/src/main/java/org/dspace/external/provider/impl/SHERPAv2JournalISSNDataProvider.java
index 9e61b9ac2a..11d8f692af 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/impl/SHERPAv2JournalISSNDataProvider.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/impl/SHERPAv2JournalISSNDataProvider.java
@@ -26,7 +26,7 @@ import org.dspace.external.provider.AbstractExternalDataProvider;
 
 /**
  * This class is the implementation of the ExternalDataProvider interface that will deal with SherpaJournal External
- * data lookups based on ISSN (to match functinoality offered by legacy SHERPASubmitService for policy lookups
+ * data lookups based on ISSN (to match functionality offered by legacy SHERPASubmitService for policy lookups
  * at the time of submission).
  * This provider is a refactored version of SherpaJournalDataPublisher, rewritten to work with SHERPA v2 API
  *
diff --git a/dspace-api/src/main/java/org/dspace/external/provider/orcid/xml/Converter.java b/dspace-api/src/main/java/org/dspace/external/provider/orcid/xml/Converter.java
index 756b8654f2..578db6c567 100644
--- a/dspace-api/src/main/java/org/dspace/external/provider/orcid/xml/Converter.java
+++ b/dspace-api/src/main/java/org/dspace/external/provider/orcid/xml/Converter.java
@@ -9,13 +9,13 @@ package org.dspace.external.provider.orcid.xml;
 
 import java.io.InputStream;
 import java.net.URISyntaxException;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.xml.sax.SAXException;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/external/service/ExternalDataService.java b/dspace-api/src/main/java/org/dspace/external/service/ExternalDataService.java
index 53423395e3..4c75a778d1 100644
--- a/dspace-api/src/main/java/org/dspace/external/service/ExternalDataService.java
+++ b/dspace-api/src/main/java/org/dspace/external/service/ExternalDataService.java
@@ -58,7 +58,7 @@ public interface ExternalDataService {
     public List<ExternalDataObject> searchExternalDataObjects(String source, String query, int start, int limit);
 
     /**
-     * This method wil return the total amount of results that will be found for the given query in the given source
+     * This method will return the total amount of results that will be found for the given query in the given source
      * @param source    The source in which the query will happen to return the number of results
      * @param query     The query to be ran in this source to retrieve the total amount of results
      * @return          The total amount of results that can be returned for this query in the given source
diff --git a/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java b/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java
index f91ea00cac..59cbe4f9d0 100644
--- a/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/external/service/impl/ExternalDataServiceImpl.java
@@ -13,6 +13,8 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
+import org.dspace.app.suggestion.SuggestionProvider;
+import org.dspace.app.suggestion.SuggestionService;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
@@ -44,6 +46,9 @@ public class ExternalDataServiceImpl implements ExternalDataService {
     @Autowired
     private WorkspaceItemService workspaceItemService;
 
+    @Autowired
+    private SuggestionService suggestionService;
+
     @Override
     public Optional<ExternalDataObject> getExternalDataObject(String source, String id) {
         ExternalDataProvider provider = getExternalDataProvider(source);
@@ -105,6 +110,16 @@ public class ExternalDataServiceImpl implements ExternalDataService {
         log.info(LogHelper.getHeader(context, "create_item_from_externalDataObject", "Created item" +
             "with id: " + item.getID() + " from source: " + externalDataObject.getSource() + " with identifier: " +
             externalDataObject.getId()));
+        try {
+            List<SuggestionProvider> providers = suggestionService.getSuggestionProviders();
+            if (providers != null) {
+                for (SuggestionProvider p : providers) {
+                    p.flagRelatedSuggestionsAsProcessed(context, externalDataObject);
+                }
+            }
+        } catch (Exception e) {
+            log.error("Got problems with the solr suggestion storage service: " + e.getMessage(), e);
+        }
         return workspaceItem;
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java b/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java
index c1c59acf4a..f5b27fcbd4 100644
--- a/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java
+++ b/dspace-api/src/main/java/org/dspace/google/GoogleAsyncEventListener.java
@@ -13,9 +13,9 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections.Buffer;
 import org.apache.commons.collections.BufferUtils;
 import org.apache.commons.collections.buffer.CircularFifoBuffer;
@@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Notifies Google Analytics of Bitstream VIEW events. These events are stored in memory and then
- * asynchronously processed by a single seperate thread.
+ * asynchronously processed by a single separate thread.
  *
  * @author April Herron
  * @author Luca Giamminonni
@@ -142,7 +142,7 @@ public class GoogleAsyncEventListener extends AbstractUsageEventListener {
     /**
      * Client ID, should uniquely identify the user or device. If we have an
      * X-CORRELATION-ID header or a session ID for the user, then lets use it,
-     * othwerwise generate a UUID.
+     * otherwise generate a UUID.
      */
     private String getClientId(UsageEvent usageEvent) {
         if (usageEvent.getRequest().getHeader("X-CORRELATION-ID") != null) {
diff --git a/dspace-api/src/main/java/org/dspace/google/GoogleRecorderEventListener.java b/dspace-api/src/main/java/org/dspace/google/GoogleRecorderEventListener.java
index 4159661b1c..fb4e9c04de 100644
--- a/dspace-api/src/main/java/org/dspace/google/GoogleRecorderEventListener.java
+++ b/dspace-api/src/main/java/org/dspace/google/GoogleRecorderEventListener.java
@@ -13,8 +13,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.entity.UrlEncodedFormEntity;
diff --git a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java
index b5ee1806cd..915bd25b06 100644
--- a/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java
+++ b/dspace-api/src/main/java/org/dspace/google/client/GoogleAnalyticsClientImpl.java
@@ -19,9 +19,9 @@ import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.google.GoogleAnalyticsEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of {@link GoogleAnalyticsClient}.
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
  */
 public class GoogleAnalyticsClientImpl implements GoogleAnalyticsClient {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(GoogleAnalyticsClientImpl.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private final String keyPrefix;
 
diff --git a/dspace-api/src/main/java/org/dspace/handle/Handle.java b/dspace-api/src/main/java/org/dspace/handle/Handle.java
index c35511353a..29182ad56c 100644
--- a/dspace-api/src/main/java/org/dspace/handle/Handle.java
+++ b/dspace-api/src/main/java/org/dspace/handle/Handle.java
@@ -7,17 +7,16 @@
  */
 package org.dspace.handle;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.content.DSpaceObject;
diff --git a/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java b/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
index aa730fe2b1..5f511875d1 100644
--- a/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/handle/HandleServiceImpl.java
@@ -312,7 +312,7 @@ public class HandleServiceImpl implements HandleService {
         Handle dbHandle = findHandleInternal(context, handle);
         if (dbHandle != null) {
             // Check if we have to remove the handle from the current handle list
-            // or if object is alreday deleted.
+            // or if object is already deleted.
             if (dbHandle.getDSpaceObject() != null) {
                 // Remove the old handle from the current handle list
                 dbHandle.getDSpaceObject().getHandles().remove(dbHandle);
diff --git a/dspace-api/src/main/java/org/dspace/handle/dao/impl/HandleDAOImpl.java b/dspace-api/src/main/java/org/dspace/handle/dao/impl/HandleDAOImpl.java
index 71bb798ae3..495f1f05a4 100644
--- a/dspace-api/src/main/java/org/dspace/handle/dao/impl/HandleDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/handle/dao/impl/HandleDAOImpl.java
@@ -13,11 +13,11 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
@@ -91,10 +91,9 @@ public class HandleDAOImpl extends AbstractHibernateDAO<Handle> implements Handl
     @Override
     public long countHandlesByPrefix(Context context, String prefix) throws SQLException {
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
-        CriteriaQuery criteriaQuery = getCriteriaQuery(criteriaBuilder, Handle.class);
+        CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
 
         Root<Handle> handleRoot = criteriaQuery.from(Handle.class);
-        criteriaQuery.select(handleRoot);
         criteriaQuery.where(criteriaBuilder.like(handleRoot.get(Handle_.handle), prefix + "%"));
         return countLong(context, criteriaQuery, criteriaBuilder, handleRoot);
     }
@@ -137,7 +136,7 @@ public class HandleDAOImpl extends AbstractHibernateDAO<Handle> implements Handl
 
                 // Find the next value in our sequence (based on DB dialect)
                 try (PreparedStatement preparedStatement = connection
-                    .prepareStatement(dialect.getSequenceNextValString(HANDLE_SEQUENCE))) {
+                    .prepareStatement("SELECT nextval('" + HANDLE_SEQUENCE + "')")) {
                     // Execute query and return results
                     try (ResultSet resultSet = preparedStatement.executeQuery()) {
                         if (resultSet.next()) {
diff --git a/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java
index fe50bba813..1973b92522 100644
--- a/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java
+++ b/dspace-api/src/main/java/org/dspace/handle/hdlresolver/HdlResolverDTO.java
@@ -57,7 +57,7 @@ public class HdlResolverDTO {
     }
 
     /**
-     * Returns the splitted String of the resource-path
+     * Returns the split String of the resource-path
      * 
      * @return
      */
diff --git a/dspace-api/src/main/java/org/dspace/harvest/HarvestThread.java b/dspace-api/src/main/java/org/dspace/harvest/HarvestThread.java
index 52498558d4..5947953ef5 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/HarvestThread.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/HarvestThread.java
@@ -58,12 +58,12 @@ public class HarvestThread extends Thread {
             } catch (RuntimeException e) {
                 log.error("Runtime exception in thread: " + this.toString());
                 log.error(e.getMessage() + " " + e.getCause());
-                hc.setHarvestMessage("Runtime error occured while generating an OAI response");
+                hc.setHarvestMessage("Runtime error occurred while generating an OAI response");
                 hc.setHarvestStatus(HarvestedCollection.STATUS_UNKNOWN_ERROR);
             } catch (Exception ex) {
                 log.error("General exception in thread: " + this.toString());
                 log.error(ex.getMessage() + " " + ex.getCause());
-                hc.setHarvestMessage("Error occured while generating an OAI response");
+                hc.setHarvestMessage("Error occurred while generating an OAI response");
                 hc.setHarvestStatus(HarvestedCollection.STATUS_UNKNOWN_ERROR);
             } finally {
                 try {
diff --git a/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollection.java b/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollection.java
index 9fe2bed67d..dc65ce2542 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollection.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/HarvestedCollection.java
@@ -8,20 +8,20 @@
 package org.dspace.harvest;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.persistence.Transient;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import jakarta.persistence.Transient;
 import org.dspace.content.Collection;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/harvest/HarvestedItem.java b/dspace-api/src/main/java/org/dspace/harvest/HarvestedItem.java
index 343347136b..943543f405 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/HarvestedItem.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/HarvestedItem.java
@@ -8,19 +8,19 @@
 package org.dspace.harvest;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedCollectionDAOImpl.java b/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedCollectionDAOImpl.java
index 95a0bdf216..ab942a74ef 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedCollectionDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedCollectionDAOImpl.java
@@ -11,11 +11,11 @@ import java.sql.SQLException;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Collection;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
@@ -46,7 +46,7 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
         Root<HarvestedCollection> harvestedCollectionRoot = criteriaQuery.from(HarvestedCollection.class);
         criteriaQuery.select(harvestedCollectionRoot);
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.desc(harvestedCollectionRoot.get(HarvestedCollection_.lastHarvested)));
         criteriaQuery.orderBy(orderList);
 
@@ -61,7 +61,7 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
         Root<HarvestedCollection> harvestedCollectionRoot = criteriaQuery.from(HarvestedCollection.class);
         criteriaQuery.select(harvestedCollectionRoot);
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(harvestedCollectionRoot.get(HarvestedCollection_.lastHarvested)));
         criteriaQuery.orderBy(orderList);
 
@@ -138,7 +138,7 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
                             )
         );
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.asc(harvestedCollectionRoot.get(HarvestedCollection_.lastHarvested)));
         criteriaQuery.orderBy(orderList);
 
@@ -150,11 +150,10 @@ public class HarvestedCollectionDAOImpl extends AbstractHibernateDAO<HarvestedCo
 
     @Override
     public int count(Context context) throws SQLException {
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
-
         Root<HarvestedCollection> harvestedCollectionRoot = criteriaQuery.from(HarvestedCollection.class);
+        criteriaQuery.select(criteriaBuilder.count(harvestedCollectionRoot));
         return count(context, criteriaQuery, criteriaBuilder, harvestedCollectionRoot);
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedItemDAOImpl.java
index 9e9838be6c..bb7ff0ee7c 100644
--- a/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/harvest/dao/impl/HarvestedItemDAOImpl.java
@@ -8,11 +8,11 @@
 package org.dspace.harvest.dao.impl;
 
 import java.sql.SQLException;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.content.Item_;
diff --git a/dspace-api/src/main/java/org/dspace/health/Report.java b/dspace-api/src/main/java/org/dspace/health/Report.java
index ebb2ffd688..d083a45b13 100644
--- a/dspace-api/src/main/java/org/dspace/health/Report.java
+++ b/dspace-api/src/main/java/org/dspace/health/Report.java
@@ -15,8 +15,8 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map.Entry;
 import java.util.StringTokenizer;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DOI.java b/dspace-api/src/main/java/org/dspace/identifier/DOI.java
index e99472e45c..2e699e990f 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DOI.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOI.java
@@ -8,17 +8,16 @@
 
 package org.dspace.identifier;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
index b70eda960d..29c6a5bb8f 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java
@@ -14,6 +14,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
@@ -30,8 +32,6 @@ import org.dspace.identifier.doi.DOIIdentifierException;
 import org.dspace.identifier.doi.DOIIdentifierNotApplicableException;
 import org.dspace.identifier.service.DOIService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -49,7 +49,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author Kim Shepherd
  */
 public class DOIIdentifierProvider extends FilteredIdentifierProvider {
-    private static final Logger log = LoggerFactory.getLogger(DOIIdentifierProvider.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * A DOIConnector connects the DOIIdentifierProvider to the API of the DOI
@@ -286,8 +286,8 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         try {
             doiRow = loadOrCreateDOI(context, dso, doi, filter);
         } catch (SQLException ex) {
-            log.error("Error in databse connection: " + ex.getMessage());
-            throw new RuntimeException("Error in database conncetion.", ex);
+            log.error("Error in database connection: {}", ex::getMessage);
+            throw new RuntimeException("Error in database connection.", ex);
         }
 
         if (DELETED.equals(doiRow.getStatus()) ||
@@ -473,7 +473,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
 
     /**
      * Update metadata for a registered object
-     * If the DOI for hte item already exists, *always* skip the filter since it should only be used for
+     * If the DOI for the item already exists, *always* skip the filter since it should only be used for
      * allowing / disallowing reservation and registration, not metadata updates or deletions
      *
      * @param context       - DSpace context
@@ -492,7 +492,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
 
         if (doiService.findDOIByDSpaceObject(context, dso) != null) {
             // We can skip the filter here since we know the DOI already exists for the item
-            log.debug("updateMetadata: found DOIByDSpaceObject: " +
+            log.debug("updateMetadata: found DOIByDSpaceObject: {}",
                 doiService.findDOIByDSpaceObject(context, dso).getDoi());
             updateFilter = DSpaceServicesFactory.getInstance().getServiceManager().getServiceByName(
                     "always_true_filter", TrueFilter.class);
@@ -501,7 +501,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         DOI doiRow = loadOrCreateDOI(context, dso, doi, updateFilter);
 
         if (PENDING.equals(doiRow.getStatus()) || MINTED.equals(doiRow.getStatus())) {
-            log.info("Not updating metadata for PENDING or MINTED doi: " + doi);
+            log.info("Not updating metadata for PENDING or MINTED doi: {}", doi);
             return;
         }
 
@@ -525,7 +525,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
 
     /**
      * Update metadata for a registered object in the DOI Connector to update the agency records
-     * If the DOI for hte item already exists, *always* skip the filter since it should only be used for
+     * If the DOI for the item already exists, *always* skip the filter since it should only be used for
      * allowing / disallowing reservation and registration, not metadata updates or deletions
      *
      * @param context       - DSpace context
@@ -611,8 +611,8 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         try {
             doi = getDOIByObject(context, dso);
         } catch (SQLException e) {
-            log.error("Error while attemping to retrieve information about a DOI for "
-                + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) + " with ID " + dso.getID() + ".");
+            log.error("Error while attempting to retrieve information about a DOI for {} with ID {}.",
+                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso), dso.getID());
             throw new RuntimeException("Error while attempting to retrieve " +
                 "information about a DOI for " + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
                 " with ID " + dso.getID() + ".", e);
@@ -624,7 +624,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
 
             } catch (SQLException e) {
                 log.error("Error while creating new DOI for Object of " +
-                    "ResourceType {} with id {}.", dso.getType(), dso.getID());
+                    "ResourceType {} with id {}.", dso::getType, dso::getID);
                 throw new RuntimeException("Error while attempting to create a " +
                     "new DOI for " + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) + " with ID " +
                     dso.getID() + ".", e);
@@ -709,9 +709,9 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
                 doi = getDOIByObject(context, dso);
             }
         } catch (SQLException ex) {
-            log.error("Error while attemping to retrieve information about a DOI for " +
-                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
-                " with ID " + dso.getID() + ".", ex);
+            log.error("Error while attempting to retrieve information about a DOI for {} with ID {}.",
+                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso),
+                dso.getID(), ex);
             throw new RuntimeException("Error while attempting to retrieve " +
                 "information about a DOI for " + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
                 " with ID " + dso.getID() + ".", ex);
@@ -726,17 +726,17 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
                 doi = getDOIOutOfObject(dso);
             }
         } catch (AuthorizeException ex) {
-            log.error("Error while removing a DOI out of the metadata of an " +
-                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
-                " with ID " + dso.getID() + ".", ex);
+            log.error("Error while removing a DOI out of the metadata of an {} with ID {}.",
+                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso),
+                dso.getID(), ex);
             throw new RuntimeException("Error while removing a DOI out of the metadata of an " +
                 contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
                 " with ID " + dso.getID() + ".", ex);
 
         } catch (SQLException ex) {
-            log.error("Error while removing a DOI out of the metadata of an " +
-                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
-                " with ID " + dso.getID() + ".", ex);
+            log.error("Error while removing a DOI out of the metadata of an {} with ID {}.",
+                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso),
+                dso.getID(), ex);
             throw new RuntimeException("Error while removing a DOI out of the " +
                 "metadata of an " + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) +
                 " with ID " + dso.getID() + ".", ex);
@@ -779,8 +779,8 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
             throw new DOIIdentifierException("Not authorized to delete DOI.",
                     ex, DOIIdentifierException.UNAUTHORIZED_METADATA_MANIPULATION);
         } catch (SQLException ex) {
-            log.error("SQLException occurred while deleting a DOI out of an item: "
-                    + ex.getMessage());
+            log.error("SQLException occurred while deleting a DOI out of an item: {}",
+                    ex::getMessage);
             throw new RuntimeException("Error while deleting a DOI out of the " +
                     "metadata of an Item " + dso.getID(), ex);
         }
@@ -826,8 +826,9 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
                     DOIIdentifierException.DOI_DOES_NOT_EXIST);
         }
         if (!TO_BE_DELETED.equals(doiRow.getStatus())) {
-            log.error("This identifier: {} couldn't be deleted. Delete it first from metadata.",
-                DOI.SCHEME + doiRow.getDoi());
+            log.error("This identifier: " + DOI.SCHEME
+                    + "{} couldn't be deleted. Delete it first from metadata.",
+                    doiRow::getDoi);
             throw new IllegalArgumentException("Couldn't delete this identifier:"
                                              + DOI.SCHEME + doiRow.getDoi()
                                              + ". Delete it first from metadata.");
@@ -863,7 +864,7 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         }
 
         if (doiRow.getDSpaceObject() == null) {
-            log.error("Found DOI " + doi + " in database, but no assigned Object could be found.");
+            log.error("Found DOI {} in database, but no assigned Object could be found.", doi);
             throw new IllegalStateException("Found DOI " + doi +
                 " in database, but no assigned Object could be found.");
         }
@@ -890,8 +891,9 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         }
 
         if (doiRow.getDoi() == null) {
-            log.error("A DOI with an empty doi column was found in the database. DSO-Type: " +
-                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) + ", ID: " + dso.getID() + ".");
+            log.error("A DOI with an empty doi column was found in the database. DSO-Type: {}, ID: {}.",
+                contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso),
+                dso.getID());
             throw new IllegalStateException("A DOI with an empty doi column was found in the database. DSO-Type: " +
                 contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) + ", ID: " + dso.getID() + ".");
         }
@@ -1134,13 +1136,13 @@ public class DOIIdentifierProvider extends FilteredIdentifierProvider {
         if (contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso).equals("ITEM")) {
             try {
                 boolean result = filter.getResult(context, (Item) dso);
-                log.debug("Result of filter for " + dso.getHandle() + " is " + result);
+                log.debug("Result of filter for {} is {}", dso.getHandle(), result);
                 if (!result) {
                     throw new DOIIdentifierNotApplicableException("Item " + dso.getHandle() +
                             " was evaluated as 'false' by the item filter, not minting");
                 }
             } catch (LogicalStatementException e) {
-                log.error("Error evaluating item with logical filter: " + e.getLocalizedMessage());
+                log.error("Error evaluating item with logical filter: {}", e::getLocalizedMessage);
                 throw new DOIIdentifierNotApplicableException(e);
             }
         } else {
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java b/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java
index 99643db33f..fbbb1062ca 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DOIServiceImpl.java
@@ -57,6 +57,16 @@ public class DOIServiceImpl implements DOIService {
         return doiDAO.create(context, new DOI());
     }
 
+    @Override
+    public void delete(Context context, DOI doi) throws SQLException {
+        doiDAO.delete(context, doi);
+    }
+
+    @Override
+    public List<DOI> findAll(Context context) throws SQLException {
+        return doiDAO.findAll(context, DOI.class);
+    }
+
     @Override
     public DOI findByDoi(Context context, String doi) throws SQLException {
         return doiDAO.findByDoi(context, doi);
diff --git a/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java b/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java
index ae2cd248d4..0160c8adca 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/DataCiteXMLCreator.java
@@ -13,6 +13,8 @@ import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.crosswalk.CrosswalkException;
@@ -25,8 +27,6 @@ import org.dspace.services.ConfigurationService;
 import org.dspace.utils.DSpace;
 import org.jdom2.Element;
 import org.jdom2.output.XMLOutputter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Provide XML based metadata crosswalk for EZID Identifier provider module.
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
 
 public class DataCiteXMLCreator {
     /**
-     * log4j category
+     * logging category
      */
-    private static final Logger LOG = LoggerFactory.getLogger(DataCiteXMLCreator.class);
+    private static final Logger LOG = LogManager.getLogger();
 
     /**
      * Name of crosswalk to convert metadata into DataCite Metadata Scheme.
@@ -70,9 +70,8 @@ public class DataCiteXMLCreator {
         this.prepareXwalk();
 
         if (!this.xwalk.canDisseminate(dso)) {
-            LOG.error("Crosswalk " + this.CROSSWALK_NAME
-                          + " cannot disseminate DSO with type " + dso.getType()
-                          + " and ID " + dso.getID() + ".");
+            LOG.error("Crosswalk {} cannot disseminate DSO with type {} and ID {}.",
+                    this.CROSSWALK_NAME, dso.getType(), dso.getID());
             return null;
         }
 
@@ -98,8 +97,8 @@ public class DataCiteXMLCreator {
         try {
             root = xwalk.disseminateElement(context, dso, parameters);
         } catch (CrosswalkException | IOException | SQLException | AuthorizeException e) {
-            LOG.error("Exception while crosswalking DSO with type "
-                          + dso.getType() + " and ID " + dso.getID() + ".", e);
+            LOG.error("Exception while crosswalking DSO with type {} and ID {}.",
+                    dso.getType(), dso.getID(), e);
             return null;
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/identifier/EZIDIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/EZIDIdentifierProvider.java
index 78ddeb8f90..ba1688f635 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/EZIDIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/EZIDIdentifierProvider.java
@@ -20,6 +20,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
@@ -32,8 +34,6 @@ import org.dspace.identifier.ezid.EZIDRequest;
 import org.dspace.identifier.ezid.EZIDRequestFactory;
 import org.dspace.identifier.ezid.EZIDResponse;
 import org.dspace.identifier.ezid.Transform;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -83,7 +83,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class EZIDIdentifierProvider
     extends IdentifierProvider {
-    private static final Logger log = LoggerFactory.getLogger(EZIDIdentifierProvider.class);
+    private static final Logger log = LogManager.getLogger();
 
     // Configuration property names
     static final String CFG_SHOULDER = "identifier.doi.ezid.shoulder";
@@ -184,7 +184,8 @@ public class EZIDIdentifierProvider
                                                              loadUser(), loadPassword());
             response = request.create(identifier, crosswalkMetadata(context, object));
         } catch (IdentifierException | IOException | URISyntaxException e) {
-            log.error("Identifier '{}' not registered:  {}", identifier, e.getMessage());
+            log.error("Identifier '{}' not registered:  {}",
+                () -> identifier, e::getMessage);
             return;
         }
 
@@ -201,7 +202,7 @@ public class EZIDIdentifierProvider
             }
         } else {
             log.error("Identifier '{}' not registered -- EZID returned: {}",
-                      identifier, response.getEZIDStatusValue());
+                () -> identifier, response::getEZIDStatusValue);
         }
     }
 
@@ -218,7 +219,8 @@ public class EZIDIdentifierProvider
             metadata.put("_status", "reserved");
             response = request.create(identifier, metadata);
         } catch (IOException | URISyntaxException e) {
-            log.error("Identifier '{}' not registered:  {}", identifier, e.getMessage());
+            log.error("Identifier '{}' not registered:  {}",
+                () -> identifier, e::getMessage);
             return;
         }
 
@@ -233,7 +235,7 @@ public class EZIDIdentifierProvider
             }
         } else {
             log.error("Identifier '{}' not registered -- EZID returned: {}",
-                      identifier, response.getEZIDStatusValue());
+                () -> identifier, response::getEZIDStatusValue);
         }
     }
 
@@ -247,7 +249,7 @@ public class EZIDIdentifierProvider
         try {
             request = requestFactory.getInstance(loadAuthority(), loadUser(), loadPassword());
         } catch (URISyntaxException ex) {
-            log.error(ex.getMessage());
+            log.error(ex::getMessage);
             throw new IdentifierException("DOI request not sent:  " + ex.getMessage());
         }
 
@@ -256,18 +258,16 @@ public class EZIDIdentifierProvider
         try {
             response = request.mint(crosswalkMetadata(context, dso));
         } catch (IOException | URISyntaxException ex) {
-            log.error("Failed to send EZID request:  {}", ex.getMessage());
+            log.error("Failed to send EZID request:  {}", ex::getMessage);
             throw new IdentifierException("DOI request not sent:  " + ex.getMessage());
         }
 
         // Good response?
         if (HttpURLConnection.HTTP_CREATED != response.getHttpStatusCode()) {
             log.error("EZID server responded:  {} {}: {}",
-                      new String[] {
-                          String.valueOf(response.getHttpStatusCode()),
-                          response.getHttpReasonPhrase(),
-                          response.getEZIDStatusValue()
-                      });
+                    response::getHttpStatusCode,
+                    response::getHttpReasonPhrase,
+                    response::getEZIDStatusValue);
             throw new IdentifierException("DOI not created:  "
                                               + response.getHttpReasonPhrase()
                                               + ":  "
@@ -285,7 +285,7 @@ public class EZIDIdentifierProvider
             log.info("Created {}", doi);
             return doi;
         } else {
-            log.error("EZID responded:  {}", response.getEZIDStatusValue());
+            log.error("EZID responded:  {}", response::getEZIDStatusValue);
             throw new IdentifierException("No DOI returned");
         }
     }
@@ -302,7 +302,7 @@ public class EZIDIdentifierProvider
                                                     MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER,
                                                     idToDOI(identifier));
         } catch (IdentifierException | SQLException | AuthorizeException | IOException ex) {
-            log.error(ex.getMessage());
+            log.error(ex::getMessage);
             throw new IdentifierNotResolvableException(ex);
         }
         if (!found.hasNext()) {
@@ -360,24 +360,24 @@ public class EZIDIdentifierProvider
                                                                  loadUser(), loadPassword());
                 response = request.delete(DOIToId(id.getValue()));
             } catch (URISyntaxException e) {
-                log.error("Bad URI in metadata value:  {}", e.getMessage());
+                log.error("Bad URI in metadata value:  {}", e::getMessage);
                 remainder.add(id.getValue());
                 skipped++;
                 continue;
             } catch (IOException e) {
-                log.error("Failed request to EZID:  {}", e.getMessage());
+                log.error("Failed request to EZID:  {}", e::getMessage);
                 remainder.add(id.getValue());
                 skipped++;
                 continue;
             }
             if (!response.isSuccess()) {
-                log.error("Unable to delete {} from DataCite:  {}", id.getValue(),
-                          response.getEZIDStatusValue());
+                log.error("Unable to delete {} from DataCite:  {}", id::getValue,
+                        response::getEZIDStatusValue);
                 remainder.add(id.getValue());
                 skipped++;
                 continue;
             }
-            log.info("Deleted {}", id.getValue());
+            log.info("Deleted {}", id::getValue);
         }
 
         // delete from item
@@ -386,7 +386,7 @@ public class EZIDIdentifierProvider
             dsoService.addMetadata(context, dso, MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER, null, remainder);
             dsoService.update(context, dso);
         } catch (SQLException | AuthorizeException e) {
-            log.error("Failed to re-add identifiers:  {}", e.getMessage());
+            log.error("Failed to re-add identifiers:  {}", e::getMessage);
         }
 
         if (skipped > 0) {
@@ -415,25 +415,25 @@ public class EZIDIdentifierProvider
                                                                  loadUser(), loadPassword());
                 response = request.delete(DOIToId(id.getValue()));
             } catch (URISyntaxException e) {
-                log.error("Bad URI in metadata value {}:  {}", id.getValue(), e.getMessage());
+                log.error("Bad URI in metadata value {}:  {}", id::getValue, e::getMessage);
                 remainder.add(id.getValue());
                 skipped++;
                 continue;
             } catch (IOException e) {
-                log.error("Failed request to EZID:  {}", e.getMessage());
+                log.error("Failed request to EZID:  {}", e::getMessage);
                 remainder.add(id.getValue());
                 skipped++;
                 continue;
             }
 
             if (!response.isSuccess()) {
-                log.error("Unable to delete {} from DataCite:  {}", id.getValue(),
-                          response.getEZIDStatusValue());
+                log.error("Unable to delete {} from DataCite:  {}", id::getValue,
+                        response::getEZIDStatusValue);
                 remainder.add(id.getValue());
                 skipped++;
                 continue;
             }
-            log.info("Deleted {}", id.getValue());
+            log.info("Deleted {}", id::getValue);
         }
 
         // delete from item
@@ -442,7 +442,7 @@ public class EZIDIdentifierProvider
             dsoService.addMetadata(context, dso, MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER, null, remainder);
             dsoService.update(context, dso);
         } catch (SQLException | AuthorizeException e) {
-            log.error("Failed to re-add identifiers:  {}", e.getMessage());
+            log.error("Failed to re-add identifiers:  {}", e::getMessage);
         }
 
         if (skipped > 0) {
@@ -544,12 +544,10 @@ public class EZIDIdentifierProvider
                             mappedValue = xfrm.transform(value.getValue());
                         } catch (Exception ex) {
                             log.error("Unable to transform '{}' from {} to {}:  {}",
-                                      new String[] {
-                                          value.getValue(),
-                                          value.toString(),
-                                          key,
-                                          ex.getMessage()
-                                      });
+                                value::getValue,
+                                value::toString,
+                                () -> key,
+                                ex::getMessage);
                             continue;
                         }
                     } else {
diff --git a/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
index 82358362da..54ab9f90a6 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/HandleIdentifierProvider.java
@@ -27,7 +27,6 @@ import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * The old DSpace handle identifier service, used to create handles or retrieve objects based on their handle
@@ -36,7 +35,6 @@ import org.springframework.stereotype.Component;
  * @author Mark Diggory (markd at atmire dot com)
  * @author Ben Bosman (ben at atmire dot com)
  */
-@Component
 public class HandleIdentifierProvider extends IdentifierProvider {
     /**
      * log4j category
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java
index e5a90907c7..b970c9f06c 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedDOIIdentifierProvider.java
@@ -137,8 +137,9 @@ public class VersionedDOIIdentifierProvider extends DOIIdentifierProvider implem
                     loadOrCreateDOI(context, dso, versionedDOI, filter);
                 } catch (SQLException ex) {
                     log.error(
-                        "A problem with the database connection occurd while processing DOI " + versionedDOI + ".", ex);
-                    throw new RuntimeException("A problem with the database connection occured.", ex);
+                        "A problem with the database connection occurred while processing DOI " + versionedDOI + ".",
+                        ex);
+                    throw new RuntimeException("A problem with the database connection occurred.", ex);
                 }
                 return versionedDOI;
             }
@@ -350,14 +351,14 @@ public class VersionedDOIIdentifierProvider extends DOIIdentifierProvider implem
                 changed = true;
             }
         }
-        // reset the metadata if neccessary.
+        // reset the metadata if necessary.
         if (changed) {
             try {
                 itemService.clearMetadata(c, item, MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER, Item.ANY);
                 itemService.addMetadata(c, item, MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER, null, newIdentifiers);
                 itemService.update(c, item);
             } catch (SQLException ex) {
-                throw new RuntimeException("A problem with the database connection occured.", ex);
+                throw new RuntimeException("A problem with the database connection occurred.", ex);
             }
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
index 4f9efd2206..4c8c785cbd 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
@@ -37,7 +37,6 @@ import org.dspace.versioning.service.VersionHistoryService;
 import org.dspace.versioning.service.VersioningService;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Fabio Bolognesi (fabio at atmire dot com)
@@ -45,7 +44,6 @@ import org.springframework.stereotype.Component;
  * @author Ben Bosman (ben at atmire dot com)
  * @author Pascal-Nicolas Becker (dspace at pascal dash becker dot de)
  */
-@Component
 public class VersionedHandleIdentifierProvider extends IdentifierProvider implements InitializingBean {
     /**
      * log4j category
@@ -129,7 +127,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider implem
                 try {
                     versionNumber = Integer.valueOf(versionHandleMatcher.group(1));
                 } catch (NumberFormatException ex) {
-                    throw new IllegalStateException("Cannot detect the interger value of a digit.", ex);
+                    throw new IllegalStateException("Cannot detect the integer value of a digit.", ex);
                 }
 
                 // get history
@@ -150,7 +148,7 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider implem
                     try {
                         versionHistoryService.getVersion(context, history, item);
                     } catch (SQLException ex) {
-                        throw new RuntimeException("Problem with the database connection occurd.", ex);
+                        throw new RuntimeException("Problem with the database connection occurred.", ex);
                     }
 
                     // did we found a version?
@@ -186,11 +184,11 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider implem
                     } catch (SQLException | IOException ex) {
                         throw new RuntimeException("Unable to restore a versioned "
                                                        + "handle as there was a problem in creating a "
-                                                       + "neccessary item version: ", ex);
+                                                       + "necessary item version: ", ex);
                     } catch (AuthorizeException ex) {
                         throw new RuntimeException("Unable to restore a versioned "
                                                        + "handle as the current user was not allowed to "
-                                                       + "create a neccessary item version: ", ex);
+                                                       + "create a necessary item version: ", ex);
                     }
                     return;
                 }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
index 9993f78b4d..67278b4db8 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProviderWithCanonicalHandles.java
@@ -32,14 +32,12 @@ import org.dspace.versioning.service.VersionHistoryService;
 import org.dspace.versioning.service.VersioningService;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 
 /**
  * @author Fabio Bolognesi (fabio at atmire dot com)
  * @author Mark Diggory (markd at atmire dot com)
  * @author Ben Bosman (ben at atmire dot com)
  */
-@Component
 public class VersionedHandleIdentifierProviderWithCanonicalHandles extends IdentifierProvider
     implements InitializingBean {
     /**
@@ -101,7 +99,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
             try {
                 history = versionHistoryService.findByItem(context, item);
             } catch (SQLException ex) {
-                throw new RuntimeException("A problem with the database connection occured.", ex);
+                throw new RuntimeException("A problem with the database connection occurred.", ex);
             }
             if (history != null) {
                 String canonical = getCanonical(context, item);
@@ -110,7 +108,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                 try {
                     handleService.modifyHandleDSpaceObject(context, canonical, item);
                 } catch (SQLException ex) {
-                    throw new RuntimeException("A problem with the database connection occured.", ex);
+                    throw new RuntimeException("A problem with the database connection occurred.", ex);
                 }
 
                 Version version;
@@ -125,7 +123,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                         previousItemHandle = handleService.findHandle(context, previous.getItem());
                     }
                 } catch (SQLException ex) {
-                    throw new RuntimeException("A problem with the database connection occured.", ex);
+                    throw new RuntimeException("A problem with the database connection occurred.", ex);
                 }
 
                 // we have to ensure the previous item still has a handle
@@ -133,8 +131,8 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                 if (previous != null) {
                     try {
                         // If we have a reviewer they might not have the
-                        // rights to edit the metadata of thes previous item.
-                        // Temporarly grant them:
+                        // rights to edit the metadata of the previous item.
+                        // Temporarily grant them:
                         context.turnOffAuthorisationSystem();
 
                         // Check if our previous item hasn't got a handle anymore.
@@ -153,9 +151,9 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                         // remove the canonical handle from the previous item's metadata
                         modifyHandleMetadata(context, previous.getItem(), previousItemHandle);
                     } catch (SQLException ex) {
-                        throw new RuntimeException("A problem with the database connection occured.", ex);
+                        throw new RuntimeException("A problem with the database connection occurred.", ex);
                     } catch (AuthorizeException ex) {
-                        // cannot occure, as the authorization system is turned of
+                        // cannot occur, as the authorization system is turned of
                         throw new IllegalStateException("Caught an "
                                                             + "AuthorizeException while the "
                                                             + "authorization system was turned off!", ex);
@@ -168,7 +166,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                 // remove all handles from metadata and add the canonical one.
                 modifyHandleMetadata(context, item, getCanonical(id));
             } catch (SQLException ex) {
-                throw new RuntimeException("A problem with the database connection occured.", ex);
+                throw new RuntimeException("A problem with the database connection occurred.", ex);
             } catch (AuthorizeException ex) {
                 throw new RuntimeException("The current user is not authorized to change this item.", ex);
             }
@@ -250,7 +248,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
         Version latest = versionHistoryService.getLatestVersion(context, history);
 
 
-        // if restoring the lastest version: needed to move the canonical
+        // if restoring the latest version: needed to move the canonical
         if (latest.getVersionNumber() < versionNumber) {
             handleService.modifyHandleDSpaceObject(context, canonical, dso);
         }
@@ -364,7 +362,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
                             .getPrevious(context, history, versionHistoryService.getLatestVersion(context, history))
                             .getItem();
                     } catch (SQLException ex) {
-                        throw new RuntimeException("A problem with our database connection occured.", ex);
+                        throw new RuntimeException("A problem with our database connection occurred.", ex);
                     }
 
                     // Modify Canonical: 12345/100 will point to the new item
@@ -430,7 +428,7 @@ public class VersionedHandleIdentifierProviderWithCanonicalHandles extends Ident
         try {
             previous = versionHistoryService.getPrevious(context, history, version);
         } catch (SQLException ex) {
-            throw new RuntimeException("A problem with our database connection occured.");
+            throw new RuntimeException("A problem with our database connection occurred.");
         }
         String canonical = getCanonical(context, previous.getItem());
 
diff --git a/dspace-api/src/main/java/org/dspace/identifier/dao/impl/DOIDAOImpl.java b/dspace-api/src/main/java/org/dspace/identifier/dao/impl/DOIDAOImpl.java
index 784fec1d88..b045061a5f 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/dao/impl/DOIDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/dao/impl/DOIDAOImpl.java
@@ -10,11 +10,11 @@ package org.dspace.identifier.dao.impl;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DOIIdentifierException.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DOIIdentifierException.java
index 61f738d7cb..5fc3384b7d 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DOIIdentifierException.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DOIIdentifierException.java
@@ -113,7 +113,7 @@ public class DOIIdentifierException extends IdentifierException {
             case DOI_IS_DELETED:
                 return "DELETED";
             default:
-                return "UNKOWN";
+                return "UNKNOWN";
         }
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
index 088e2b1cbc..b03af68b42 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DOIOrganiser.java
@@ -17,8 +17,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
@@ -689,7 +689,7 @@ public class DOIOrganiser {
         DOI doiRow = null;
         String doi = null;
 
-        // detect it identifer is ItemID, handle or DOI.
+        // detect it identifier is ItemID, handle or DOI.
         // try to detect ItemID
         if (identifier
             .matches("[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}")) {
diff --git a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
index 57136d6143..23af904f2c 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/doi/DataCiteConnector.java
@@ -7,6 +7,10 @@
  */
 package org.dspace.identifier.doi;
 
+import static org.dspace.identifier.DOIIdentifierProvider.DOI_ELEMENT;
+import static org.dspace.identifier.DOIIdentifierProvider.DOI_QUALIFIER;
+import static org.dspace.identifier.DOIIdentifierProvider.MD_SCHEMA;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.net.URISyntaxException;
@@ -15,6 +19,7 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.StatusLine;
@@ -33,6 +38,8 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.util.EntityUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.crosswalk.CrosswalkException;
@@ -52,8 +59,6 @@ import org.jdom2.filter.ElementFilter;
 import org.jdom2.input.SAXBuilder;
 import org.jdom2.output.Format;
 import org.jdom2.output.XMLOutputter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -62,7 +67,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class DataCiteConnector
     implements DOIConnector {
 
-    private static final Logger log = LoggerFactory.getLogger(DataCiteConnector.class);
+    private static final Logger log = LogManager.getLogger();
 
     // Configuration property names
     static final String CFG_USER = "identifier.doi.user";
@@ -356,10 +361,8 @@ public class DataCiteConnector
                                                                                      .getDSpaceObjectService(dso);
 
         if (!this.xwalk.canDisseminate(dso)) {
-            log.error("Crosswalk " + this.CROSSWALK_NAME
-                          + " cannot disseminate DSO with type " + dso.getType()
-                          + " and ID " + dso.getID() + ". Giving up reserving the DOI "
-                          + doi + ".");
+            log.error("Crosswalk {} cannot disseminate DSO with type {} and ID {}. Giving up reserving the DOI {}.",
+                          this.CROSSWALK_NAME, dso.getType(), dso.getID(), doi);
             throw new DOIIdentifierException("Cannot disseminate "
                                                  + dSpaceObjectService.getTypeText(dso) + "/" + dso.getID()
                                                  + " using crosswalk " + this.CROSSWALK_NAME + ".",
@@ -385,24 +388,28 @@ public class DataCiteConnector
             parameters.put("hostinginstitution",
                            configurationService.getProperty(CFG_HOSTINGINSTITUTION));
         }
+        parameters.put("mdSchema", MD_SCHEMA);
+        parameters.put("mdElement", DOI_ELEMENT);
+        // Pass an empty string for qualifier if the metadata field doesn't have any
+        parameters.put("mdQualifier", DOI_QUALIFIER);
 
         Element root = null;
         try {
             root = xwalk.disseminateElement(context, dso, parameters);
         } catch (AuthorizeException ae) {
-            log.error("Caught an AuthorizeException while disseminating DSO "
-                          + "with type " + dso.getType() + " and ID " + dso.getID()
-                          + ". Giving up to reserve DOI " + doi + ".", ae);
-            throw new DOIIdentifierException("AuthorizeException occured while "
+            log.error("Caught an AuthorizeException while disseminating DSO"
+                    + " with type {} and ID {}. Giving up to reserve DOI {}.",
+                    dso.getType(), dso.getID(), doi, ae);
+            throw new DOIIdentifierException("AuthorizeException occurred while "
                                                  + "converting " + dSpaceObjectService.getTypeText(dso) + "/" + dso
                 .getID()
                                                  + " using crosswalk " + this.CROSSWALK_NAME + ".", ae,
                                              DOIIdentifierException.CONVERSION_ERROR);
         } catch (CrosswalkException ce) {
-            log.error("Caught an CrosswalkException while reserving a DOI ("
-                          + doi + ") for DSO with type " + dso.getType() + " and ID "
-                          + dso.getID() + ". Won't reserve the doi.", ce);
-            throw new DOIIdentifierException("CrosswalkException occured while "
+            log.error("Caught a CrosswalkException while reserving a DOI ({})"
+                    + " for DSO with type {} and ID {}. Won't reserve the doi.",
+                    doi, dso.getType(), dso.getID(), ce);
+            throw new DOIIdentifierException("CrosswalkException occurred while "
                                                  + "converting " + dSpaceObjectService.getTypeText(dso) + "/" + dso
                 .getID()
                                                  + " using crosswalk " + this.CROSSWALK_NAME + ".", ce,
@@ -412,7 +419,7 @@ public class DataCiteConnector
         }
 
         String metadataDOI = extractDOI(root);
-        if (null == metadataDOI) {
+        if (StringUtils.isBlank(metadataDOI)) {
             // The DOI will be saved as metadata of dso after successful
             // registration. To register a doi it has to be part of the metadata
             // sent to DataCite. So we add it to the XML we'll send to DataCite
@@ -421,10 +428,9 @@ public class DataCiteConnector
         } else if (!metadataDOI.equals(doi.substring(DOI.SCHEME.length()))) {
             log.error("While reserving a DOI, the "
                           + "crosswalk to generate the metadata used another DOI than "
-                          + "the DOI we're reserving. Cannot reserve DOI " + doi
-                          + " for " + dSpaceObjectService.getTypeText(dso) + " "
-                          + dso.getID() + ".");
-            throw new IllegalStateException("An internal error occured while "
+                          + "the DOI we're reserving. Cannot reserve DOI {} for {} {}.",
+                    doi, dSpaceObjectService.getTypeText(dso), dso.getID());
+            throw new IllegalStateException("An internal error occurred while "
                                                 + "generating the metadata. Unable to reserve doi, see logs "
                                                 + "for further information.");
         }
@@ -440,12 +446,12 @@ public class DataCiteConnector
             // 400 -> invalid XML
             case (400): {
                 log.warn("DataCite was unable to understand the XML we send.");
-                log.warn("DataCite Metadata API returned a http status code "
-                             + "400: " + resp.getContent());
+                log.warn("DataCite Metadata API returned a http status code"
+                             + " 400: {}", resp::getContent);
                 Format format = Format.getCompactFormat();
                 format.setEncoding("UTF-8");
                 XMLOutputter xout = new XMLOutputter(format);
-                log.info("We send the following XML:\n" + xout.outputString(root));
+                log.info("We send the following XML:\n{}", xout.outputString(root));
                 throw new DOIIdentifierException("Unable to reserve DOI " + doi
                                                      + ". Please inform your administrator or take a look "
                                                      + " into the log files.", DOIIdentifierException.BAD_REQUEST);
@@ -479,8 +485,8 @@ public class DataCiteConnector
             resp = this.sendDOIPostRequest(doi,
                                            handleService.resolveToURL(context, dso.getHandle()));
         } catch (SQLException e) {
-            log.error("Caught SQL-Exception while resolving handle to URL: "
-                          + e.getMessage());
+            log.error("Caught SQL-Exception while resolving handle to URL: {}",
+                    e::getMessage);
             throw new RuntimeException(e);
         }
 
@@ -492,7 +498,7 @@ public class DataCiteConnector
             // 400 -> wrong domain, wrong prefix, wrong request body
             case (400): {
                 log.warn("We send an irregular request to DataCite. While "
-                             + "registering a DOI they told us: " + resp.getContent());
+                             + "registering a DOI they told us: {}", resp::getContent);
                 throw new DOIIdentifierException("Currently we cannot register "
                                                      + "DOIs. Please inform the administrator or take a look "
                                                      + " in the DSpace log file.",
@@ -501,8 +507,8 @@ public class DataCiteConnector
             // 412 Precondition failed: DOI was not reserved before registration!
             case (412): {
                 log.error("We tried to register a DOI {} that has not been reserved "
-                              + "before! The registration agency told us: {}.", doi,
-                          resp.getContent());
+                        + "before! The registration agency told us: {}.",
+                    () -> doi, resp::getContent);
                 throw new DOIIdentifierException("There was an error in handling "
                                                      + "of DOIs. The DOI we wanted to register had not been "
                                                      + "reserved in advance. Please contact the administrator "
@@ -511,7 +517,7 @@ public class DataCiteConnector
             }
             // Catch all other http status code in case we forgot one.
             default: {
-                log.warn("While registration of DOI {}, we got a http status code "
+                log.warn("While registering DOI {}, we got a http status code "
                              + "{} and the message \"{}\".",
                         doi, Integer.toString(resp.statusCode), resp.getContent());
                 throw new DOIIdentifierException("Unable to parse an answer from "
@@ -564,8 +570,8 @@ public class DataCiteConnector
             try {
                 EntityUtils.consume(reqEntity);
             } catch (IOException ioe) {
-                log.info("Caught an IOException while releasing a HTTPEntity:"
-                             + ioe.getMessage());
+                log.info("Caught an IOException while releasing a HTTPEntity:  {}",
+                        ioe::getMessage);
             }
         }
     }
@@ -668,8 +674,8 @@ public class DataCiteConnector
             try {
                 EntityUtils.consume(reqEntity);
             } catch (IOException ioe) {
-                log.info("Caught an IOException while releasing an HTTPEntity:"
-                             + ioe.getMessage());
+                log.info("Caught an IOException while releasing an HTTPEntity:  {}",
+                        ioe::getMessage);
             }
         }
     }
@@ -768,7 +774,7 @@ public class DataCiteConnector
                 // 500 is documented and signals an internal server error
                 case (500): {
                     log.warn("Caught an http status code 500 while managing DOI "
-                                 + "{}. Message was: " + content);
+                                 + "{}. Message was: {}", doi, content);
                     throw new DOIIdentifierException("DataCite API has an internal error. "
                                                          + "It is temporarily impossible to manage DOIs. "
                                                          + "Further information can be found in DSpace log file.",
@@ -781,7 +787,7 @@ public class DataCiteConnector
 
             return new DataCiteResponse(statusCode, content);
         } catch (IOException e) {
-            log.warn("Caught an IOException: " + e.getMessage());
+            log.warn("Caught an IOException: {}", e::getMessage);
             throw new RuntimeException(e);
         } finally {
             try {
@@ -790,7 +796,7 @@ public class DataCiteConnector
                     EntityUtils.consume(entity);
                 }
             } catch (IOException e) {
-                log.warn("Can't release HTTP-Entity: " + e.getMessage());
+                log.warn("Can't release HTTP-Entity: {}", e::getMessage);
             }
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java b/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java
index 525ad46b25..bf46c3bf59 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDRequest.java
@@ -27,10 +27,10 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.identifier.DOI;
 import org.dspace.identifier.IdentifierException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A request to EZID concerning a given (or expected) identifier.
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  * @author Mark H. Wood
  */
 public class EZIDRequest {
-    private static final Logger log = LoggerFactory.getLogger(EZIDRequest.class);
+    private static final Logger log = LogManager.getLogger();
 
     private static final String ID_PATH = "/id/" + DOI.SCHEME;
 
@@ -149,7 +149,7 @@ public class EZIDRequest {
         // GET path
         HttpGet request;
         URI uri = new URI(scheme, host, path + ID_PATH + authority + name, null);
-        log.debug("EZID lookup {}", uri.toASCIIString());
+        log.debug("EZID lookup {}", uri::toASCIIString);
         request = new HttpGet(uri);
         HttpResponse response = client.execute(request, httpContext);
         return new EZIDResponse(response);
@@ -172,7 +172,7 @@ public class EZIDRequest {
         // PUT path [+metadata]
         HttpPut request;
         URI uri = new URI(scheme, host, path + ID_PATH + authority + '/' + name, null);
-        log.debug("EZID create {}", uri.toASCIIString());
+        log.debug("EZID create {}", uri::toASCIIString);
         request = new HttpPut(uri);
         if (null != metadata) {
             request.setEntity(new StringEntity(formatMetadata(metadata), UTF_8));
@@ -196,7 +196,7 @@ public class EZIDRequest {
         // POST path [+metadata]
         HttpPost request;
         URI uri = new URI(scheme, host, path + SHOULDER_PATH + authority, null);
-        log.debug("EZID mint {}", uri.toASCIIString());
+        log.debug("EZID mint {}", uri::toASCIIString);
         request = new HttpPost(uri);
         if (null != metadata) {
             request.setEntity(new StringEntity(formatMetadata(metadata), UTF_8));
@@ -225,7 +225,7 @@ public class EZIDRequest {
         // POST path +metadata
         HttpPost request;
         URI uri = new URI(scheme, host, path + ID_PATH + authority + name, null);
-        log.debug("EZID modify {}", uri.toASCIIString());
+        log.debug("EZID modify {}", uri::toASCIIString);
         request = new HttpPost(uri);
         request.setEntity(new StringEntity(formatMetadata(metadata), UTF_8));
         HttpResponse response = client.execute(request, httpContext);
@@ -246,7 +246,7 @@ public class EZIDRequest {
         // DELETE path
         HttpDelete request;
         URI uri = new URI(scheme, host, path + ID_PATH + authority + name, null);
-        log.debug("EZID delete {}", uri.toASCIIString());
+        log.debug("EZID delete {}", uri::toASCIIString);
         request = new HttpDelete(uri);
         HttpResponse response = client.execute(request, httpContext);
         return new EZIDResponse(response);
diff --git a/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDResponse.java b/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDResponse.java
index 9c5ad90484..4ac975b2db 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDResponse.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/ezid/EZIDResponse.java
@@ -19,15 +19,15 @@ import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.ParseException;
 import org.apache.http.util.EntityUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.identifier.IdentifierException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Decoded response data evoked by a request made to EZID.
  */
 public class EZIDResponse {
-    private static final Logger log = LoggerFactory.getLogger(EZIDResponse.class);
+    private static final Logger log = LogManager.getLogger();
 
     private static final String UTF_8 = "UTF-8";
 
@@ -35,7 +35,7 @@ public class EZIDResponse {
 
     private final String statusValue;
 
-    private final Map<String, String> attributes = new HashMap<String, String>();
+    private final Map<String, String> attributes = new HashMap<>();
 
     private final HttpResponse response;
 
@@ -49,12 +49,8 @@ public class EZIDResponse {
         String body;
         try {
             body = EntityUtils.toString(responseBody, UTF_8);
-        } catch (IOException ex) {
-            log.error(ex.getMessage());
-            throw new IdentifierException("EZID response not understood:  "
-                                              + ex.getMessage());
-        } catch (ParseException ex) {
-            log.error(ex.getMessage());
+        } catch (IOException | ParseException ex) {
+            log.error(ex::getMessage);
             throw new IdentifierException("EZID response not understood:  "
                                               + ex.getMessage());
         }
@@ -124,7 +120,7 @@ public class EZIDResponse {
      * @return all keys found in the response.
      */
     public List<String> getKeys() {
-        List<String> keys = new ArrayList<String>();
+        List<String> keys = new ArrayList<>();
         for (String key : attributes.keySet()) {
             keys.add(key);
         }
diff --git a/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java b/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java
index 5bd68a9061..e815441b2a 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/service/DOIService.java
@@ -43,6 +43,23 @@ public interface DOIService {
      */
     public DOI create(Context context) throws SQLException;
 
+    /**
+     * Deletes the given {@link DOI}.
+     *
+     * @param context current DSpace session.
+     * @throws SQLException passed through.
+     */
+    void delete(Context context, DOI doi) throws SQLException;
+
+    /**
+     * Retrieves the full list of {@link DOI}s currently in storage.
+     *
+     * @param context current DSpace session.
+     * @return The list of all DOIs currently in storage.
+     * @throws SQLException passed through.
+     */
+    List<DOI> findAll(Context context) throws SQLException;
+
     /**
      * Find a specific DOI in storage.
      *
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/MultipleParallelImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/MultipleParallelImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..a4033ee0c2
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/MultipleParallelImportMetadataSourceServiceImpl.java
@@ -0,0 +1,186 @@
+/**
+ * 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.importer.external;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import jakarta.el.MethodNotFoundException;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.service.components.QuerySource;
+
+/**
+ * Implements a data source for querying multiple external data sources in parallel
+ *
+ * optional Affiliation information are not part of the API request.
+ *
+ * @author Johanna Staudinger (johanna.staudinger@uni-bamberg.de)
+ *
+ */
+public class MultipleParallelImportMetadataSourceServiceImpl implements QuerySource {
+    private final List<QuerySource> innerProviders;
+    private final ExecutorService executorService;
+
+    private final String sourceName;
+    public MultipleParallelImportMetadataSourceServiceImpl(List<QuerySource> innerProviders, String sourceName) {
+        super();
+        this.innerProviders = innerProviders;
+        this.executorService = Executors.newFixedThreadPool(innerProviders.size());
+        this.sourceName = sourceName;
+    }
+
+    @Override
+    public String getImportSource() {
+        return sourceName;
+    }
+
+    @Override
+    public ImportRecord getRecord(String recordId) throws MetadataSourceException {
+        List<Future<ImportRecord>> futureList = new ArrayList<>();
+        ImportRecord result = null;
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.getRecord(recordId)));
+        }
+        for (Future<ImportRecord> future: futureList) {
+            try {
+                ImportRecord importRecord = future.get();
+                if (!Objects.isNull(importRecord)) {
+                    result = importRecord;
+                }
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        List<Future<Integer>> futureList = new ArrayList<>();
+        int result = 0;
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.getRecordsCount(query)));
+        }
+        for (Future<Integer> future: futureList) {
+            try {
+                Integer count = future.get();
+                result += Objects.isNull(count) ? 0 : count;
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        List<Future<Integer>> futureList = new ArrayList<>();
+        int result = 0;
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.getRecordsCount(query)));
+        }
+        for (Future<Integer> future: futureList) {
+            try {
+                Integer count = future.get();
+                result += Objects.isNull(count) ? 0 : count;
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
+
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        List<Future<Collection<ImportRecord>>> futureList = new ArrayList<>();
+        List<ImportRecord> result = new ArrayList<>();
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.getRecords(query, start, count)));
+        }
+        for (Future<Collection<ImportRecord>> future: futureList) {
+            try {
+                Collection<ImportRecord> importRecords = future.get();
+                result.addAll(Objects.isNull(importRecords) ? Collections.emptyList() : importRecords);
+            } catch (InterruptedException | ExecutionException e) {
+                //
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        List<Future<Collection<ImportRecord>>> futureList = new ArrayList<>();
+        List<ImportRecord> result = new ArrayList<>();
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.getRecords(query)));
+        }
+        for (Future<Collection<ImportRecord>> future: futureList) {
+            try {
+                Collection<ImportRecord> importRecords = future.get();
+                result.addAll(Objects.isNull(importRecords) ? Collections.emptyList() : importRecords);
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for multiple external data sources");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        List<Future<Collection<ImportRecord>>> futureList = new ArrayList<>();
+        List<ImportRecord> result = new ArrayList<>();
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.findMatchingRecords(query)));
+        }
+        for (Future<Collection<ImportRecord>> future: futureList) {
+            try {
+                Collection<ImportRecord> importRecords = future.get();
+                result.addAll(Objects.isNull(importRecords) ? Collections.emptyList() : importRecords);
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
+
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        List<Future<Collection<ImportRecord>>> futureList = new ArrayList<>();
+        List<ImportRecord> result = new ArrayList<>();
+        for (QuerySource innerProvider : innerProviders) {
+            futureList.add(executorService.submit(() -> innerProvider.findMatchingRecords(item)));
+        }
+        for (Future<Collection<ImportRecord>> future: futureList) {
+            try {
+                Collection<ImportRecord> importRecords = future.get();
+                result.addAll(Objects.isNull(importRecords) ? Collections.emptyList() : importRecords);
+            } catch (InterruptedException | ExecutionException e) {
+                throw new RuntimeException(e);
+            }
+        }
+        return result;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java
index e7d2d3398b..0f05e9bb4c 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.ads;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java
index 8fbe4ef2cf..4c72c46732 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ads/ADSImportMetadataSourceServiceImpl.java
@@ -17,11 +17,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import javax.el.MethodNotFoundException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/ArXivFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/ArXivFieldMapping.java
index 272b149015..48e7df89b3 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/ArXivFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/metadatamapping/ArXivFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.arxiv.metadatamapping;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java
index 96689e62ba..a1df4a7f40 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/arxiv/service/ArXivImportMetadataSourceServiceImpl.java
@@ -14,14 +14,14 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.Callable;
-import javax.el.MethodNotFoundException;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Invocation;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
 
+import jakarta.el.MethodNotFoundException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.Item;
 import org.dspace.importer.external.datamodel.ImportRecord;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java
index 0014088c86..7dcc8d64c7 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/bibtex/service/BibtexImportMetadataSourceServiceImpl.java
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.exception.FileSourceException;
 import org.dspace.importer.external.service.components.AbstractPlainMetadataSource;
 import org.dspace.importer.external.service.components.dto.PlainMetadataKeyValueItem;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java
index f266ff3d85..aad756fbb0 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.cinii;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java
index 587ad5b258..66572f9a3d 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/cinii/CiniiImportMetadataSourceServiceImpl.java
@@ -19,8 +19,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpException;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java
index abf84f52d0..b9b384f8ed 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefAuthorMetadataProcessor.java
@@ -42,8 +42,8 @@ public class CrossRefAuthorMetadataProcessor implements JsonPathMetadataProcesso
             JsonNode author = authors.next();
             String givenName = author.at("/given").textValue();
             String familyName = author.at("/family").textValue();
-            if (StringUtils.isNoneBlank(givenName) && StringUtils.isNoneBlank(familyName)) {
-                values.add(givenName + " " + familyName);
+            if (StringUtils.isNotBlank(givenName) && StringUtils.isNotBlank(familyName)) {
+                values.add(familyName.trim() + ", " + givenName.trim());
             }
         }
         return values;
@@ -64,4 +64,4 @@ public class CrossRefAuthorMetadataProcessor implements JsonPathMetadataProcesso
         this.pathToArray = pathToArray;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessor.java
index dec0b050f3..c83abbf2b2 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessor.java
@@ -7,7 +7,8 @@
  */
 package org.dspace.importer.external.crossref;
 
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -18,12 +19,11 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.importer.external.metadatamapping.contributor.JsonPathMetadataProcessor;
-import org.joda.time.LocalDate;
 
 /**
  * This class is used for CrossRef's Live-Import to extract
  * issued attribute.
- * Beans are configured in the crossref-integration.xml file.
+ * Beans are configured in the {@code crossref-integration.xml} file.
  *
  * @author Francesco Pio Scognamiglio (francescopio.scognamiglio at 4science.com)
  */
@@ -41,22 +41,25 @@ public class CrossRefDateMetadataProcessor implements JsonPathMetadataProcessor
         while (dates.hasNext()) {
             JsonNode date = dates.next();
             LocalDate issuedDate = null;
-            SimpleDateFormat issuedDateFormat = null;
+            DateTimeFormatter issuedDateFormat = null;
             if (date.has(0) && date.has(1) && date.has(2)) {
-                issuedDate = new LocalDate(
+                issuedDate = LocalDate.of(
                         date.get(0).numberValue().intValue(),
                         date.get(1).numberValue().intValue(),
                         date.get(2).numberValue().intValue());
-                issuedDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                issuedDateFormat = DateTimeFormatter.ISO_LOCAL_DATE;
             } else if (date.has(0) && date.has(1)) {
-                issuedDate = new LocalDate().withYear(date.get(0).numberValue().intValue())
-                        .withMonthOfYear(date.get(1).numberValue().intValue());
-                issuedDateFormat = new SimpleDateFormat("yyyy-MM");
+                issuedDate = LocalDate.of(date.get(0).numberValue().intValue(),
+                        date.get(1).numberValue().intValue(),
+                        1);
+                issuedDateFormat = DateTimeFormatter.ofPattern("yyyy-MM");
             } else if (date.has(0)) {
-                issuedDate = new LocalDate().withYear(date.get(0).numberValue().intValue());
-                issuedDateFormat = new SimpleDateFormat("yyyy");
+                issuedDate = LocalDate.of(date.get(0).numberValue().intValue(),
+                        1,
+                        1);
+                issuedDateFormat = DateTimeFormatter.ofPattern("yyyy");
             }
-            values.add(issuedDateFormat.format(issuedDate.toDate()));
+            values.add(issuedDate.format(issuedDateFormat));
         }
         return values;
     }
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java
index 5e879b4d26..81571ed7bb 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.crossref;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java
index 419f6ca8a0..37e613d9c5 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/crossref/CrossRefImportMetadataSourceServiceImpl.java
@@ -16,11 +16,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
-import javax.el.MethodNotFoundException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java
index f8540307b9..a67b73480d 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.datacite;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java
index 6c65d96b37..e00b2e2cea 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/datacite/DataCiteImportMetadataSourceServiceImpl.java
@@ -13,11 +13,11 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import javax.el.MethodNotFoundException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -36,7 +36,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * Implements a data source for querying Datacite
  * Mainly copied from CrossRefImportMetadataSourceServiceImpl.
  *
- * optional Affiliation informations are not part of the API request.
+ * optional Affiliation information are not part of the API request.
  * https://support.datacite.org/docs/can-i-see-more-detailed-affiliation-information-in-the-rest-api
  *
  * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/datamodel/ImportRecord.java b/dspace-api/src/main/java/org/dspace/importer/external/datamodel/ImportRecord.java
index 3fc34dc511..cbd4bc1245 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/datamodel/ImportRecord.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/datamodel/ImportRecord.java
@@ -11,7 +11,9 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
+import org.dspace.content.MetadataFieldName;
 import org.dspace.importer.external.metadatamapping.MetadatumDTO;
 
 /**
@@ -94,6 +96,31 @@ public class ImportRecord {
         return values;
     }
 
+    /**
+     * Returns an {@code Optional<String>} representing the value
+     * of the metadata {@code field} found inside the {@code valueList}.
+     * @param field String of the MetadataField to search
+     * @return {@code Optional<String>} non empty if found.
+     */
+    public Optional<String> getSingleValue(String field) {
+        MetadataFieldName metadataFieldName = new MetadataFieldName(field);
+        return getSingleValue(metadataFieldName.schema, metadataFieldName.element, metadataFieldName.qualifier);
+    }
+
+    /**
+     * Retrieves a single value for the given schema, element, and qualifier.
+     *
+     * @param  schema    the schema for the value
+     * @param  element   the element for the value
+     * @param  qualifier the qualifier for the value
+     * @return           an optional containing the single value, if present
+     */
+    public Optional<String> getSingleValue(String schema, String element, String qualifier) {
+        return getValue(schema, element, qualifier).stream()
+            .map(MetadatumDTO::getValue)
+            .findFirst();
+    }
+
     /**
      * Add a value to the valueList
      *
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java
index 64ec53ffb9..955550ce0f 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.epo.service;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java
index fbae302bca..70f726c5f9 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/epo/service/EpoImportMetadataSourceServiceImpl.java
@@ -106,7 +106,7 @@ public class EpoImportMetadataSourceServiceImpl extends AbstractImportMetadataSo
     }
 
     /**
-     * Set the costumer epo secret
+     * Set the customer epo secret
      * @param consumerSecret the customer epo secret
      */
     public void setConsumerSecret(String consumerSecret) {
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java
index b938a290c2..7a74551d80 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/ArrayElementAttributeProcessor.java
@@ -20,7 +20,7 @@ import org.apache.logging.log4j.Logger;
 
 /**
  * This Processor allows to extract attribute values of an array.
- * For exaple to extract all values of secondAttribute,
+ * For example to extract all values of secondAttribute,
  * "array":[
  *       {
  *        "firstAttribute":"first value",
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EnhancedSimpleMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EnhancedSimpleMetadataContributor.java
index b3953f60c5..7aaa5aa0b3 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EnhancedSimpleMetadataContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EnhancedSimpleMetadataContributor.java
@@ -95,8 +95,8 @@ public class EnhancedSimpleMetadataContributor extends SimpleMetadataContributor
         values = new LinkedList<>();
         for (PlainMetadataKeyValueItem metadatum : t.getMetadata()) {
             if (getKey().equals(metadatum.getKey())) {
-                String[] splitted = splitToRecord(metadatum.getValue());
-                for (String value : splitted) {
+                String[] split = splitToRecord(metadatum.getValue());
+                for (String value : split) {
                     MetadatumDTO dcValue = new MetadatumDTO();
                     dcValue.setValue(value);
                     dcValue.setElement(getField().getElement());
@@ -120,7 +120,7 @@ public class EnhancedSimpleMetadataContributor extends SimpleMetadataContributor
                 com.opencsv.CSVReader csvReader = new CSVReaderBuilder(inputReader).withCSVParser(parser).build()) {
             rows = csvReader.readAll();
         } catch (IOException | CsvException e) {
-            //fallback, use the inpu as value
+            //fallback, use the input as value
             return new String[] { value };
         }
         //must be one row
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java
index e32f45a4d5..64d2deaca3 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/EpoIdMetadataContributor.java
@@ -13,8 +13,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
@@ -28,7 +28,7 @@ import org.jdom2.Text;
 import org.jdom2.filter.Filters;
 import org.jdom2.xpath.XPathExpression;
 import org.jdom2.xpath.XPathFactory;
-import org.springframework.beans.factory.annotation.Required;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Custom MetadataContributor to manage Epo ID.
@@ -77,6 +77,7 @@ public class EpoIdMetadataContributor implements MetadataContributor<Element> {
      *
      * @param metadataFieldMapping the new mapping.
      */
+    @Override
     public void setMetadataFieldMapping(
         MetadataFieldMapping<Element, MetadataContributor<Element>> metadataFieldMapping) {
         this.metadataFieldMapping = metadataFieldMapping;
@@ -95,7 +96,8 @@ public class EpoIdMetadataContributor implements MetadataContributor<Element> {
     protected Map<String, String> prefixToNamespaceMapping;
 
     /**
-     * Initialize EpoIdMetadataContributor with a query, prefixToNamespaceMapping and MetadataFieldConfig
+     * Initialize EpoIdMetadataContributor with all required fields: a query, prefixToNamespaceMapping
+     * and MetadataFieldConfig
      *
      * @param query                    query string
      * @param prefixToNamespaceMapping metadata prefix to namespace mapping
@@ -113,7 +115,6 @@ public class EpoIdMetadataContributor implements MetadataContributor<Element> {
      * Empty constructor for EpoIdMetadataContributor
      */
     public EpoIdMetadataContributor() {
-
     }
 
     protected String query;
@@ -132,7 +133,7 @@ public class EpoIdMetadataContributor implements MetadataContributor<Element> {
      *
      * @param field MetadataFieldConfig used while retrieving MetadatumDTO
      */
-    @Required
+    @Autowired(required = true)
     public void setField(MetadataFieldConfig field) {
         this.field = field;
     }
@@ -146,7 +147,11 @@ public class EpoIdMetadataContributor implements MetadataContributor<Element> {
         return query;
     }
 
-    @Required
+    /**
+     * Setting the query
+     * @param query query used
+     */
+    @Autowired(required = true)
     public void setQuery(String query) {
         this.query = query;
     }
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java
index c8e93971f4..e4d42d2292 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/MatrixElementProcessor.java
@@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
 /**
  * This Processor allows to extract all values of a matrix.
  * Only need to configure the path to the matrix in "pathToMatrix"
- * For exaple to extract all values
+ * For example to extract all values
  * "matrix": [
  *     [
  *      "first",
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/RorParentOrgUnitMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/RorParentOrgUnitMetadataContributor.java
new file mode 100644
index 0000000000..52c6422554
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/RorParentOrgUnitMetadataContributor.java
@@ -0,0 +1,130 @@
+/**
+ * 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.importer.external.metadatamapping.contributor;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+
+/**
+ * A ROR JsonPath Metadata processor that should be configured inside the {@code ror-integration.xml} file.
+ * This allows the extraction of a given contributor with a specific mappings from the ROR JSON response.
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ */
+public class RorParentOrgUnitMetadataContributor extends SimpleJsonPathMetadataContributor {
+
+    /**
+     * Determines which field of the JSON detains the {@code type} of this
+     * specific node (that needs to be mapped).
+     *
+     */
+    private String typeField;
+
+    /**
+     * Determines which is the type of the main parent node that needs to be mapped.
+     * It should match the value of the {@code typeField} of the JSON node.
+     *
+     */
+    private String parentType;
+
+    /**
+     * Determines which is the field of the JSON that contains the value
+     * that needs to be mapped into a {@code MetadatumDTO}.
+     */
+    private String labelField;
+
+    /**
+     * Creates a {@code MetadatumDTO} for each correctly mapped JSON node
+     * of the ROR response.
+     * Partial / Unmatched parent-type metadatum will be ignored from this mapping.
+     * 
+     * @param fullJson ROR response
+     * @return a collection of read ROR metadata.
+     */
+    @Override
+    public Collection<MetadatumDTO> contributeMetadata(String fullJson) {
+
+        Collection<MetadatumDTO> metadata = new ArrayList<>();
+        Collection<String> metadataValue = new ArrayList<>();
+
+        JsonNode jsonNode = convertStringJsonToJsonNode(fullJson);
+        JsonNode array = jsonNode.at(getQuery());
+        if (!array.isArray()) {
+            return metadata;
+        }
+
+        Iterator<JsonNode> nodes = array.iterator();
+        while (nodes.hasNext()) {
+            JsonNode node = nodes.next();
+
+            if (!node.has(labelField)) {
+                continue;
+            }
+
+            String type = node.has(typeField) ? node.get(typeField).asText() : null;
+            String label = node.get(labelField).asText();
+
+            if (parentType.equalsIgnoreCase(type)) {
+                metadataValue.add(label);
+            }
+
+        }
+
+        for (String value : metadataValue) {
+            MetadatumDTO metadatumDto = new MetadatumDTO();
+            metadatumDto.setValue(value);
+            metadatumDto.setElement(getField().getElement());
+            metadatumDto.setQualifier(getField().getQualifier());
+            metadatumDto.setSchema(getField().getSchema());
+            metadata.add(metadatumDto);
+        }
+        return metadata;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode body = null;
+        try {
+            body = mapper.readTree(json);
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+        return body;
+    }
+
+    public String getTypeField() {
+        return typeField;
+    }
+
+    public void setTypeField(String typeField) {
+        this.typeField = typeField;
+    }
+
+    public String getLabelField() {
+        return labelField;
+    }
+
+    public void setLabelField(String labelField) {
+        this.labelField = labelField;
+    }
+
+    public String getParentType() {
+        return parentType;
+    }
+
+    public void setParentType(String parentType) {
+        this.parentType = parentType;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java
index d84bc65701..9a2aa242c6 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleConcatContributor.java
@@ -26,7 +26,7 @@ import org.jdom2.xpath.XPathFactory;
  * This contributor is able to concat multi value.
  * Given a certain path, if it contains several nodes,
  * the values of nodes will be concatenated into a single one.
- * The concrete example we can see in the file wos-responce.xml in the <abstract_text> node,
+ * The concrete example we can see in the file wos-response.xml in the <abstract_text> node,
  * which may contain several <p> paragraphs,
  * this Contributor allows concatenating all <p> paragraphs. to obtain a single one.
  * 
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java
index 590fc63283..03f3efced0 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleJsonPathMetadataContributor.java
@@ -45,7 +45,7 @@ public class SimpleJsonPathMetadataContributor implements MetadataContributor<St
      * Initialize SimpleJsonPathMetadataContributor with a query, prefixToNamespaceMapping and MetadataFieldConfig
      *
      * @param query The JSonPath query
-     * @param field the matadata field to map the result of the Json path query
+     * @param field the metadata field to map the result of the Json path query
      * <a href="https://github.com/DSpace/DSpace/tree/master/dspace-api/src/main/java/org/dspace/importer/external#metadata-mapping-">MetadataFieldConfig</a>
      */
     public SimpleJsonPathMetadataContributor(String query, MetadataFieldConfig field) {
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMetadataContributor.java
index 1b9007f23c..70c6e0f385 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMetadataContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleMetadataContributor.java
@@ -55,7 +55,7 @@ public class SimpleMetadataContributor implements MetadataContributor<PlainMetad
     /**
      * Retrieve the metadata associated with the given object.
      * It match the key found in PlainMetadataSourceDto instance with the key passed to constructor.
-     * In case of success, new metadatum is constructer (using field elements and PlainMetadataSourceDto value)
+     * In case of success, new metadatum is constructor (using field elements and PlainMetadataSourceDto value)
      * and added to the list.
      *
      * @param t A class to retrieve metadata and key to match from. t and contained list "metadata" MUST be not null.
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java
index fb15cd60ab..f3a186e450 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathDateFormatMetadataContributor.java
@@ -87,5 +87,4 @@ public class SimpleXpathDateFormatMetadataContributor extends SimpleXpathMetadat
         dcValue.setSchema(field.getSchema());
         return dcValue;
     }
-
-}
\ No newline at end of file
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java
index 05f8647d78..3fa3237699 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/SimpleXpathMetadatumContributor.java
@@ -12,8 +12,8 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.apache.logging.log4j.Logger;
 import org.dspace.importer.external.metadatamapping.MetadataFieldConfig;
 import org.dspace.importer.external.metadatamapping.MetadataFieldMapping;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java
index 66e16f7ae8..9c10218a99 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/contributor/WosAttribute2ValueContributor.java
@@ -12,8 +12,8 @@ import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/openaire/metadatamapping/OpenAIREPublicationFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/openaire/metadatamapping/OpenAIREPublicationFieldMapping.java
new file mode 100644
index 0000000000..cf326fb63d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/openaire/metadatamapping/OpenAIREPublicationFieldMapping.java
@@ -0,0 +1,29 @@
+/**
+ * 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.importer.external.openaire.metadatamapping;
+
+import java.util.Map;
+
+import jakarta.annotation.Resource;
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping} responsible for
+ * defining the mapping of the OpenAIRE metadatum fields on the DSpace metadatum
+ * fields
+ * 
+ * @author Mykhaylo Boychuk (4science.it)
+ */
+public class OpenAIREPublicationFieldMapping extends AbstractMetadataFieldMapping {
+
+    @Override
+    @Resource(name = "openairePublicationsMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/openaire/service/OpenAireImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/openaire/service/OpenAireImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..0e7bc5e532
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/openaire/service/OpenAireImportMetadataSourceServiceImpl.java
@@ -0,0 +1,354 @@
+/**
+ * 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.importer.external.openaire.service;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+
+import jakarta.el.MethodNotFoundException;
+import jakarta.ws.rs.client.Client;
+import jakarta.ws.rs.client.ClientBuilder;
+import jakarta.ws.rs.client.Invocation;
+import jakarta.ws.rs.client.WebTarget;
+import jakarta.ws.rs.core.Response;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.metadatamapping.MetadatumDTO;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.dspace.services.ConfigurationService;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
+import org.jdom2.filter.Filters;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.xpath.XPathExpression;
+import org.jdom2.xpath.XPathFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a data source for querying OpenAIRE
+ *
+ * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
+ */
+public class OpenAireImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<Element>
+        implements QuerySource {
+
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
+    private String baseAddress;
+
+    private WebTarget webTarget;
+
+    private String queryParam;
+
+    @Override
+    public String getImportSource() {
+        return "openaire";
+    }
+
+    /**
+     * The string that identifies this import implementation. Preferable a URI
+     *
+     * @return the identifying uri
+     */
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        return retry(new SearchByIdCallable(id));
+    }
+
+    /**
+     * The string that identifies this import implementation. Preferable a URI
+     *
+     * @return the identifying uri
+     */
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        return retry(new SearchByIdCallable(query));
+    }
+
+
+    /**
+     * Find the number of records matching a query;
+     *
+     * @param query a query string to base the search on.
+     * @return the sum of the matching records over this import source
+     * @throws MetadataSourceException if the underlying methods throw any exception.
+     */
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    /**
+     * Find the number of records matching a query;
+     *
+     * @param query a query object to base the search on.
+     * @return the sum of the matching records over this import source
+     * @throws MetadataSourceException if the underlying methods throw any exception.
+     */
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    /**
+     * Find the number of records matching a string query. Supports pagination
+     *
+     * @param query a query string to base the search on.
+     * @param start offset to start at
+     * @param count number of records to retrieve.
+     * @return a set of records. Fully transformed.
+     * @throws MetadataSourceException if the underlying methods throw any exception.
+     */
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query, start, count));
+    }
+
+
+    /**
+     * Find records based on a object query.
+     *
+     * @param query a query object to base the search on.
+     * @return a set of records. Fully transformed.
+     * @throws MetadataSourceException if the underlying methods throw any exception.
+     */
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for OpenAIRE");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for OpenAIRE");
+    }
+
+    /**
+     * Set the baseAddress to this object
+     *
+     * @param baseAddress The String object that represents the baseAddress of this object
+     */
+    public void setBaseAddress(String baseAddress) {
+        this.baseAddress = baseAddress;
+    }
+
+    /**
+     * Return the baseAddress set to this object
+     *
+     * @return The String object that represents the baseAddress of this object
+     */
+    public String getBaseAddress() {
+        return baseAddress;
+    }
+
+    /**
+     * Set the name of the query param, this correspond to the index used (title, author)
+     * 
+     * @param queryParam on which index make the query
+     */
+    public void setQueryParam(String queryParam) {
+        this.queryParam = queryParam;
+    }
+
+    /**
+     * Get the name of the query param for the rest call
+     * 
+     * @return the name of the query param, i.e. the index (title, author) to use
+     */
+    public String getQueryParam() {
+        return queryParam;
+    }
+    /**
+     * Initialize the class
+     *
+     * @throws Exception on generic exception
+     */
+    @Override
+    public void init() throws Exception {
+        Client client = ClientBuilder.newClient();
+        if (baseAddress == null) {
+            baseAddress = configurationService.getProperty("openaire.search.url",
+                                                           "https://api.openaire.eu/search/publications");
+        }
+        if (queryParam == null) {
+            queryParam = "title";
+        }
+        webTarget = client.target(baseAddress);
+    }
+
+    public class SearchByIdCallable  implements Callable<ImportRecord> {
+
+        String id = null;
+
+        public SearchByIdCallable(String id) {
+            this.id = id;
+        }
+
+        public SearchByIdCallable(Query query) {
+            this.id = query.getParameterAsClass("id", String.class);
+        }
+
+        @Override
+        public ImportRecord call() throws Exception {
+            List<ImportRecord> results = new ArrayList<ImportRecord>();
+            WebTarget localTarget = webTarget.queryParam("openairePublicationID", id);
+            Invocation.Builder invocationBuilder = localTarget.request();
+            Response response = invocationBuilder.get();
+            if (response.getStatus() == 200) {
+                String responseString = response.readEntity(String.class);
+                List<Element> omElements = splitToRecords(responseString);
+                if (omElements != null) {
+                    for (Element record : omElements) {
+                        results.add(filterMultipleTitles(transformSourceRecords(record)));
+                    }
+                }
+                return results != null ? results.get(0) : null;
+            } else {
+                return null;
+            }
+        }
+    }
+
+    public class CountByQueryCallable implements Callable<Integer> {
+
+        String q;
+
+        public CountByQueryCallable(String query) {
+            q = query;
+        }
+
+        public CountByQueryCallable(Query query) {
+            q = query.getParameterAsClass("query", String.class);
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            WebTarget localTarget = webTarget.queryParam(queryParam, q);
+            Invocation.Builder invocationBuilder = localTarget.request();
+            Response response = invocationBuilder.get();
+            if (response.getStatus() == 200) {
+                String responseString = response.readEntity(String.class);
+
+                SAXBuilder saxBuilder = new SAXBuilder();
+                Document document = saxBuilder.build(new StringReader(responseString));
+                Element root = document.getRootElement();
+
+                XPathExpression<Element> xpath = XPathFactory.instance().compile("//header/total",
+                    Filters.element(), null);
+
+                Element totalItem = xpath.evaluateFirst(root);
+                return totalItem != null ? Integer.parseInt(totalItem.getText()) : null;
+
+            } else {
+                return 0;
+            }
+        }
+    }
+
+    public class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        String q;
+        int page;
+        int count;
+
+        public SearchByQueryCallable(String query, int start, int count) {
+            this.q = query;
+            this.page = start / count;
+            this.count = count;
+        }
+
+        public SearchByQueryCallable(Query query) {
+            this.q = query.getParameterAsClass("query", String.class);
+            this.page = query.getParameterAsClass("start", Integer.class) /
+                query.getParameterAsClass("count", Integer.class);
+            this.count = query.getParameterAsClass("count", Integer.class);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            WebTarget localTarget = webTarget.queryParam(queryParam, q);
+            localTarget = localTarget.queryParam("page", page + 1);
+            localTarget = localTarget.queryParam("size", count);
+            List<ImportRecord> results = new ArrayList<ImportRecord>();
+            Invocation.Builder invocationBuilder = localTarget.request();
+            Response response = invocationBuilder.get();
+            if (response.getStatus() == 200) {
+                String responseString = response.readEntity(String.class);
+                List<Element> omElements = splitToRecords(responseString);
+                if (omElements != null) {
+                    for (Element record : omElements) {
+                        results.add(filterMultipleTitles(transformSourceRecords(record)));
+                    }
+                }
+            }
+            return results;
+        }
+    }
+
+    /**
+     * This method remove multiple titles occurrences
+     * 
+     * @param transformSourceRecords
+     * @return ImportRecord with one or zero title
+     */
+    private ImportRecord filterMultipleTitles(ImportRecord transformSourceRecords) {
+        List<MetadatumDTO> metadata = (List<MetadatumDTO>)transformSourceRecords.getValueList();
+        ArrayList<MetadatumDTO> nextSourceRecord = new ArrayList<>();
+        boolean found = false;
+        for (MetadatumDTO dto : metadata) {
+            if ("dc".equals(dto.getSchema()) && "title".equals(dto.getElement()) && dto.getQualifier() == null) {
+                if (!found) {
+                    nextSourceRecord.add(dto);
+                    found = true;
+                }
+            } else {
+                nextSourceRecord.add(dto);
+            }
+        }
+        return new ImportRecord(nextSourceRecord);
+    }
+
+    private List<Element> splitToRecords(String recordsSrc) {
+
+        try {
+            SAXBuilder saxBuilder = new SAXBuilder();
+            Document document = saxBuilder.build(new StringReader(recordsSrc));
+            Element root = document.getRootElement();
+
+            List namespaces = Arrays.asList(
+                Namespace.getNamespace("dri", "http://www.driver-repository.eu/namespace/dri"),
+                Namespace.getNamespace("oaf", "http://namespace.openaire.eu/oaf"),
+                Namespace.getNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance"));
+            XPathExpression<Element> xpath = XPathFactory.instance().compile("//results/result",
+                Filters.element(), null, namespaces);
+
+            List<Element> recordsList = xpath.evaluate(root);
+            return recordsList;
+        } catch (JDOMException | IOException e) {
+            return null;
+        }
+    }
+
+
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/pubmed/metadatamapping/PubmedFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/pubmed/metadatamapping/PubmedFieldMapping.java
index 2d31537766..0d4dcf0c1e 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/pubmed/metadatamapping/PubmedFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/pubmed/metadatamapping/PubmedFieldMapping.java
@@ -9,8 +9,8 @@
 package org.dspace.importer.external.pubmed.metadatamapping;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java
index 8c8e23fe98..35d10af584 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.pubmedeurope;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java
index 92d7d9fbd3..5aae8ca8cf 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/pubmedeurope/PubmedEuropeMetadataSourceServiceImpl.java
@@ -17,8 +17,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpException;
 import org.apache.http.client.ClientProtocolException;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java
index 1f460c19e6..e4e027016e 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ris/service/RisImportMetadataSourceServiceImpl.java
@@ -17,8 +17,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.exception.FileSourceException;
 import org.dspace.importer.external.service.components.AbstractPlainMetadataSource;
 import org.dspace.importer.external.service.components.dto.PlainMetadataKeyValueItem;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ror/service/RorFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/ror/service/RorFieldMapping.java
new file mode 100644
index 0000000000..3096a92f95
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ror/service/RorFieldMapping.java
@@ -0,0 +1,38 @@
+/**
+ * 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.importer.external.ror.service;
+
+import java.util.Map;
+
+import jakarta.annotation.Resource;
+import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
+
+
+/**
+ * An implementation of {@link AbstractMetadataFieldMapping}
+ * Responsible for defining the mapping of the ROR metadatum fields on the DSpace metadatum fields
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ */
+public class RorFieldMapping extends AbstractMetadataFieldMapping {
+
+    /**
+     * Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+     * only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+     * what metadatafield is generated.
+     *
+     * @param metadataFieldMap The map containing the link between retrieve metadata and metadata that will be set to
+     *                         the item.
+     */
+    @Override
+    @Resource(name = "rorMetadataFieldMap")
+    public void setMetadataFieldMap(Map metadataFieldMap) {
+        super.setMetadataFieldMap(metadataFieldMap);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/ror/service/RorImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/ror/service/RorImportMetadataSourceServiceImpl.java
new file mode 100644
index 0000000000..aa11ac0bb7
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/importer/external/ror/service/RorImportMetadataSourceServiceImpl.java
@@ -0,0 +1,278 @@
+/**
+ * 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.importer.external.ror.service;
+
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.el.MethodNotFoundException;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.datamodel.Query;
+import org.dspace.importer.external.exception.MetadataSourceException;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClient;
+import org.dspace.importer.external.service.AbstractImportMetadataSourceService;
+import org.dspace.importer.external.service.components.QuerySource;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implements a {@code AbstractImportMetadataSourceService} for querying ROR services.
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ */
+public class RorImportMetadataSourceServiceImpl extends AbstractImportMetadataSourceService<String>
+    implements QuerySource {
+
+    private final static Logger log = LogManager.getLogger();
+    protected static final String ROR_IDENTIFIER_PREFIX = "https://ror.org/";
+
+    private String url;
+
+    private int timeout = 1000;
+
+    @Autowired
+    private LiveImportClient liveImportClient;
+
+    @Override
+    public String getImportSource() {
+        return "ror";
+    }
+
+    @Override
+    public ImportRecord getRecord(String id) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(id));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public int getRecordsCount(String query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public int getRecordsCount(Query query) throws MetadataSourceException {
+        return retry(new CountByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(String query, int start, int count) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    @Override
+    public Collection<ImportRecord> getRecords(Query query) throws MetadataSourceException {
+        return retry(new SearchByQueryCallable(query));
+    }
+
+    @Override
+    public ImportRecord getRecord(Query query) throws MetadataSourceException {
+        List<ImportRecord> records = retry(new SearchByIdCallable(query));
+        return CollectionUtils.isEmpty(records) ? null : records.get(0);
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Query query) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for ROR");
+    }
+
+    @Override
+    public Collection<ImportRecord> findMatchingRecords(Item item) throws MetadataSourceException {
+        throw new MethodNotFoundException("This method is not implemented for ROR");
+    }
+
+    @Override
+    public void init() throws Exception {
+    }
+
+    /**
+     * This class is a Callable implementation to get ROR entries based on query
+     * object. This Callable use as query value the string queryString passed to
+     * constructor. If the object will be construct through Query.class instance, a
+     * Query's map entry with key "query" will be used. Pagination is supported too,
+     * using the value of the Query's map with keys "start" and "count".
+     * 
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByQueryCallable implements Callable<List<ImportRecord>> {
+
+        private Query query;
+
+        private SearchByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        private SearchByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            return search(query.getParameterAsClass("query", String.class));
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to get an ROR entry using bibcode The
+     * bibcode to use can be passed through the constructor as a String or as
+     * Query's map entry, with the key "id".
+     *
+     * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+     */
+    private class SearchByIdCallable implements Callable<List<ImportRecord>> {
+        private Query query;
+
+        private SearchByIdCallable(Query query) {
+            this.query = query;
+        }
+
+        private SearchByIdCallable(String id) {
+            this.query = new Query();
+            query.addParameter("id", id);
+        }
+
+        @Override
+        public List<ImportRecord> call() throws Exception {
+            return searchById(query.getParameterAsClass("id", String.class));
+        }
+    }
+
+    /**
+     * This class is a Callable implementation to count the number of entries for a
+     * ROR query. This Callable uses as query value to ROR the string queryString
+     * passed to constructor. If the object will be construct through {@code Query}
+     * instance, the value of the Query's map with the key "query" will be used.
+     * 
+     * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+     */
+    private class CountByQueryCallable implements Callable<Integer> {
+        private Query query;
+
+        private CountByQueryCallable(String queryString) {
+            query = new Query();
+            query.addParameter("query", queryString);
+        }
+
+        private CountByQueryCallable(Query query) {
+            this.query = query;
+        }
+
+        @Override
+        public Integer call() throws Exception {
+            return count(query.getParameterAsClass("query", String.class));
+        }
+    }
+
+    /**
+     * Counts the number of results for the given query.
+     *
+     * @param  query   the query string to count results for
+     * @return        the number of results for the given query
+     */
+    public Integer count(String query) {
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String, String>>();
+
+            URIBuilder uriBuilder = new URIBuilder(this.url);
+            uriBuilder.addParameter("query", query);
+
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+            if (StringUtils.isEmpty(resp)) {
+                return 0;
+            }
+            JsonNode jsonNode = convertStringJsonToJsonNode(resp);
+            return jsonNode.at("/number_of_results").asInt();
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+        return 0;
+    }
+
+    private List<ImportRecord> searchById(String id) {
+
+        List<ImportRecord> importResults = new ArrayList<>();
+
+        id = StringUtils.removeStart(id, ROR_IDENTIFIER_PREFIX);
+
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String, String>>();
+
+            URIBuilder uriBuilder = new URIBuilder(this.url + "/" + id);
+
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+            if (StringUtils.isEmpty(resp)) {
+                return importResults;
+            }
+
+            JsonNode jsonNode = convertStringJsonToJsonNode(resp);
+            importResults.add(transformSourceRecords(jsonNode.toString()));
+
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+        return importResults;
+    }
+
+    private List<ImportRecord> search(String query) {
+        List<ImportRecord> importResults = new ArrayList<>();
+        try {
+            Map<String, Map<String, String>> params = new HashMap<String, Map<String, String>>();
+
+            URIBuilder uriBuilder = new URIBuilder(this.url);
+            uriBuilder.addParameter("query", query);
+
+            String resp = liveImportClient.executeHttpGetRequest(timeout, uriBuilder.toString(), params);
+            if (StringUtils.isEmpty(resp)) {
+                return importResults;
+            }
+
+            JsonNode jsonNode = convertStringJsonToJsonNode(resp);
+            JsonNode docs = jsonNode.at("/items");
+            if (docs.isArray()) {
+                Iterator<JsonNode> nodes = docs.elements();
+                while (nodes.hasNext()) {
+                    JsonNode node = nodes.next();
+                    importResults.add(transformSourceRecords(node.toString()));
+                }
+            } else {
+                importResults.add(transformSourceRecords(docs.toString()));
+            }
+        } catch (URISyntaxException e) {
+            e.printStackTrace();
+        }
+        return importResults;
+    }
+
+    private JsonNode convertStringJsonToJsonNode(String json) {
+        try {
+            return new ObjectMapper().readTree(json);
+        } catch (JsonProcessingException e) {
+            log.error("Unable to process json response.", e);
+        }
+        return null;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java
index 0d7183a1f0..f8c4f93a17 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloFieldMapping.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.importer.external.scielo.service;
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java
index 4f83ffe978..ce0c20435e 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scielo/service/ScieloImportMetadataSourceServiceImpl.java
@@ -20,9 +20,9 @@ import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.el.MethodNotFoundException;
-import javax.ws.rs.BadRequestException;
 
+import jakarta.el.MethodNotFoundException;
+import jakarta.ws.rs.BadRequestException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.http.client.utils.URIBuilder;
 import org.dspace.content.Item;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java
index c8143339b4..93e9753c42 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.scopus.service;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java
index e61ca05286..39b2be7ad5 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/scopus/service/ScopusImportMetadataSourceServiceImpl.java
@@ -22,8 +22,8 @@ import java.util.Objects;
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java b/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java
index 5d83b9a7cc..6e0a2d9f7a 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractPlainMetadataSource.java
@@ -23,8 +23,8 @@ import org.dspace.importer.external.service.components.dto.PlainMetadataSourceDt
 /**
  * This class is an abstract implementation of {@link MetadataSource} useful in cases
  * of plain metadata sources.
- * It provides the methot to mapping metadata to DSpace Format when source is a file
- * whit a list of <key, value> strings.
+ * It provides the method to mapping metadata to DSpace Format when source is a file
+ * with a list of <key, value> strings.
  *
  * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
  */
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractRemoteMetadataSource.java b/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractRemoteMetadataSource.java
index 29801433e3..e15ffff6e6 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractRemoteMetadataSource.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/service/components/AbstractRemoteMetadataSource.java
@@ -14,8 +14,8 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.Callable;
 import java.util.concurrent.locks.ReentrantLock;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.apache.logging.log4j.Logger;
 import org.dspace.importer.external.exception.MetadataSourceException;
 import org.dspace.importer.external.exception.SourceExceptionHandler;
@@ -167,9 +167,9 @@ public abstract class AbstractRemoteMetadataSource {
                 } catch (Exception e) {
                     throwSourceException(retry, e, operationId);
                 }
-                log.info("operation " + operationId + " started");
+                log.debug("Operation {} started. Calling {}", operationId, callable.getClass().getName());
                 T response = callable.call();
-                log.info("operation " + operationId + " successful");
+                log.debug("Operation {} successful", operationId);
                 return response;
             } catch (Exception e) {
                 this.error = e;
@@ -180,7 +180,8 @@ public abstract class AbstractRemoteMetadataSource {
 
                 // No MetadataSourceException has interrupted the loop
                 retry++;
-                log.warn("Error in trying operation " + operationId + " " + retry + " " + warning + ", retrying !", e);
+                log.warn("Error in calling {} in operation {} {} {}, retrying!", callable.getClass().getName(),
+                         operationId, retry, warning, e);
 
             } finally {
                 this.lastRequest = System.currentTimeMillis();
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java
index a4f90fa5ba..8933569a06 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/vufind/VuFindImportMetadataSourceServiceImpl.java
@@ -15,11 +15,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.Callable;
-import javax.el.MethodNotFoundException;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.LogManager;
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java
index b14927a14c..d96265372f 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/vufind/metadatamapping/VuFindFieldMapping.java
@@ -8,8 +8,8 @@
 package org.dspace.importer.external.vufind.metadatamapping;
 
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java
index be4acfbcea..6cf58fdd7b 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSFieldMapping.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.importer.external.wos.service;
 import java.util.Map;
-import javax.annotation.Resource;
 
+import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java
index f550b65995..c7b5aaa49e 100644
--- a/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/importer/external/wos/service/WOSImportMetadataSourceServiceImpl.java
@@ -21,8 +21,8 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
diff --git a/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
index 07a79384c7..4665fe4428 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidHistory.java
@@ -8,24 +8,23 @@
 package org.dspace.orcid;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.content.Item;
 import org.dspace.core.ReloadableEntity;
-import org.hibernate.annotations.Type;
+import org.hibernate.Length;
 
 /**
  * The ORCID history entity that it contains information relating to an attempt
@@ -79,18 +78,14 @@ public class OrcidHistory implements ReloadableEntity<Integer> {
     /**
      * A description of the synchronized resource.
      */
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "description")
+    @Column(name = "description", length = Length.LONG32)
     private String description;
 
     /**
      * The signature of the synchronized metadata. This is used when the entity is
      * the owner itself.
      */
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "metadata")
+    @Column(name = "metadata", length = Length.LONG32)
     private String metadata;
 
     /**
@@ -103,9 +98,7 @@ public class OrcidHistory implements ReloadableEntity<Integer> {
     /**
      * The response message incoming from ORCID.
      */
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "response_message")
+    @Column(name = "response_message", length = Length.LONG32)
     private String responseMessage;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
index 65b66cd20c..dfcb531401 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidQueue.java
@@ -11,22 +11,21 @@ import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.Item;
 import org.dspace.core.ReloadableEntity;
-import org.hibernate.annotations.Type;
+import org.hibernate.Length;
 
 /**
  * Entity that model a record on the ORCID synchronization queue. Each record in
@@ -64,9 +63,7 @@ public class OrcidQueue implements ReloadableEntity<Integer> {
     /**
      * A description of the resource to be synchronized.
      */
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "description")
+    @Column(name = "description", length = Length.LONG32)
     private String description;
 
     /**
@@ -87,9 +84,7 @@ public class OrcidQueue implements ReloadableEntity<Integer> {
      * The signature of the metadata to be synchronized. This is used when the
      * entity is the owner itself.
      */
-    @Lob
-    @Column(name = "metadata")
-    @Type(type = "org.hibernate.type.TextType")
+    @Column(name = "metadata", length = Length.LONG32)
     private String metadata;
 
     /**
diff --git a/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java b/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
index def289daf4..3e54a68a23 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/OrcidToken.java
@@ -7,17 +7,16 @@
  */
 package org.dspace.orcid;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.Item;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
index 3e7ca7b210..2dc1d591fd 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/client/OrcidClientImpl.java
@@ -21,14 +21,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.Unmarshaller;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
@@ -261,7 +261,7 @@ public class OrcidClientImpl implements OrcidClient {
      *                              OrcidClientException
      * @param  clazz                the class to be used for the content unmarshall
      * @return                      the response body
-     * @throws OrcidClientException if the incoming response is not successfull
+     * @throws OrcidClientException if the incoming response is not successful
      */
     private <T> T executeAndUnmarshall(HttpUriRequest httpUriRequest, boolean handleNotFoundAsNull, Class<T> clazz) {
 
diff --git a/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java b/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
index d177e61607..97da341fb8 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/consumer/OrcidQueueConsumer.java
@@ -22,6 +22,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
@@ -45,8 +47,6 @@ import org.dspace.orcid.service.OrcidTokenService;
 import org.dspace.profile.OrcidProfileSyncPreference;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * The consumer to fill the ORCID queue. The addition to the queue is made for
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
  * be synchronized (based on the preferences set by the user)</li>
  * <li>are publications/fundings related to profile items linked to orcid (based
  * on the preferences set by the user)</li>
- * 
+ *
  * </ul>
  *
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
  */
 public class OrcidQueueConsumer implements Consumer {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidQueueConsumer.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private OrcidQueueService orcidQueueService;
 
@@ -82,7 +82,7 @@ public class OrcidQueueConsumer implements Consumer {
 
     private RelationshipService relationshipService;
 
-    private List<UUID> alreadyConsumedItems = new ArrayList<>();
+    private final List<UUID> alreadyConsumedItems = new ArrayList<>();
 
     @Override
     public void initialize() throws Exception {
@@ -263,7 +263,7 @@ public class OrcidQueueConsumer implements Consumer {
 
             if (StringUtils.isBlank(putCode)) {
                 LOGGER.warn("The orcid history record with id {} should have a not blank put code",
-                    historyRecord.getID());
+                        historyRecord::getID);
                 continue;
             }
 
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
index 0b2c7099ff..fe300751d1 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidHistoryDAOImpl.java
@@ -10,8 +10,8 @@ package org.dspace.orcid.dao.impl;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Query;
 
+import jakarta.persistence.Query;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
index 2114b25357..c8e48e3f17 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidQueueDAOImpl.java
@@ -10,8 +10,8 @@ package org.dspace.orcid.dao.impl;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.persistence.Query;
 
+import jakarta.persistence.Query;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
index 01b03fc354..f94f5ad3a4 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/dao/impl/OrcidTokenDAOImpl.java
@@ -8,8 +8,8 @@
 package org.dspace.orcid.dao.impl;
 
 import java.sql.SQLException;
-import javax.persistence.Query;
 
+import jakarta.persistence.Query;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
index 4ca36c2169..9a821bef8d 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/OrcidCommonObjectFactory.java
@@ -35,7 +35,7 @@ public interface OrcidCommonObjectFactory {
      * represent a date with a supported format.
      *
      * @param  metadataValue the metadata value
-     * @return               the FuzzyDate istance, if any
+     * @return               the FuzzyDate instance, if any
      */
     public Optional<FuzzyDate> createFuzzyDate(MetadataValue metadataValue);
 
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
index 2f47aa53d6..1195d27c4f 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidCommonObjectFactoryImpl.java
@@ -172,7 +172,7 @@ public class OrcidCommonObjectFactoryImpl implements OrcidCommonObjectFactory {
 
     private ContributorAttributes getContributorAttributes(MetadataValue metadataValue, ContributorRole role) {
         ContributorAttributes attributes = new ContributorAttributes();
-        attributes.setContributorRole(role != null ? role : null);
+        attributes.setContributorRole(role != null ? role.value() : null);
         attributes.setContributorSequence(metadataValue.getPlace() == 0 ? FIRST : ADDITIONAL);
         return attributes;
     }
@@ -191,7 +191,7 @@ public class OrcidCommonObjectFactoryImpl implements OrcidCommonObjectFactory {
     private FundingContributorAttributes getFundingContributorAttributes(MetadataValue metadataValue,
         FundingContributorRole role) {
         FundingContributorAttributes attributes = new FundingContributorAttributes();
-        attributes.setContributorRole(role != null ? role : null);
+        attributes.setContributorRole(role != null ? role.value() : null);
         return attributes;
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
index 890b54f12b..fd2669935c 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidFundingFactory.java
@@ -18,6 +18,8 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.Relationship;
@@ -44,8 +46,6 @@ import org.orcid.jaxb.model.v3.release.record.Funding;
 import org.orcid.jaxb.model.v3.release.record.FundingContributor;
 import org.orcid.jaxb.model.v3.release.record.FundingContributors;
 import org.orcid.jaxb.model.v3.release.record.FundingTitle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -57,7 +57,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class OrcidFundingFactory implements OrcidEntityFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidFundingFactory.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     @Autowired
     private ItemService itemService;
diff --git a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
index 53b46d8256..7018c221ba 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/model/factory/impl/OrcidWorkFactory.java
@@ -19,6 +19,8 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.EnumUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.service.ItemService;
@@ -42,8 +44,6 @@ import org.orcid.jaxb.model.v3.release.record.ExternalIDs;
 import org.orcid.jaxb.model.v3.release.record.Work;
 import org.orcid.jaxb.model.v3.release.record.WorkContributors;
 import org.orcid.jaxb.model.v3.release.record.WorkTitle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -55,7 +55,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class OrcidWorkFactory implements OrcidEntityFactory {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidWorkFactory.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     @Autowired
     private ItemService itemService;
@@ -164,7 +164,7 @@ public class OrcidWorkFactory implements OrcidEntityFactory {
      */
     private List<ExternalID> getWorkSelfExternalIds(Context context, Item item) {
 
-        List<ExternalID> selfExternalIds = new ArrayList<ExternalID>();
+        List<ExternalID> selfExternalIds = new ArrayList<>();
 
         Map<String, String> externalIdentifierFields = fieldMapping.getExternalIdentifierFields();
 
@@ -205,7 +205,7 @@ public class OrcidWorkFactory implements OrcidEntityFactory {
     }
 
     /**
-     * Creates an instance of WorkType from the given item, taking the value fom the
+     * Creates an instance of WorkType from the given item, taking the value from the
      * configured metadata field (orcid.mapping.work.type).
      */
     private WorkType getWorkType(Context context, Item item) {
diff --git a/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
index 0e6f856bfc..7dceb473cc 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/script/OrcidBulkPush.java
@@ -20,6 +20,8 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
@@ -36,8 +38,6 @@ import org.dspace.scripts.DSpaceRunnable;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.utils.DSpace;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Script that perform the bulk synchronization with ORCID registry of all the
@@ -48,7 +48,7 @@ import org.slf4j.LoggerFactory;
  */
 public class OrcidBulkPush extends DSpaceRunnable<OrcidBulkPushScriptConfiguration<OrcidBulkPush>> {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidBulkPush.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     private OrcidQueueService orcidQueueService;
 
@@ -63,7 +63,7 @@ public class OrcidBulkPush extends DSpaceRunnable<OrcidBulkPushScriptConfigurati
     /**
      * Cache that stores the synchronization mode set for a specific profile item.
      */
-    private Map<Item, OrcidSynchronizationMode> synchronizationModeByProfileItem = new HashMap<>();
+    private final Map<Item, OrcidSynchronizationMode> synchronizationModeByProfileItem = new HashMap<>();
 
     private boolean ignoreMaxAttempts = false;
 
@@ -105,7 +105,7 @@ public class OrcidBulkPush extends DSpaceRunnable<OrcidBulkPushScriptConfigurati
     }
 
     /**
-     * Find all the Orcid Queue records that need to be synchronized and perfom the
+     * Find all the Orcid Queue records that need to be synchronized and perform the
      * synchronization.
      */
     private void performBulkSynchronization() throws SQLException {
@@ -130,7 +130,7 @@ public class OrcidBulkPush extends DSpaceRunnable<OrcidBulkPushScriptConfigurati
     }
 
     /**
-     * If the current script execution is configued to ignore the max attemps,
+     * If the current script execution is configured to ignore the max attempts,
      * returns all the ORCID Queue records, otherwise returns the ORCID Queue
      * records that has an attempts value less than the configured max attempts
      * value.
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
index 575ce6811b..914ed7172e 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/OrcidSynchronizationService.java
@@ -21,7 +21,7 @@ import org.dspace.profile.OrcidProfileSyncPreference;
 import org.dspace.profile.OrcidSynchronizationMode;
 
 /**
- * Service that handle the the syncronization between a DSpace profile and the
+ * Service that handle the the synchronization between a DSpace profile and the
  * relative ORCID profile, if any.
  *
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
index 0bec9a12e0..0e18b46f5d 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidHistoryServiceImpl.java
@@ -24,6 +24,8 @@ import java.util.Optional;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataFieldName;
 import org.dspace.content.MetadataValue;
@@ -48,8 +50,6 @@ import org.dspace.orcid.service.OrcidHistoryService;
 import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
 import org.dspace.orcid.service.OrcidTokenService;
 import org.orcid.jaxb.model.v3.release.record.Activity;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -61,7 +61,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class OrcidHistoryServiceImpl implements OrcidHistoryService {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(OrcidHistoryServiceImpl.class);
+    private static final Logger LOGGER = LogManager.getLogger();
 
     @Autowired
     private OrcidHistoryDAO orcidHistoryDAO;
@@ -134,7 +134,7 @@ public class OrcidHistoryServiceImpl implements OrcidHistoryService {
 
     @Override
     public Map<Item, String> findLastPutCodes(Context context, Item entity) throws SQLException {
-        Map<Item, String> profileItemAndPutCodeMap = new HashMap<Item, String>();
+        Map<Item, String> profileItemAndPutCodeMap = new HashMap<>();
 
         List<OrcidHistory> orcidHistoryRecords = findByEntity(context, entity);
         for (OrcidHistory orcidHistoryRecord : orcidHistoryRecords) {
@@ -187,10 +187,12 @@ public class OrcidHistoryServiceImpl implements OrcidHistoryService {
         } catch (OrcidValidationException ex) {
             throw ex;
         } catch (OrcidClientException ex) {
-            LOGGER.error("An error occurs during the orcid synchronization of ORCID queue " + orcidQueue, ex);
+            LOGGER.error("An error occurs during the orcid synchronization of ORCID queue {}",
+                    orcidQueue, ex);
             return createHistoryRecordFromOrcidError(context, orcidQueue, operation, ex);
         } catch (RuntimeException ex) {
-            LOGGER.warn("An unexpected error occurs during the orcid synchronization of ORCID queue " + orcidQueue, ex);
+            LOGGER.warn("An unexpected error occurs during the orcid synchronization of ORCID queue {}",
+                    orcidQueue, ex);
             return createHistoryRecordFromGenericError(context, orcidQueue, operation, ex);
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
index 97d832d3de..59e4dea641 100644
--- a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
@@ -118,6 +118,10 @@ public class OrcidSynchronizationServiceImpl implements OrcidSynchronizationServ
         itemService.clearMetadata(context, profile, "dspace", "orcid", "scope", Item.ANY);
         itemService.clearMetadata(context, profile, "dspace", "orcid", "authenticated", Item.ANY);
 
+        if (!configurationService.getBooleanProperty("orcid.disconnection.remain-sync", false)) {
+            clearSynchronizationSettings(context, profile);
+        }
+
         orcidTokenService.deleteByProfileItem(context, profile);
 
         updateItem(context, profile);
@@ -267,6 +271,17 @@ public class OrcidSynchronizationServiceImpl implements OrcidSynchronizationServ
 
     }
 
+    private void clearSynchronizationSettings(Context context, Item profile)
+        throws SQLException {
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "sync-mode", Item.ANY);
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "sync-profile", Item.ANY);
+
+        for (OrcidEntityType entityType : OrcidEntityType.values()) {
+            itemService.clearMetadata(context, profile, "dspace", "orcid",
+                "sync-" + entityType.name().toLowerCase() + "s", Item.ANY);
+        }
+    }
+
     private boolean containsSameValues(List<String> firstList, List<String> secondList) {
         return new HashSet<>(firstList).equals(new HashSet<>(secondList));
     }
diff --git a/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
index 80bbd68fd1..5de1ffa4ac 100644
--- a/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/profile/ResearcherProfileServiceImpl.java
@@ -23,10 +23,12 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import javax.annotation.PostConstruct;
 
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.exception.ResourceAlreadyExistsException;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
@@ -53,8 +55,6 @@ import org.dspace.profile.service.AfterResearcherProfileCreationAction;
 import org.dspace.profile.service.ResearcherProfileService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.util.UUIDUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 
@@ -66,7 +66,7 @@ import org.springframework.util.Assert;
  */
 public class ResearcherProfileServiceImpl implements ResearcherProfileService {
 
-    private static Logger log = LoggerFactory.getLogger(ResearcherProfileServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private ItemService itemService;
@@ -310,7 +310,7 @@ public class ResearcherProfileServiceImpl implements ResearcherProfileService {
 
         if (isNotProfileCollection(collection)) {
             log.warn("The configured researcher-profile.collection.uuid "
-                + "has an invalid entity type, expected " + getProfileType());
+                + "has an invalid entity type, expected {}", this::getProfileType);
             return Optional.empty();
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java b/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
index 9e52402f77..de01760f9f 100644
--- a/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
+++ b/dspace-api/src/main/java/org/dspace/profile/service/ResearcherProfileService.java
@@ -67,7 +67,7 @@ public interface ResearcherProfileService {
 
     /**
      * Changes the visibility of the given profile using the given new visible
-     * value. The visiblity controls whether the Profile is Anonymous READ or not.
+     * value. The visibility controls whether the Profile is Anonymous READ or not.
      *
      * @param  context            the relevant DSpace Context.
      * @param  profile            the researcher profile to update
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/AutomaticProcessingAction.java b/dspace-api/src/main/java/org/dspace/qaevent/AutomaticProcessingAction.java
new file mode 100644
index 0000000000..771650746d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/AutomaticProcessingAction.java
@@ -0,0 +1,17 @@
+/**
+ * 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.qaevent;
+
+/**
+ * Enumeration of possible actions to perform over a {@link org.dspace.content.QAEvent}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public enum AutomaticProcessingAction {
+    REJECT, ACCEPT, IGNORE
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QAEventAutomaticProcessingEvaluation.java b/dspace-api/src/main/java/org/dspace/qaevent/QAEventAutomaticProcessingEvaluation.java
new file mode 100644
index 0000000000..d7c8f3681e
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QAEventAutomaticProcessingEvaluation.java
@@ -0,0 +1,31 @@
+/**
+ * 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.qaevent;
+
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+
+/**
+ * This interface allows the implemnetation of Automation Processing rules
+ * defining which {@link AutomaticProcessingAction} should be eventually
+ * performed on a specific {@link QAEvent}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public interface QAEventAutomaticProcessingEvaluation {
+
+    /**
+     * Evaluate a {@link QAEvent} to decide which, if any, {@link AutomaticProcessingAction} should be performed
+     *
+     * @param context the DSpace context
+     * @param qaEvent the quality assurance event
+     * @return        an action of {@link AutomaticProcessingAction} or null if no automatic action should be performed
+     */
+    AutomaticProcessingAction evaluateAutomaticProcessing(Context context, QAEvent qaEvent);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QAEventsDeleteCascadeConsumer.java b/dspace-api/src/main/java/org/dspace/qaevent/QAEventsDeleteCascadeConsumer.java
new file mode 100644
index 0000000000..6460c360ec
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QAEventsDeleteCascadeConsumer.java
@@ -0,0 +1,50 @@
+/**
+ * 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.qaevent;
+
+import org.dspace.core.Constants;
+import org.dspace.core.Context;
+import org.dspace.event.Consumer;
+import org.dspace.event.Event;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.utils.DSpace;
+
+/**
+ * Consumer to delete qaevents from solr due to the target item deletion
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEventsDeleteCascadeConsumer implements Consumer {
+
+    private QAEventService qaEventService;
+
+    @Override
+    public void initialize() throws Exception {
+        qaEventService = new DSpace().getSingletonService(QAEventService.class);
+    }
+
+    @Override
+    public void finish(Context context) throws Exception {
+
+    }
+
+    @Override
+    public void consume(Context context, Event event) throws Exception {
+        if (event.getEventType() == Event.DELETE) {
+            if (event.getSubjectType() == Constants.ITEM && event.getSubjectID() != null) {
+                qaEventService.deleteEventsByTargetId(event.getSubjectID());
+            }
+        }
+    }
+
+    public void end(Context context) throws Exception {
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QANotifyPatterns.java b/dspace-api/src/main/java/org/dspace/qaevent/QANotifyPatterns.java
new file mode 100644
index 0000000000..ede1990569
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QANotifyPatterns.java
@@ -0,0 +1,30 @@
+/**
+ * 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.qaevent;
+
+/**
+ * Constants for Quality Assurance configurations to be used into cfg and xml spring.
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ */
+public class QANotifyPatterns {
+
+    public static final String TOPIC_ENRICH_MORE_PROJECT = "ENRICH/MORE/PROJECT";
+    public static final String TOPIC_ENRICH_MISSING_PROJECT = "ENRICH/MISSING/PROJECT";
+    public static final String TOPIC_ENRICH_MISSING_ABSTRACT = "ENRICH/MISSING/ABSTRACT";
+    public static final String TOPIC_ENRICH_MORE_REVIEW = "ENRICH/MORE/REVIEW";
+    public static final String TOPIC_ENRICH_MORE_ENDORSEMENT = "ENRICH/MORE/ENDORSEMENT";
+    public static final String TOPIC_ENRICH_MORE_PID = "ENRICH/MORE/PID";
+    public static final String TOPIC_ENRICH_MISSING_PID = "ENRICH/MISSING/PID";
+    public static final String TOPIC_ENRICH_MORE_LINK = "ENRICH/MORE/LINK";
+
+    /**
+     * Default constructor
+     */
+    private QANotifyPatterns() { }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QAScoreAutomaticProcessingEvaluation.java b/dspace-api/src/main/java/org/dspace/qaevent/QAScoreAutomaticProcessingEvaluation.java
new file mode 100644
index 0000000000..f685222d3d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QAScoreAutomaticProcessingEvaluation.java
@@ -0,0 +1,151 @@
+/**
+ * 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.qaevent;
+
+import java.sql.SQLException;
+import java.util.UUID;
+
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.logic.LogicalStatement;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * A configurable implementation of {@link QAEventAutomaticProcessingEvaluation} allowing to define thresholds for
+ * automatic acceptance, rejection or ignore of {@link QAEvent} matching a specific, optional, item filter
+ * {@link LogicalStatement}. If the item filter is not defined only the score threshold will be used.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class QAScoreAutomaticProcessingEvaluation implements QAEventAutomaticProcessingEvaluation {
+    /**
+     * The minimum score of QAEvent to be considered for automatic approval (trust must be greater or equals to that)
+     */
+    private double scoreToApprove;
+
+    /**
+     * The threshold under which QAEvent are considered for automatic ignore (trust must be less or equals to that)
+     */
+    private double scoreToIgnore;
+
+    /**
+     * The threshold under which QAEvent are considered for automatic rejection (trust must be less or equals to that)
+     */
+    private double scoreToReject;
+
+    /**
+     * The optional logical statement that must pass for item target of a QAEvent to be considered for automatic
+     * approval
+     */
+    private LogicalStatement itemFilterToApprove;
+
+    /**
+     * The optional logical statement that must pass for item target of a QAEvent to be considered for automatic
+     * ignore
+     */
+    private LogicalStatement itemFilterToIgnore;
+
+    /**
+     * The optional logical statement that must pass for item target of a QAEvent to be considered for automatic
+     * rejection
+     */
+    private LogicalStatement itemFilterToReject;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public AutomaticProcessingAction evaluateAutomaticProcessing(Context context, QAEvent qaEvent) {
+        Item item = findItem(context, qaEvent.getTarget());
+
+        if (shouldReject(context, qaEvent.getTrust(), item)) {
+            return AutomaticProcessingAction.REJECT;
+        } else if (shouldIgnore(context, qaEvent.getTrust(), item)) {
+            return AutomaticProcessingAction.IGNORE;
+        } else if (shouldApprove(context, qaEvent.getTrust(), item)) {
+            return AutomaticProcessingAction.ACCEPT;
+        } else {
+            return null;
+        }
+
+    }
+
+    private Item findItem(Context context, String uuid) {
+        try {
+            return itemService.find(context, UUID.fromString(uuid));
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private boolean shouldReject(Context context, double trust, Item item) {
+        return trust <= scoreToReject &&
+            (itemFilterToReject == null || itemFilterToReject.getResult(context, item));
+    }
+
+    private boolean shouldIgnore(Context context, double trust, Item item) {
+        return trust <= scoreToIgnore &&
+            (itemFilterToIgnore == null || itemFilterToIgnore.getResult(context, item));
+    }
+
+    private boolean shouldApprove(Context context, double trust, Item item) {
+        return trust >= scoreToApprove &&
+            (itemFilterToApprove == null || itemFilterToApprove.getResult(context, item));
+    }
+
+    public double getScoreToApprove() {
+        return scoreToApprove;
+    }
+
+    public void setScoreToApprove(double scoreToApprove) {
+        this.scoreToApprove = scoreToApprove;
+    }
+
+    public double getScoreToIgnore() {
+        return scoreToIgnore;
+    }
+
+    public void setScoreToIgnore(double scoreToIgnore) {
+        this.scoreToIgnore = scoreToIgnore;
+    }
+
+    public double getScoreToReject() {
+        return scoreToReject;
+    }
+
+    public void setScoreToReject(double scoreToReject) {
+        this.scoreToReject = scoreToReject;
+    }
+
+    public LogicalStatement getItemFilterToApprove() {
+        return itemFilterToApprove;
+    }
+
+    public void setItemFilterToApprove(LogicalStatement itemFilterToApprove) {
+        this.itemFilterToApprove = itemFilterToApprove;
+    }
+
+    public LogicalStatement getItemFilterToIgnore() {
+        return itemFilterToIgnore;
+    }
+
+    public void setItemFilterToIgnore(LogicalStatement itemFilterToIgnore) {
+        this.itemFilterToIgnore = itemFilterToIgnore;
+    }
+
+    public LogicalStatement getItemFilterToReject() {
+        return itemFilterToReject;
+    }
+
+    public void setItemFilterToReject(LogicalStatement itemFilterToReject) {
+        this.itemFilterToReject = itemFilterToReject;
+    }
+}
+
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QASource.java b/dspace-api/src/main/java/org/dspace/qaevent/QASource.java
new file mode 100644
index 0000000000..10849b47fc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QASource.java
@@ -0,0 +1,67 @@
+/**
+ * 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.qaevent;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * This model class represent the source/provider of the QA events (as Openaire).
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4Science)
+ *
+ */
+public class QASource {
+
+    /**
+     * The focus attributes specify if the QASource object is describing the status of a specific
+     * quality assurance source for the whole repository (focus = null) or for a specific
+     * DSpaceObject (focus = uuid of the DSpaceObject). This would mostly affect the totalEvents attribute below.
+     */
+    private UUID focus;
+    private String name;
+    private Date lastEvent;
+    private long totalEvents;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public long getTotalEvents() {
+        return totalEvents;
+    }
+
+    public void setTotalEvents(long totalEvents) {
+        this.totalEvents = totalEvents;
+    }
+
+    public Date getLastEvent() {
+        return lastEvent;
+    }
+
+    public void setLastEvent(Date lastEvent) {
+        this.lastEvent = lastEvent;
+    }
+
+    public UUID getFocus() {
+        return focus;
+    }
+
+    public void setFocus(UUID focus) {
+        this.focus = focus;
+    }
+
+    @Override
+    public String toString() {
+        return name + focus + totalEvents;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QATopic.java b/dspace-api/src/main/java/org/dspace/qaevent/QATopic.java
new file mode 100644
index 0000000000..92fe3737f4
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QATopic.java
@@ -0,0 +1,73 @@
+/**
+ * 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.qaevent;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * This model class represent the quality assurance broker topic concept. A
+ * topic represents a type of event and is therefore used to group events.
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class QATopic {
+
+    /**
+     * The focus attributes specify if the QATopic object is describing the status of a specific
+     * quality assurance topic for the whole repository (focus = null) or for a specific
+     * DSpaceObject (focus = uuid of the DSpaceObject). This would mostly affect the totalEvents attribute below.
+     */
+    private UUID focus;
+    private String key;
+    /**
+     * The source attributes contains the name of the QA source like: OpenAIRE, DSpaceUsers
+     */
+    private String source;
+    private Date lastEvent;
+    private long totalEvents;
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public void setFocus(UUID focus) {
+        this.focus = focus;
+    }
+
+    public UUID getFocus() {
+        return focus;
+    }
+
+    public long getTotalEvents() {
+        return totalEvents;
+    }
+
+    public void setTotalEvents(long totalEvents) {
+        this.totalEvents = totalEvents;
+    }
+
+    public Date getLastEvent() {
+        return lastEvent;
+    }
+
+    public void setLastEvent(Date lastEvent) {
+        this.lastEvent = lastEvent;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/QualityAssuranceAction.java b/dspace-api/src/main/java/org/dspace/qaevent/QualityAssuranceAction.java
new file mode 100644
index 0000000000..f2aebba799
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/QualityAssuranceAction.java
@@ -0,0 +1,31 @@
+/**
+ * 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.qaevent;
+
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+
+/**
+ * Interface for classes that perform a correction on the given item.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public interface QualityAssuranceAction {
+
+    /**
+     * Perform a correction on the given item.
+     *
+     * @param context     the DSpace context
+     * @param item        the item to correct
+     * @param relatedItem the related item, if any
+     * @param message     the message with the correction details
+     */
+    public void applyCorrection(Context context, Item item, Item relatedItem, QAMessageDTO message);
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/AMetadataMapAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/AMetadataMapAction.java
new file mode 100644
index 0000000000..ee81988f63
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/AMetadataMapAction.java
@@ -0,0 +1,82 @@
+/**
+ * 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.qaevent.action;
+
+import java.sql.SQLException;
+import java.util.Map;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link QualityAssuranceAction} that add a specific metadata on the given
+ * item based on the child class implementation.
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public abstract class AMetadataMapAction implements QualityAssuranceAction {
+    public static final String DEFAULT = "default";
+
+    private Map<String, String> types;
+    @Autowired
+    private ItemService itemService;
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    public Map<String, String> getTypes() {
+        return types;
+    }
+
+    public void setTypes(Map<String, String> types) {
+        this.types = types;
+    }
+
+    public abstract String extractMetadataType(QAMessageDTO message);
+    public abstract String extractMetadataValue(QAMessageDTO message);
+
+    /**
+     * Apply the correction on one metadata field of the given item based on the
+     * openaire message type.
+     */
+    @Override
+    public void applyCorrection(Context context, Item item, Item relatedItem, QAMessageDTO message) {
+
+        try {
+            String targetMetadata = types.get(extractMetadataType(message));
+            if (targetMetadata == null) {
+                targetMetadata = types.get(DEFAULT);
+            }
+            String[] metadata = splitMetadata(targetMetadata);
+            itemService.addMetadata(context, item, metadata[0], metadata[1], metadata[2], null,
+                extractMetadataValue(message));
+            itemService.update(context, item);
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public String[] splitMetadata(String metadata) {
+        String[] result = new String[3];
+        String[] split = metadata.split("\\.");
+        result[0] = split[0];
+        result[1] = split[1];
+        if (split.length == 3) {
+            result[2] = split[2];
+        }
+        return result;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/ASimpleMetadataAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/ASimpleMetadataAction.java
new file mode 100644
index 0000000000..3acaa726e0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/ASimpleMetadataAction.java
@@ -0,0 +1,65 @@
+/**
+ * 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.qaevent.action;
+
+import java.sql.SQLException;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Abstract class for Simple metadata action.
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public abstract class ASimpleMetadataAction implements QualityAssuranceAction {
+    private String metadata;
+    private String metadataSchema;
+    private String metadataElement;
+    private String metadataQualifier;
+    @Autowired
+    private ItemService itemService;
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    public String getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(String metadata) {
+        this.metadata = metadata;
+        String[] split = metadata.split("\\.");
+        this.metadataSchema = split[0];
+        this.metadataElement = split[1];
+        if (split.length == 3) {
+            this.metadataQualifier = split[2];
+        }
+    }
+
+    public abstract String extractMetadataValue(QAMessageDTO message);
+
+    @Override
+    public void applyCorrection(Context context, Item item, Item relatedItem, QAMessageDTO message) {
+        try {
+            String metadataValue = extractMetadataValue(message);
+            itemService.addMetadata(context, item, metadataSchema, metadataElement, metadataQualifier, null,
+                metadataValue);
+            itemService.update(context, item);
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QAEntityOpenaireMetadataAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QAEntityOpenaireMetadataAction.java
new file mode 100644
index 0000000000..f244418dd0
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QAEntityOpenaireMetadataAction.java
@@ -0,0 +1,180 @@
+/**
+ * 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.qaevent.action;
+
+import java.sql.SQLException;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.RelationshipType;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.EntityTypeService;
+import org.dspace.content.service.InstallItemService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.RelationshipService;
+import org.dspace.content.service.RelationshipTypeService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.OpenaireMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link QualityAssuranceAction} that handle the relationship between the
+ * item to correct and a related item.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEntityOpenaireMetadataAction implements QualityAssuranceAction {
+    private String relation;
+    private String entityType;
+    private Map<String, String> entityMetadata;
+
+    @Autowired
+    private InstallItemService installItemService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private EntityTypeService entityTypeService;
+
+    @Autowired
+    private RelationshipService relationshipService;
+
+    @Autowired
+    private RelationshipTypeService relationshipTypeService;
+
+    @Autowired
+    private WorkspaceItemService workspaceItemService;
+
+    @Autowired
+    private CollectionService collectionService;
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    public String getRelation() {
+        return relation;
+    }
+
+    public void setRelation(String relation) {
+        this.relation = relation;
+    }
+
+    public String[] splitMetadata(String metadata) {
+        String[] result = new String[3];
+        String[] split = metadata.split("\\.");
+        result[0] = split[0];
+        result[1] = split[1];
+        if (split.length == 3) {
+            result[2] = split[2];
+        }
+        return result;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public void setEntityType(String entityType) {
+        this.entityType = entityType;
+    }
+
+    public Map<String, String> getEntityMetadata() {
+        return entityMetadata;
+    }
+
+    public void setEntityMetadata(Map<String, String> entityMetadata) {
+        this.entityMetadata = entityMetadata;
+    }
+
+    @Override
+    public void applyCorrection(Context context, Item item, Item relatedItem, QAMessageDTO message) {
+        try {
+            if (relatedItem != null) {
+                link(context, item, relatedItem);
+            } else {
+
+                Collection collection = collectionService.retrieveCollectionWithSubmitByEntityType(context,
+                    item, entityType);
+                if (collection == null) {
+                    throw new IllegalStateException("No collection found by entity type: " + collection);
+                }
+
+                WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, true);
+                relatedItem = workspaceItem.getItem();
+
+                for (String key : entityMetadata.keySet()) {
+                    String value = getValue(message, key);
+                    if (StringUtils.isNotBlank(value)) {
+                        String[] targetMetadata = splitMetadata(entityMetadata.get(key));
+                        itemService.addMetadata(context, relatedItem, targetMetadata[0], targetMetadata[1],
+                                targetMetadata[2], null, value);
+                    }
+                }
+                installItemService.installItem(context, workspaceItem);
+                itemService.update(context, relatedItem);
+                link(context, item, relatedItem);
+            }
+        } catch (SQLException | AuthorizeException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Create a new relationship between the two given item, based on the configured
+     * relation.
+     */
+    private void link(Context context, Item item, Item relatedItem) throws SQLException, AuthorizeException {
+        EntityType project = entityTypeService.findByEntityType(context, entityType);
+        RelationshipType relType = relationshipTypeService.findByEntityType(context, project).stream()
+                .filter(r -> StringUtils.equals(r.getRightwardType(), relation)).findFirst()
+                .orElseThrow(() -> new IllegalStateException("No relationshipType named " + relation
+                        + " was found for the entity type " + entityType
+                        + ". A proper configuration is required to use the QAEntitiyMetadataAction."
+                        + " If you don't manage funding in your repository please skip this topic in"
+                        + " the qaevents.cfg"));
+        // Create the relationship
+        relationshipService.create(context, item, relatedItem, relType, -1, -1);
+    }
+
+    private String getValue(QAMessageDTO message, String key) {
+        if (!(message instanceof OpenaireMessageDTO)) {
+            return null;
+        }
+
+        OpenaireMessageDTO openaireMessage = (OpenaireMessageDTO) message;
+
+        if (StringUtils.equals(key, "acronym")) {
+            return openaireMessage.getAcronym();
+        } else if (StringUtils.equals(key, "code")) {
+            return openaireMessage.getCode();
+        } else if (StringUtils.equals(key, "funder")) {
+            return openaireMessage.getFunder();
+        } else if (StringUtils.equals(key, "fundingProgram")) {
+            return openaireMessage.getFundingProgram();
+        } else if (StringUtils.equals(key, "jurisdiction")) {
+            return openaireMessage.getJurisdiction();
+        } else if (StringUtils.equals(key, "openaireId")) {
+            return openaireMessage.getOpenaireId();
+        } else if (StringUtils.equals(key, "title")) {
+            return openaireMessage.getTitle();
+        }
+
+        return null;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QANotifyMetadataMapAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QANotifyMetadataMapAction.java
new file mode 100644
index 0000000000..a85a386550
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QANotifyMetadataMapAction.java
@@ -0,0 +1,31 @@
+/**
+ * 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.qaevent.action;
+
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+
+/**
+ * Notify Implementation {@link AMetadataMapAction}
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class QANotifyMetadataMapAction extends AMetadataMapAction {
+
+    @Override
+    public String extractMetadataType(QAMessageDTO message) {
+        return ((NotifyMessageDTO)message).getRelationship();
+    }
+
+    @Override
+    public String extractMetadataValue(QAMessageDTO message) {
+        return ((NotifyMessageDTO)message).getHref();
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QANotifySimpleMetadataAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QANotifySimpleMetadataAction.java
new file mode 100644
index 0000000000..ffb70fce66
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QANotifySimpleMetadataAction.java
@@ -0,0 +1,26 @@
+/**
+ * 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.qaevent.action;
+
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+
+/**
+ * Implementation of {@link QualityAssuranceAction} that add a simple metadata to the given
+ * item.
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class QANotifySimpleMetadataAction extends ASimpleMetadataAction {
+
+    public String extractMetadataValue(QAMessageDTO message) {
+        return ((NotifyMessageDTO) message).getHref();
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QAOpenaireMetadataMapAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QAOpenaireMetadataMapAction.java
new file mode 100644
index 0000000000..427ad2bfde
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QAOpenaireMetadataMapAction.java
@@ -0,0 +1,31 @@
+/**
+ * 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.qaevent.action;
+
+import org.dspace.qaevent.service.dto.OpenaireMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+
+/**
+ * Openaire Implementation {@link AMetadataMapAction}
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class QAOpenaireMetadataMapAction extends AMetadataMapAction {
+
+    @Override
+    public String extractMetadataType(QAMessageDTO message) {
+        return ((OpenaireMessageDTO)message).getType();
+    }
+
+    @Override
+    public String extractMetadataValue(QAMessageDTO message) {
+        return ((OpenaireMessageDTO)message).getValue();
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QAOpenaireSimpleMetadataAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QAOpenaireSimpleMetadataAction.java
new file mode 100644
index 0000000000..3baa95eced
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QAOpenaireSimpleMetadataAction.java
@@ -0,0 +1,26 @@
+/**
+ * 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.qaevent.action;
+
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.OpenaireMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+
+/**
+ * Implementation of {@link QualityAssuranceAction} that add a simple metadata to the given
+ * item.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAOpenaireSimpleMetadataAction extends ASimpleMetadataAction {
+
+    public String extractMetadataValue(QAMessageDTO message) {
+        return ((OpenaireMessageDTO) message).getAbstracts();
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QAReinstateRequestAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QAReinstateRequestAction.java
new file mode 100644
index 0000000000..7fa08dc6ec
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QAReinstateRequestAction.java
@@ -0,0 +1,44 @@
+/**
+ * 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.qaevent.action;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * QAReinstateRequestAction is an implementation of the QualityAssuranceAction interface.
+ * It is responsible for applying a correction to reinstate a specified item.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class QAReinstateRequestAction implements QualityAssuranceAction {
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public void applyCorrection(Context context, Item item, Item relatedItem, QAMessageDTO message) {
+        try {
+            itemService.reinstate(context, item);
+        } catch (SQLException | AuthorizeException e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/action/QAWithdrawnRequestAction.java b/dspace-api/src/main/java/org/dspace/qaevent/action/QAWithdrawnRequestAction.java
new file mode 100644
index 0000000000..a0463fdb18
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/action/QAWithdrawnRequestAction.java
@@ -0,0 +1,44 @@
+/**
+ * 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.qaevent.action;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * QAWithdrawnRequestAction is an implementation of the QualityAssuranceAction interface.
+ * It is responsible for applying a correction to withdraw a specified item.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class QAWithdrawnRequestAction implements QualityAssuranceAction {
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public void applyCorrection(Context context, Item item, Item relatedItem, QAMessageDTO message) {
+        try {
+            itemService.withdraw(context, item);
+        } catch (SQLException | AuthorizeException e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/dao/QAEventsDAO.java b/dspace-api/src/main/java/org/dspace/qaevent/dao/QAEventsDAO.java
new file mode 100644
index 0000000000..98c38ca3f5
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/dao/QAEventsDAO.java
@@ -0,0 +1,92 @@
+/**
+ * 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.qaevent.dao;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.content.Item;
+import org.dspace.content.QAEventProcessed;
+import org.dspace.core.Context;
+import org.dspace.core.GenericDAO;
+import org.dspace.eperson.EPerson;
+
+/**
+ * DAO that handle processed QA Events.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public interface QAEventsDAO extends GenericDAO<QAEventProcessed> {
+
+    /**
+     * Returns all the stored QAEventProcessed entities.
+     *
+     * @param  context      the DSpace context
+     * @return              the found entities
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<QAEventProcessed> findAll(Context context) throws SQLException;
+
+    /**
+     * Returns the stored QAEventProcessed entities by item.
+     *
+     * @param  context      the DSpace context
+     * @param  item         the item to search for
+     * @return              the found entities
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<QAEventProcessed> findByItem(Context context, Item item) throws SQLException;
+
+    /**
+     * Returns the stored QAEventProcessed entities by eperson.
+     *
+     * @param  context      the DSpace context
+     * @param  ePerson      the ePerson to search for
+     * @return              the found entities
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<QAEventProcessed> findByEPerson(Context context, EPerson ePerson) throws SQLException;
+
+    /**
+     * Search a page of quality assurance broker events by notification ID.
+     * 
+     * @param  context      the DSpace context
+     * @param  eventId      the event id
+     * @param  start        the start index
+     * @param  size         the size to be applied
+     * @return              the processed events
+     * @throws SQLException if an SQL error occurs
+     */
+    public List<QAEventProcessed> searchByEventId(Context context, String eventId, Integer start, Integer size)
+        throws SQLException;
+
+    /**
+     * Check if an event with the given checksum is already stored.
+     * 
+     * @param  context      the DSpace context
+     * @param  checksum     the checksum to search for
+     * @return              true if the given checksum is related to an already
+     *                      stored event, false otherwise
+     * @throws SQLException if an SQL error occurs
+     */
+    public boolean isEventStored(Context context, String checksum) throws SQLException;
+
+    /**
+     * Store an event related to the given checksum.
+     *
+     * @param  context  the DSpace context
+     * @param  checksum the checksum of the event to be store
+     * @param  eperson  the eperson who handle the event
+     * @param  item     the item related to the event
+     * @return          true if the creation is completed with success, false
+     *                  otherwise
+     */
+    boolean storeEvent(Context context, String checksum, EPerson eperson, Item item);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/dao/impl/QAEventsDAOImpl.java b/dspace-api/src/main/java/org/dspace/qaevent/dao/impl/QAEventsDAOImpl.java
new file mode 100644
index 0000000000..2dbc476920
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/dao/impl/QAEventsDAOImpl.java
@@ -0,0 +1,90 @@
+/**
+ * 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.qaevent.dao.impl;
+
+import java.sql.SQLException;
+import java.util.Date;
+import java.util.List;
+
+import jakarta.persistence.Query;
+import org.dspace.content.Item;
+import org.dspace.content.QAEventProcessed;
+import org.dspace.core.AbstractHibernateDAO;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.qaevent.dao.QAEventsDAO;
+
+/**
+ * Implementation of {@link QAEventsDAO} that store processed events using an
+ * SQL DBMS.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEventsDAOImpl extends AbstractHibernateDAO<QAEventProcessed> implements QAEventsDAO {
+
+    @Override
+    public List<QAEventProcessed> findAll(Context context) throws SQLException {
+        return findAll(context, QAEventProcessed.class);
+    }
+
+    @Override
+    public boolean storeEvent(Context context, String checksum, EPerson eperson, Item item) {
+        QAEventProcessed qaEvent = new QAEventProcessed();
+        qaEvent.setEperson(eperson);
+        qaEvent.setEventId(checksum);
+        qaEvent.setItem(item);
+        qaEvent.setEventTimestamp(new Date());
+        try {
+            create(context, qaEvent);
+            return true;
+        } catch (SQLException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean isEventStored(Context context, String checksum) throws SQLException {
+        Query query = createQuery(context,
+                "SELECT count(eventId) FROM QAEventProcessed qaevent WHERE qaevent.eventId = :event_id ");
+        query.setParameter("event_id", checksum);
+        return count(query) != 0;
+    }
+
+    @Override
+    public List<QAEventProcessed> searchByEventId(Context context, String eventId, Integer start, Integer size)
+            throws SQLException {
+        Query query = createQuery(context,
+                "SELECT * FROM QAEventProcessed qaevent WHERE qaevent.qaevent_id = :event_id ");
+        query.setFirstResult(start);
+        query.setMaxResults(size);
+        query.setParameter("event_id", eventId);
+        return findMany(context, query);
+    }
+
+    @Override
+    public List<QAEventProcessed> findByItem(Context context, Item item) throws SQLException {
+        Query query = createQuery(context, ""
+            + " SELECT qaevent "
+            + " FROM QAEventProcessed qaevent "
+            + " WHERE qaevent.item = :item ");
+        query.setParameter("item", item);
+        return findMany(context, query);
+    }
+
+    @Override
+    public List<QAEventProcessed> findByEPerson(Context context, EPerson ePerson) throws SQLException {
+        Query query = createQuery(context, ""
+            + " SELECT qaevent "
+            + " FROM QAEventProcessed qaevent "
+            + " WHERE qaevent.eperson = :eperson ");
+        query.setParameter("eperson", ePerson);
+        return findMany(context, query);
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java
new file mode 100644
index 0000000000..48f83d413d
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImport.java
@@ -0,0 +1,355 @@
+/**
+ * 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.qaevent.script;
+
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+import static org.apache.commons.lang3.StringUtils.substringAfter;
+import static org.dspace.core.Constants.ITEM;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import eu.dnetlib.broker.BrokerClient;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.dspace.content.DSpaceObject;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.factory.EPersonServiceFactory;
+import org.dspace.handle.HandleServiceImpl;
+import org.dspace.handle.service.HandleService;
+import org.dspace.qaevent.service.OpenaireClientFactory;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.scripts.DSpaceRunnable;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+
+/**
+ * Implementation of {@link DSpaceRunnable} to perform a QAEvents import from a
+ * json file. The JSON file contains an array of JSON Events, where each event
+ * has the following structure. The message attribute follows the structure
+ * documented at
+ * @see <a href="https://graph.openaire.eu/docs/category/entities" target="_blank"> see </a>
+ * 
+ * <code> <br/>
+ * { <br/>
+ * "originalId": "oai:www.openstarts.units.it:10077/21838",<br/>
+ * "title": "Egypt, crossroad of translations and literary interweavings", <br/>
+ * "topic": "ENRICH/MORE/PROJECT", <br/>
+ * "trust": 1.0, <br/>
+ * "message": { <br/>
+ * "projects[0].acronym": "PAThs", <br/>
+ * "projects[0].code": "687567", <br/>
+ * "projects[0].funder": "EC",<br/>
+ * "projects[0].fundingProgram": "H2020", <br/>
+ * "projects[0].jurisdiction": "EU",<br/>
+ * "projects[0].openaireId": "40|corda__h2020::6e32f5eb912688f2424c68b851483ea4", <br/>
+ * "projects[0].title": "Tracking Papyrus and Parchment Paths" <br/>
+ * } <br/>
+ * }
+ * </code>
+ * 
+ * @author Alessandro Martelli (alessandro.martelli at 4science.it)
+ * @author Luca Giamminonni (luca.giamminonni at 4Science.it)
+ *
+ */
+public class OpenaireEventsImport
+    extends DSpaceRunnable<OpenaireEventsImportScriptConfiguration<OpenaireEventsImport>> {
+
+    private HandleService handleService;
+
+    private QAEventService qaEventService;
+
+    private String[] topicsToImport;
+
+    private ConfigurationService configurationService;
+
+    private BrokerClient brokerClient;
+
+    private ObjectMapper jsonMapper;
+
+    private URL openaireBrokerURL;
+
+    private String fileLocation;
+
+    private String email;
+
+    private Context context;
+
+    @Override
+    @SuppressWarnings({ "rawtypes" })
+    public OpenaireEventsImportScriptConfiguration getScriptConfiguration() {
+        OpenaireEventsImportScriptConfiguration configuration = new DSpace().getServiceManager()
+                .getServiceByName("import-openaire-events", OpenaireEventsImportScriptConfiguration.class);
+        return configuration;
+    }
+
+    @Override
+    public void setup() throws ParseException {
+
+        jsonMapper = new JsonMapper();
+        jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+        DSpace dspace = new DSpace();
+        handleService = dspace.getSingletonService(HandleServiceImpl.class);
+        qaEventService = dspace.getSingletonService(QAEventService.class);
+        configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        brokerClient = OpenaireClientFactory.getInstance().getBrokerClient();
+
+        topicsToImport = configurationService.getArrayProperty("qaevents.openaire.import.topic");
+        openaireBrokerURL = getOpenaireBrokerUri();
+
+        fileLocation = commandLine.getOptionValue("f");
+        email = commandLine.getOptionValue("e");
+
+    }
+
+    @Override
+    public void internalRun() throws Exception {
+
+        if (StringUtils.isAllBlank(fileLocation, email)) {
+            throw new IllegalArgumentException("One parameter between the location of the file and the email "
+                + "must be entered to proceed with the import.");
+        }
+
+        if (StringUtils.isNoneBlank(fileLocation, email)) {
+            throw new IllegalArgumentException("Only one parameter between the location of the file and the email "
+                + "must be entered to proceed with the import.");
+        }
+
+        context = new Context();
+        assignCurrentUserInContext();
+
+        try {
+            importOpenaireEvents();
+        } catch (Exception ex) {
+            handler.logError("A not recoverable error occurs during OPENAIRE events import: " + getMessage(ex), ex);
+            throw ex;
+        }
+
+    }
+
+    /**
+     * Read the OPENAIRE events from the given JSON file or directly from the
+     * OPENAIRE broker and try to store them.
+     */
+    private void importOpenaireEvents() throws Exception {
+
+        if (StringUtils.isNotBlank(fileLocation)) {
+            handler.logInfo("Trying to read the QA events from the provided file");
+            importOpenaireEventsFromFile();
+        } else {
+            handler.logInfo("Trying to read the QA events from the OPENAIRE broker");
+            importOpenaireEventsFromBroker();
+        }
+
+    }
+
+    /**
+     * Read the OPENAIRE events from the given file location and try to store them.
+     */
+    private void importOpenaireEventsFromFile() throws Exception {
+
+        InputStream eventsFileInputStream = getQAEventsFileInputStream();
+        List<QAEvent> qaEvents = readOpenaireQAEventsFromJson(eventsFileInputStream);
+
+        handler.logInfo("Found " + qaEvents.size() + " events in the given file");
+
+        storeOpenaireQAEvents(qaEvents);
+
+    }
+
+    /**
+     * Import the OPENAIRE events from the Broker using the subscription related to
+     * the given email and try to store them.
+     */
+    private void importOpenaireEventsFromBroker() {
+
+        List<String> subscriptionIds = listEmailSubscriptions();
+
+        handler.logInfo("Found " + subscriptionIds.size() + " subscriptions related to the given email");
+
+        for (String subscriptionId : subscriptionIds) {
+
+            List<QAEvent> events = readOpenaireQAEventsFromBroker(subscriptionId);
+
+            handler.logInfo("Found " + events.size() + " events from the subscription " + subscriptionId);
+
+            storeOpenaireQAEvents(events);
+
+        }
+    }
+
+    /**
+     * Obtain an InputStream from the runnable instance.
+     */
+    private InputStream getQAEventsFileInputStream() throws Exception {
+        return handler.getFileStream(context, fileLocation)
+            .orElseThrow(() -> new IllegalArgumentException("Error reading file, the file couldn't be "
+                + "found for filename: " + fileLocation));
+    }
+
+    /**
+     * Read all the QAEvent from the OPENAIRE Broker related to the subscription
+     * with the given id.
+     */
+    private List<QAEvent> readOpenaireQAEventsFromBroker(String subscriptionId) {
+
+        try {
+            InputStream eventsInputStream = getEventsBySubscriptions(subscriptionId);
+            return readOpenaireQAEventsFromJson(eventsInputStream);
+        } catch (Exception ex) {
+            handler.logError("An error occurs downloading the events related to the subscription "
+                + subscriptionId + ": " + getMessage(ex), ex);
+        }
+
+        return List.of();
+
+    }
+
+    /**
+     * Read all the QAEvent present in the given input stream.
+     *
+     * @return the QA events to be imported
+     */
+    private List<QAEvent> readOpenaireQAEventsFromJson(InputStream inputStream) throws Exception {
+        return jsonMapper.readValue(inputStream, new TypeReference<List<QAEvent>>() {
+        });
+    }
+
+    /**
+     * Store the given QAEvents.
+     *
+     * @param events the event to be stored
+     */
+    private void storeOpenaireQAEvents(List<QAEvent> events) {
+        for (QAEvent event : events) {
+            try {
+                final String resourceUUID = getResourceUUID(context, event.getOriginalId());
+                if (resourceUUID == null) {
+                    throw new IllegalArgumentException("Skipped event " + event.getEventId() +
+                        " related to the oai record " + event.getOriginalId() + " as the record was not found");
+                }
+                event.setTarget(resourceUUID);
+                storeOpenaireQAEvent(event);
+            } catch (RuntimeException | SQLException e) {
+                handler.logWarning("An error occurs storing the event with id "
+                    + event.getEventId() + ": " + getMessage(e));
+            }
+        }
+    }
+
+    private String getResourceUUID(Context context, String originalId) throws IllegalStateException, SQLException {
+        String id = getHandleFromOriginalId(originalId);
+        if (StringUtils.isNotBlank(id)) {
+            DSpaceObject dso = handleService.resolveToObject(context, id);
+            if (dso != null && dso.getType() == ITEM) {
+                Item item = (Item) dso;
+                final String itemUuid = item.getID().toString();
+                context.uncacheEntity(item);
+                return itemUuid;
+            } else {
+                return null;
+            }
+        } else {
+            throw new IllegalArgumentException("Malformed originalId " + originalId);
+        }
+    }
+
+    // oai:www.openstarts.units.it:10077/21486
+    private String getHandleFromOriginalId(String originalId) {
+        int startPosition = originalId.lastIndexOf(':');
+        if (startPosition != -1) {
+            return originalId.substring(startPosition + 1, originalId.length());
+        } else {
+            return originalId;
+        }
+    }
+
+    /**
+     * Store the given QAEvent, skipping it if it is not supported.
+     *
+     * @param event the event to be stored
+     */
+    private void storeOpenaireQAEvent(QAEvent event) {
+
+        if (!StringUtils.equalsAny(event.getTopic(), topicsToImport)) {
+            handler.logWarning("Event for topic " + event.getTopic() + " is not allowed in the qaevents.cfg");
+            return;
+        }
+
+        event.setSource(QAEvent.OPENAIRE_SOURCE);
+
+        qaEventService.store(context, event);
+
+    }
+
+    /**
+     * Download the events related to the given subscription from the OPENAIRE broker.
+     *
+     * @param subscriptionId the subscription id
+     * @return an input stream from which to read the events in json format
+     */
+    private InputStream getEventsBySubscriptions(String subscriptionId) throws Exception {
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        brokerClient.downloadEvents(openaireBrokerURL, subscriptionId, outputStream);
+        return new ByteArrayInputStream(outputStream.toByteArray());
+    }
+
+    /**
+     * Takes all the subscription related to the given email from the OPENAIRE
+     * broker.
+     */
+    private List<String> listEmailSubscriptions() {
+        try {
+            return brokerClient.listSubscriptions(openaireBrokerURL, email);
+        } catch (Exception ex) {
+            throw new IllegalArgumentException("An error occurs retrieving the subscriptions "
+                + "from the OPENAIRE broker: " + getMessage(ex), ex);
+        }
+    }
+
+    private URL getOpenaireBrokerUri() {
+        try {
+            return new URL(configurationService.getProperty("qaevents.openaire.broker-url", "http://api.openaire.eu/broker"));
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException("The configured OPENAIRE broker URL is not valid.", e);
+        }
+    }
+
+    /**
+     * Get the root exception message from the given exception.
+     */
+    private String getMessage(Exception ex) {
+        String message = ExceptionUtils.getRootCauseMessage(ex);
+        // Remove the Exception name from the message
+        return isNotBlank(message) ? substringAfter(message, ":").trim() : "";
+    }
+
+    private void assignCurrentUserInContext() throws SQLException {
+        UUID uuid = getEpersonIdentifier();
+        if (uuid != null) {
+            EPerson ePerson = EPersonServiceFactory.getInstance().getEPersonService().find(context, uuid);
+            context.setCurrentUser(ePerson);
+        }
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportCli.java b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportCli.java
new file mode 100644
index 0000000000..d98b578cdd
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportCli.java
@@ -0,0 +1,42 @@
+/**
+ * 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.qaevent.script;
+
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.ParseException;
+import org.dspace.utils.DSpace;
+
+/**
+ * Extensions of {@link OpenaireEventsImport} to run the script on console.
+ *
+ * @author Alessandro Martelli (alessandro.martelli at 4science.it)
+ *
+ */
+public class OpenaireEventsImportCli extends OpenaireEventsImport {
+
+    @Override
+    @SuppressWarnings({ "rawtypes" })
+    public OpenaireEventsImportCliScriptConfiguration getScriptConfiguration() {
+        return new DSpace().getServiceManager()
+            .getServiceByName("import-openaire-events", OpenaireEventsImportCliScriptConfiguration.class);
+    }
+
+    @Override
+    public void setup() throws ParseException {
+        super.setup();
+
+        // in case of CLI we show the help prompt
+        if (commandLine.hasOption('h')) {
+            HelpFormatter formatter = new HelpFormatter();
+            formatter.printHelp("Import Notification event json file", getScriptConfiguration().getOptions());
+            System.exit(0);
+        }
+
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportCliScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportCliScriptConfiguration.java
new file mode 100644
index 0000000000..5be0453a17
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportCliScriptConfiguration.java
@@ -0,0 +1,31 @@
+/**
+ * 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.qaevent.script;
+
+import org.apache.commons.cli.Options;
+
+/**
+ * Extension of {@link OpenaireEventsImportScriptConfiguration} to run the script on
+ * console.
+ *
+ * @author Alessandro Martelli (alessandro.martelli at 4science.it)
+ *
+ */
+public class OpenaireEventsImportCliScriptConfiguration<T extends OpenaireEventsImport>
+    extends OpenaireEventsImportScriptConfiguration<T> {
+
+    @Override
+    public Options getOptions() {
+        Options options = super.getOptions();
+        options.addOption("h", "help", false, "help");
+        options.getOption("h").setType(boolean.class);
+        super.options = options;
+        return options;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportScriptConfiguration.java
new file mode 100644
index 0000000000..63dcfae740
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/script/OpenaireEventsImportScriptConfiguration.java
@@ -0,0 +1,72 @@
+/**
+ * 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.qaevent.script;
+
+import java.io.InputStream;
+
+import org.apache.commons.cli.Options;
+import org.dspace.scripts.configuration.ScriptConfiguration;
+
+/**
+ * Extension of {@link ScriptConfiguration} to perform a QAEvents import from
+ * file.
+ *
+ * @author Alessandro Martelli (alessandro.martelli at 4science.it)
+ *
+ */
+public class OpenaireEventsImportScriptConfiguration<T extends OpenaireEventsImport> extends ScriptConfiguration<T> {
+
+    /*
+    private AuthorizeService authorizeService;
+     */
+    private Class<T> dspaceRunnableClass;
+
+    @Override
+    public Class<T> getDspaceRunnableClass() {
+        return dspaceRunnableClass;
+    }
+
+    /**
+     * Generic setter for the dspaceRunnableClass
+     * @param dspaceRunnableClass   The dspaceRunnableClass to be set on this OpenaireEventsImportScriptConfiguration
+     */
+    @Override
+    public void setDspaceRunnableClass(Class<T> dspaceRunnableClass) {
+        this.dspaceRunnableClass = dspaceRunnableClass;
+    }
+/*
+    @Override
+    public boolean isAllowedToExecute(Context context) {
+        try {
+            return authorizeService.isAdmin(context);
+        } catch (SQLException e) {
+            throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
+        }
+    }
+*/
+    @Override
+    public Options getOptions() {
+        if (options == null) {
+            Options options = new Options();
+
+            options.addOption("f", "file", true, "Import data from Openaire quality assurance broker JSON file."
+                + " This parameter is mutually exclusive to the email parameter.");
+            options.getOption("f").setType(InputStream.class);
+            options.getOption("f").setRequired(false);
+
+            options.addOption("e", "email", true, "Email related to the subscriptions to import data from Openaire "
+                + "broker. This parameter is mutually exclusive to the file parameter.");
+            options.getOption("e").setType(String.class);
+            options.getOption("e").setRequired(false);
+
+            super.options = options;
+        }
+        return options;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/security/AdministratorsOnlyQASecurity.java b/dspace-api/src/main/java/org/dspace/qaevent/security/AdministratorsOnlyQASecurity.java
new file mode 100644
index 0000000000..38cf40ce39
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/security/AdministratorsOnlyQASecurity.java
@@ -0,0 +1,51 @@
+/**
+ * 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.qaevent.security;
+
+import java.sql.SQLException;
+import java.util.Optional;
+
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * QASecurity that restrict access to the QA Source and related events only to repository administrators
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.com)
+ */
+public class AdministratorsOnlyQASecurity implements QASecurity {
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    public Optional<String> generateFilterQuery(Context context, EPerson currentUser) {
+        return Optional.empty();
+    }
+
+    @Override
+    public boolean canSeeQASource(Context context, EPerson user) {
+        try {
+            return authorizeService.isAdmin(context, user);
+        } catch (SQLException e) {
+            return false;
+        }
+    }
+
+    @Override
+    public boolean canSeeQAEvent(Context context, EPerson user, QAEvent qaEvent) {
+        try {
+            return authorizeService.isAdmin(context, user);
+        } catch (SQLException e) {
+            return false;
+        }
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/security/QASecurity.java b/dspace-api/src/main/java/org/dspace/qaevent/security/QASecurity.java
new file mode 100644
index 0000000000..44b00e7d94
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/security/QASecurity.java
@@ -0,0 +1,55 @@
+/**
+ * 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.qaevent.security;
+
+import java.util.Optional;
+
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+
+/**
+ * The QASecurity interface defines methods for implementing security strategies
+ * related to Quality Assurance (QA) events. Classes implementing this interface should
+ * provide logic to filter and determine visibility of QA events based on the user's permissions.
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.com)
+ *
+ */
+public interface QASecurity {
+
+    /**
+     * Return a SOLR queries that can be applied querying the qaevent SOLR core to retrieve only the qaevents visible to
+     * the provided user
+     * 
+     * @param context the DSpace context
+     * @param user    the user to consider to restrict the visible qaevents
+     * @return        the SOLR filter query to apply
+     */
+    public Optional<String> generateFilterQuery(Context context, EPerson user);
+
+    /**
+     * Return <code>true</code> it the user is potentially allowed to see events in the qasource that adopt this
+     * security strategy
+     *
+     * @param context the DSpace context
+     * @param user the user to consider to restrict the visible qaevents
+     * @return <code>true</code> if the user can eventually see some qaevents
+     */
+    public boolean canSeeQASource(Context context, EPerson user);
+
+    /**
+     * Return <code>true</code> it the user is potentially allowed to see events in the qasource that adopt this
+     * security strategy
+     *
+     * @param context the DSpace context
+     * @param user    the user to consider to restrict the visible qaevents
+     * @return        <code>true</code> if the user can see the provided qaEvent
+     */
+    public boolean canSeeQAEvent(Context context, EPerson user, QAEvent qaEvent);
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/security/UserBasedFilterQASecurity.java b/dspace-api/src/main/java/org/dspace/qaevent/security/UserBasedFilterQASecurity.java
new file mode 100644
index 0000000000..3d66d221e6
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/security/UserBasedFilterQASecurity.java
@@ -0,0 +1,70 @@
+/**
+ * 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.qaevent.security;
+
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.Optional;
+
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * QASecurity implementations that allow access to only qa events that match a SORL query generated using the eperson
+ * uuid
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.com)
+ */
+public class UserBasedFilterQASecurity implements QASecurity {
+
+    private String filterTemplate;
+    private boolean allowAdmins = true;
+
+    @Autowired
+    private QAEventService qaEventService;
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    public Optional<String> generateFilterQuery(Context context, EPerson user) {
+        try {
+            if (allowAdmins && authorizeService.isAdmin(context, user)) {
+                return Optional.empty();
+            } else {
+                return Optional.of(MessageFormat.format(filterTemplate, user.getID().toString()));
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException("Error checking permissions", e);
+        }
+    }
+
+    public boolean canSeeQASource(Context context, EPerson user) {
+        return user != null;
+    }
+
+    public boolean canSeeQAEvent(Context context, EPerson user, QAEvent qaEvent) {
+        try {
+            return (allowAdmins && authorizeService.isAdmin(context, user))
+                    || qaEventService.qaEventsInSource(context, user, qaEvent.getEventId(), qaEvent.getSource());
+        } catch (SQLException e) {
+            throw new RuntimeException("Error checking permissions", e);
+        }
+    }
+
+    public void setFilterTemplate(String filterTemplate) {
+        this.filterTemplate = filterTemplate;
+    }
+
+    public void setAllowAdmins(boolean allowAdmins) {
+        this.allowAdmins = allowAdmins;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java b/dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java
new file mode 100644
index 0000000000..e7a7be33c1
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/OpenaireClientFactory.java
@@ -0,0 +1,31 @@
+/**
+ * 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.qaevent.service;
+
+import eu.dnetlib.broker.BrokerClient;
+import org.dspace.utils.DSpace;
+
+/**
+ * Factory for the {@link BrokerClient}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface OpenaireClientFactory {
+
+    /**
+     * Returns an instance of the {@link BrokerClient}.
+     *
+     * @return the client instance
+     */
+    public BrokerClient getBrokerClient();
+
+    public static OpenaireClientFactory getInstance() {
+        return new DSpace().getServiceManager().getServiceByName("openaireClientFactory", OpenaireClientFactory.class);
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventActionService.java b/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventActionService.java
new file mode 100644
index 0000000000..2e5690f622
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventActionService.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.qaevent.service;
+
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+
+/**
+ * Service that handle the actions that can be done related to an
+ * {@link QAEvent}.
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public interface QAEventActionService {
+
+    /**
+     * Accept the given event.
+     *
+     * @param context the DSpace context
+     * @param qaevent the event to be accepted
+     */
+    public void accept(Context context, QAEvent qaevent);
+
+    /**
+     * Discard the given event.
+     *
+     * @param context the DSpace context
+     * @param qaevent the event to be discarded
+     */
+    public void discard(Context context, QAEvent qaevent);
+
+    /**
+     * Reject the given event.
+     *
+     * @param context the DSpace context
+     * @param qaevent the event to be rejected
+     */
+    public void reject(Context context, QAEvent qaevent);
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventSecurityService.java b/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventSecurityService.java
new file mode 100644
index 0000000000..7f6ef7a12c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventSecurityService.java
@@ -0,0 +1,55 @@
+/**
+ * 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.qaevent.service;
+
+import java.util.Optional;
+
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+
+/**
+ * Interface to limit the visibility of {@link QAEvent} to specific users.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.com)
+ *
+ */
+public interface QAEventSecurityService {
+
+    /**
+     * Check if the specified user can see a specific QASource
+     * @param context     the context
+     * @param user        the eperson to consider
+     * @param sourceName  the source name
+     * @return          <code>true</code> if the specified user can eventually see events in the QASource
+     */
+    boolean canSeeSource(Context context, EPerson user, String sourceName);
+
+    /**
+     * Check if the specified user can see a specific QAEvent. It is expected that a QAEvent in a not visible QASource
+     * cannot be accessed. So implementation of this method should enforce this rule.
+     * 
+     * @param context   the context
+     * @param user      the eperson to consider
+     * @param qaEvent   the qaevent to check
+     * @return <code>true</code> if the specified user can see the specified event
+     */
+    boolean canSeeEvent(Context context, EPerson user, QAEvent qaEvent);
+
+    /**
+     * Generate a query to restrict the qa events returned by other search/find method to the only ones visible to the
+     * specified user
+     * 
+     * @param context     the context
+     * @param user        the eperson to consider
+     * @param sourceName  the source name
+     * @return the solr filter query
+     */
+    public Optional<String> generateQAEventFilterQuery(Context context, EPerson user, String sourceName);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventService.java b/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventService.java
new file mode 100644
index 0000000000..3254aecf77
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/QAEventService.java
@@ -0,0 +1,267 @@
+/**
+ * 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.qaevent.service;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.qaevent.QASource;
+import org.dspace.qaevent.QATopic;
+
+/**
+ * Service that handles {@link QAEvent}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public interface QAEventService {
+
+    /**
+     * Find all the event's topics.
+     *
+     * @param  context     the DSpace context
+     * @param  offset      the offset to apply
+     * @param  orderField  the field to order for
+     * @param  ascending   true if the order should be ascending, false otherwise
+     * @return             the topics list
+     */
+    public List<QATopic> findAllTopics(Context context, long offset, long count, String orderField, boolean ascending);
+
+    /**
+     * Find all the event's topics related to the given source.
+     *
+     * @param  context     the DSpace context
+     * @param  source      the source to search for
+     * @param  offset      the offset to apply
+     * @param  count       the page size
+     * @param  orderField  the field to order for
+     * @param  ascending   true if the order should be ascending, false otherwise
+     * @return             the topics list
+     */
+    public List<QATopic> findAllTopicsBySource(Context context, String source, long offset, long count,
+        String orderField, boolean ascending);
+
+    /**
+     * Find a specific topic by its name, source and optionally a target.
+     *
+     * @param  context the DSpace context
+     * @param  sourceName the name of the source
+     * @param  topicName  the topic name to search for
+     * @param  target     (nullable) the uuid of the target to focus on
+     * @return            the topic
+     */
+    public QATopic findTopicBySourceAndNameAndTarget(Context context, String sourceName, String topicName, UUID target);
+
+    /**
+     * Count all the event's topics.
+     *
+     * @return the count result
+     */
+    public long countTopics();
+
+    /**
+     * Count all the event's topics related to the given source.
+     *
+     * @param  context the DSpace context
+     * @param  source  the source to search for
+     * @return         the count result
+     */
+    public long countTopicsBySource(Context context, String source);
+
+    /**
+     * Find all the events by topic.
+     *
+     * @param  context    the DSpace context
+     * @param  sourceName the source name
+     * @param  topic      the topic to search for
+     * @param  offset     the offset to apply
+     * @param  size       the page size
+     * @param  orderField  the field to order for
+     * @param  ascending   true if the order should be ascending, false otherwise
+     * @return            the events
+     */
+    public List<QAEvent> findEventsByTopic(Context context, String sourceName, String topic, long offset, int size,
+                                           String orderField, boolean ascending);
+
+    /**
+     * Find all the events by topic.
+     *
+     * @param  context     the DSpace context
+     * @param  sourceName  the source name
+     * @param  topic       the topic to search for
+     * @return             the events count
+     */
+    public long countEventsByTopic(Context context, String sourceName, String topic);
+
+    /**
+     * Find an event by the given id. Please note that no security filter are applied by this method.
+     *
+     * @param  id      the id of the event to search for
+     * @return         the event
+     */
+    public QAEvent findEventByEventId(String id);
+
+    /**
+     * Store the given event.
+     *
+     * @param context the DSpace context
+     * @param event   the event to store
+     */
+    public void store(Context context, QAEvent event);
+
+    /**
+     * Delete an event by the given id.
+     *
+     * @param id      the id of the event to delete
+     */
+    public void deleteEventByEventId(String id);
+
+    /**
+     * Delete events by the given target id.
+     *
+     * @param targetId the id of the target id
+     */
+    public void deleteEventsByTargetId(UUID targetId);
+
+    /**
+     * Find a specific topid by the given id.
+     *
+     * @param  topicId the topic id to search for
+     * @return         the topic
+     */
+    public QATopic findTopicByTopicId(String topicId);
+
+    /**
+     * Find a specific source by the given name.
+     *
+     * @param  context the DSpace context
+     * @param  source  the source name
+     * @return         the source
+     */
+    public QASource findSource(Context context, String source);
+
+    /**
+     * Find a specific source by the given name including the stats focused on the target item.
+     *
+     * @param  context the DSpace context
+     * @param  source  the source name
+     * @param  target  the uuid of the item target
+     * @return         the source
+     */
+    public QASource findSource(Context context, String source, UUID target);
+
+    /**
+     * Find all the event's sources.
+     *
+     * @param  context  the DSpace context
+     * @param  offset   the offset to apply
+     * @param  pageSize the page size
+     * @return          the sources list
+     */
+    public List<QASource> findAllSources(Context context, long offset, int pageSize);
+
+    /**
+     * Count all the event's sources.
+     *
+     * @param  context the DSpace context
+     * @return         the count result
+     */
+    public long countSources(Context context);
+
+    /**
+     * Count all the event's sources related to a specific item
+     *
+     * @param  context the DSpace context
+     * @param  target  the item uuid
+     * @return         the count result
+     */
+    public long countSourcesByTarget(Context context, UUID target);
+
+    /**
+     * Count all the event's topics related to the given source referring to a specific item
+     *
+     * @param  context the DSpace context
+     * @param  target  the item uuid
+     * @param  source  the source to search for
+     * @return         the count result
+     */
+    public long countTopicsBySourceAndTarget(Context context, String source, UUID target);
+
+    /**
+     * Check if the given QA event supports a related item.
+     * 
+     * @param  qaevent the event to be verified
+     * @return         true if the event supports a related item, false otherwise.
+     */
+    public boolean isRelatedItemSupported(QAEvent qaevent);
+
+    /**
+     * Find a list of QA events according to the pagination parameters for the specified topic and target sorted by
+     * trust descending
+     *
+     * @param  context  the DSpace context
+     * @param  source   the source name
+     * @param  topic    the topic to search for
+     * @param  offset   the offset to apply
+     * @param  pageSize the page size
+     * @param  target   the uuid of the QA event's target
+     * @return          the events
+     */
+    public List<QAEvent> findEventsByTopicAndTarget(Context context, String source, String topic, UUID target,
+                                                    long offset, int pageSize);
+
+    /**
+     * Check if a qaevent with the provided id is visible to the current user according to the source security
+     *
+     * @param  context the DSpace context
+     * @param  user    the user to consider for the security check
+     * @param  eventId the id of the event to check for existence
+     * @param  source  the qa source name
+     * @return <code>true</code> if the event exists
+     */
+    public boolean qaEventsInSource(Context context, EPerson user, String eventId, String source);
+
+    /**
+     * Count the QA events related to the specified topic and target
+     *
+     * @param  context  the DSpace context
+     * @param  source   the source name
+     * @param  topic    the topic to search for
+     * @param  target   the uuid of the QA event's target
+     * @return          the count result
+     */
+    public long countEventsByTopicAndTarget(Context context, String source, String topic, UUID target);
+
+    /**
+     * Find all the event's sources related to a specific item
+     *
+     * @param  context   the DSpace context
+     * @param  target    the item referring to
+     * @param  offset    the offset to apply
+     * @param  pageSize  the page size
+     * @return           the source list
+     */
+    public List<QASource> findAllSourcesByTarget(Context context, UUID target, long offset, int pageSize);
+
+    /**
+     * Find all the event's topics related to the given source for a specific item
+     *
+     * @param  context   the DSpace context
+     * @param  source    (not null) the source to search for
+     * @param  target    the item referring to
+     * @param  offset    the offset to apply
+     * @param  pageSize  the page size
+     * @return           the topics list
+     */
+    public List<QATopic> findAllTopicsBySourceAndTarget(Context context, String source, UUID target, long offset,
+            long pageSize, String orderField, boolean ascending);
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/dto/CorrectionTypeMessageDTO.java b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/CorrectionTypeMessageDTO.java
new file mode 100644
index 0000000000..e5e38c2396
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/CorrectionTypeMessageDTO.java
@@ -0,0 +1,39 @@
+/**
+ * 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.qaevent.service.dto;
+
+import java.io.Serializable;
+
+/**
+ * The CorrectionTypeMessageDTO class implements the QAMessageDTO interface
+ * and represents a Data Transfer Object (DTO) for holding information
+ * related to a correction type message in the context of Quality Assurance (QA).
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
+ */
+public class CorrectionTypeMessageDTO implements QAMessageDTO, Serializable {
+
+    private static final long serialVersionUID = 2718151302291303796L;
+
+    private String reason;
+
+    public CorrectionTypeMessageDTO() {}
+
+    public CorrectionTypeMessageDTO(String reason) {
+        this.reason = reason;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/dto/NotifyMessageDTO.java b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/NotifyMessageDTO.java
new file mode 100644
index 0000000000..2a5842589f
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/NotifyMessageDTO.java
@@ -0,0 +1,58 @@
+/**
+ * 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.qaevent.service.dto;
+
+/**
+ * Implementation of {@link QAMessageDTO} that model message coming from COAR NOTIFY.
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class NotifyMessageDTO implements QAMessageDTO {
+
+    private String serviceName;
+
+    private String serviceId;
+
+    private String href;
+
+    private String relationship;
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getHref() {
+        return href;
+    }
+
+    public void setHref(String href) {
+        this.href = href;
+    }
+
+    public String getRelationship() {
+        return relationship;
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/dto/OpenaireMessageDTO.java b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/OpenaireMessageDTO.java
new file mode 100644
index 0000000000..821f11f869
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/OpenaireMessageDTO.java
@@ -0,0 +1,175 @@
+/**
+ * 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.qaevent.service.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Implementation of {@link QAMessageDTO} that model message coming from OPENAIRE.
+ * @see <a href="https://graph.openaire.eu/docs/category/entities" target="_blank"> see </a>
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class OpenaireMessageDTO implements QAMessageDTO {
+
+    @JsonProperty("pids[0].value")
+    private String value;
+
+    @JsonProperty("pids[0].type")
+    private String type;
+
+    @JsonProperty("instances[0].hostedby")
+    private String instanceHostedBy;
+
+    @JsonProperty("instances[0].instancetype")
+    private String instanceInstanceType;
+
+    @JsonProperty("instances[0].license")
+    private String instanceLicense;
+
+    @JsonProperty("instances[0].url")
+    private String instanceUrl;
+
+    @JsonProperty("abstracts[0]")
+    private String abstracts;
+
+    @JsonProperty("projects[0].acronym")
+    private String acronym;
+
+    @JsonProperty("projects[0].code")
+    private String code;
+
+    @JsonProperty("projects[0].funder")
+    private String funder;
+
+    @JsonProperty("projects[0].fundingProgram")
+    private String fundingProgram;
+
+    @JsonProperty("projects[0].jurisdiction")
+    private String jurisdiction;
+
+    @JsonProperty("projects[0].openaireId")
+    private String openaireId;
+
+    @JsonProperty("projects[0].title")
+    private String title;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getInstanceHostedBy() {
+        return instanceHostedBy;
+    }
+
+    public void setInstanceHostedBy(String instanceHostedBy) {
+        this.instanceHostedBy = instanceHostedBy;
+    }
+
+    public String getInstanceInstanceType() {
+        return instanceInstanceType;
+    }
+
+    public void setInstanceInstanceType(String instanceInstanceType) {
+        this.instanceInstanceType = instanceInstanceType;
+    }
+
+    public String getInstanceLicense() {
+        return instanceLicense;
+    }
+
+    public void setInstanceLicense(String instanceLicense) {
+        this.instanceLicense = instanceLicense;
+    }
+
+    public String getInstanceUrl() {
+        return instanceUrl;
+    }
+
+    public void setInstanceUrl(String instanceUrl) {
+        this.instanceUrl = instanceUrl;
+    }
+
+    public String getAbstracts() {
+        return abstracts;
+    }
+
+    public void setAbstracts(String abstracts) {
+        this.abstracts = abstracts;
+    }
+
+    public String getAcronym() {
+        return acronym;
+    }
+
+    public void setAcronym(String acronym) {
+        this.acronym = acronym;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getFunder() {
+        return funder;
+    }
+
+    public void setFunder(String funder) {
+        this.funder = funder;
+    }
+
+    public String getFundingProgram() {
+        return fundingProgram;
+    }
+
+    public void setFundingProgram(String fundingProgram) {
+        this.fundingProgram = fundingProgram;
+    }
+
+    public String getJurisdiction() {
+        return jurisdiction;
+    }
+
+    public void setJurisdiction(String jurisdiction) {
+        this.jurisdiction = jurisdiction;
+    }
+
+    public String getOpenaireId() {
+        return openaireId;
+    }
+
+    public void setOpenaireId(String openaireId) {
+        this.openaireId = openaireId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/dto/QAMessageDTO.java b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/QAMessageDTO.java
new file mode 100644
index 0000000000..ede32ef497
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/dto/QAMessageDTO.java
@@ -0,0 +1,20 @@
+/**
+ * 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.qaevent.service.dto;
+
+import org.dspace.content.QAEvent;
+
+/**
+ * Interface for classes that contains the details related to a {@link QAEvent}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface QAMessageDTO {
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java
new file mode 100644
index 0000000000..5839f5e877
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/OpenaireClientFactoryImpl.java
@@ -0,0 +1,35 @@
+/**
+ * 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.qaevent.service.impl;
+
+import eu.dnetlib.broker.BrokerClient;
+import org.dspace.qaevent.service.OpenaireClientFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link OpenaireClientFactory} that returns the instance of
+ * {@link BrokerClient} managed by the Spring context.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OpenaireClientFactoryImpl implements OpenaireClientFactory {
+
+    @Autowired
+    private BrokerClient brokerClient;
+
+    @Override
+    public BrokerClient getBrokerClient() {
+        return brokerClient;
+    }
+
+    public void setBrokerClient(BrokerClient brokerClient) {
+        this.brokerClient = brokerClient;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventActionServiceImpl.java b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventActionServiceImpl.java
new file mode 100644
index 0000000000..30875a5105
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventActionServiceImpl.java
@@ -0,0 +1,138 @@
+/**
+ * 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.qaevent.service.impl;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.Map;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QualityAssuranceAction;
+import org.dspace.qaevent.service.QAEventActionService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Implementation of {@link QAEventActionService}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEventActionServiceImpl implements QAEventActionService {
+
+    private static final Logger log = LogManager.getLogger(QAEventActionServiceImpl.class);
+
+    private ObjectMapper jsonMapper;
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private Map<String, QualityAssuranceAction> topicsToActions;
+
+    public void setTopicsToActions(Map<String, QualityAssuranceAction> topicsToActions) {
+        this.topicsToActions = topicsToActions;
+    }
+
+    public Map<String, QualityAssuranceAction> getTopicsToActions() {
+        return topicsToActions;
+    }
+
+    public QAEventActionServiceImpl() {
+        jsonMapper = new JsonMapper();
+        jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+    @Override
+    public void accept(Context context, QAEvent qaevent) {
+        Item item = null;
+        Item related = null;
+        try {
+            item = itemService.find(context, UUID.fromString(qaevent.getTarget()));
+            if (qaevent.getRelated() != null) {
+                related = itemService.find(context, UUID.fromString(qaevent.getRelated()));
+            }
+            if (topicsToActions.get(qaevent.getTopic()) == null) {
+                String msg = "Unable to manage QA Event typed " + qaevent.getTopic()
+                    + ". Managed types are: " + topicsToActions;
+                log.error(msg);
+                throw new RuntimeException(msg);
+            }
+            context.turnOffAuthorisationSystem();
+            topicsToActions.get(qaevent.getTopic()).applyCorrection(context, item, related,
+                jsonMapper.readValue(qaevent.getMessage(), qaevent.getMessageDtoClass()));
+            qaEventService.deleteEventByEventId(qaevent.getEventId());
+            makeAcknowledgement(qaevent.getEventId(), qaevent.getSource(), QAEvent.ACCEPTED);
+        } catch (SQLException | JsonProcessingException e) {
+            throw new RuntimeException(e);
+        } finally {
+            context.restoreAuthSystemState();
+        }
+    }
+
+    @Override
+    public void discard(Context context, QAEvent qaevent) {
+        qaEventService.deleteEventByEventId(qaevent.getEventId());
+        makeAcknowledgement(qaevent.getEventId(), qaevent.getSource(), QAEvent.DISCARDED);
+    }
+
+    @Override
+    public void reject(Context context, QAEvent qaevent) {
+        qaEventService.deleteEventByEventId(qaevent.getEventId());
+        makeAcknowledgement(qaevent.getEventId(), qaevent.getSource(), QAEvent.REJECTED);
+    }
+
+    /**
+     * Make acknowledgement to the configured urls for the event status.
+     */
+    private void makeAcknowledgement(String eventId, String source, String status) {
+        String[] ackwnoledgeCallbacks = configurationService
+            .getArrayProperty("qaevents." + source + ".acknowledge-url");
+        if (ackwnoledgeCallbacks != null) {
+            for (String ackwnoledgeCallback : ackwnoledgeCallbacks) {
+                if (StringUtils.isNotBlank(ackwnoledgeCallback)) {
+                    ObjectNode node = jsonMapper.createObjectNode();
+                    node.put("eventId", eventId);
+                    node.put("status", status);
+                    StringEntity requestEntity = new StringEntity(node.toString(), ContentType.APPLICATION_JSON);
+                    CloseableHttpClient httpclient = HttpClients.createDefault();
+                    HttpPost postMethod = new HttpPost(ackwnoledgeCallback);
+                    postMethod.setEntity(requestEntity);
+                    try {
+                        httpclient.execute(postMethod);
+                    } catch (IOException e) {
+                        log.error(e.getMessage(), e);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventSecurityServiceImpl.java b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventSecurityServiceImpl.java
new file mode 100644
index 0000000000..854626b3ba
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventSecurityServiceImpl.java
@@ -0,0 +1,72 @@
+/**
+ * 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.qaevent.service.impl;
+
+import java.util.Map;
+import java.util.Optional;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.qaevent.security.QASecurity;
+import org.dspace.qaevent.service.QAEventSecurityService;
+
+/**
+ * Implementation of the security service for QAEvents.
+ * This implementation manages a configuration of {@link QASecurity} instances,
+ * each responsible for security checks for a specific QA source.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class QAEventSecurityServiceImpl implements QAEventSecurityService {
+
+    /**
+     * The default security settings to be used when specific configurations are not available for a QA source.
+     */
+    private QASecurity defaultSecurity;
+
+    /**
+     * A mapping of QA source names to their corresponding QASecurity configurations.
+     */
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(QAEventSecurityServiceImpl.class);
+
+    private Map<String, QASecurity> qaSecurityConfiguration;
+
+    public void setQaSecurityConfiguration(Map<String, QASecurity> qaSecurityConfiguration) {
+        this.qaSecurityConfiguration = qaSecurityConfiguration;
+    }
+
+    public void setDefaultSecurity(QASecurity defaultSecurity) {
+        this.defaultSecurity = defaultSecurity;
+    }
+
+    @Override
+    public Optional<String> generateQAEventFilterQuery(Context context, EPerson user, String qaSource) {
+        QASecurity qaSecurity = getQASecurity(qaSource);
+        return qaSecurity.generateFilterQuery(context, user);
+    }
+
+    private QASecurity getQASecurity(String qaSource) {
+        return qaSecurityConfiguration.getOrDefault(qaSource, defaultSecurity);
+    }
+
+    @Override
+    public boolean canSeeEvent(Context context, EPerson user, QAEvent qaEvent) {
+        String source = qaEvent.getSource();
+        QASecurity qaSecurity = getQASecurity(source);
+        return qaSecurity.canSeeQASource(context, user) && qaSecurity.canSeeQAEvent(context, user, qaEvent);
+    }
+
+    @Override
+    public boolean canSeeSource(Context context, EPerson user, String qaSource) {
+        QASecurity qaSecurity = getQASecurity(qaSource);
+        return qaSecurity.canSeeQASource(context, user);
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventServiceImpl.java b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventServiceImpl.java
new file mode 100644
index 0000000000..98077a1c0c
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventServiceImpl.java
@@ -0,0 +1,773 @@
+/**
+ * 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.qaevent.service.impl;
+
+import static java.util.Comparator.comparing;
+import static org.apache.commons.lang3.StringUtils.endsWith;
+import static org.dspace.content.QAEvent.OPENAIRE_SOURCE;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrQuery.ORDER;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+import org.apache.solr.client.solrj.request.UpdateRequest;
+import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.solr.client.solrj.response.FacetField.Count;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.apache.solr.common.SolrInputDocument;
+import org.apache.solr.common.params.FacetParams;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.core.Email;
+import org.dspace.core.I18nUtil;
+import org.dspace.eperson.EPerson;
+import org.dspace.handle.service.HandleService;
+import org.dspace.qaevent.AutomaticProcessingAction;
+import org.dspace.qaevent.QAEventAutomaticProcessingEvaluation;
+import org.dspace.qaevent.QASource;
+import org.dspace.qaevent.QATopic;
+import org.dspace.qaevent.dao.QAEventsDAO;
+import org.dspace.qaevent.dao.impl.QAEventsDAOImpl;
+import org.dspace.qaevent.service.QAEventActionService;
+import org.dspace.qaevent.service.QAEventSecurityService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+
+
+/**
+ * Implementation of {@link QAEventService} that use Solr to store events. When
+ * the user performs an action on the event (such as accepting the suggestion or
+ * rejecting it) then the event is removed from solr and saved in the database
+ * (see {@link QAEventsDAO}) so that it is no longer proposed.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEventServiceImpl implements QAEventService {
+
+    private static final Logger log = LogManager.getLogger();
+
+    public static final String QAEVENTS_SOURCES = "qaevents.sources";
+
+    @Autowired(required = true)
+    protected ConfigurationService configurationService;
+
+    @Autowired(required = true)
+    protected QAEventSecurityService qaSecurityService;
+
+    @Autowired(required = true)
+    protected ItemService itemService;
+
+    @Autowired
+    private HandleService handleService;
+
+    @Autowired
+    private QAEventsDAOImpl qaEventsDao;
+
+    @Autowired(required = false)
+    @Qualifier("qaAutomaticProcessingMap")
+    private Map<String, QAEventAutomaticProcessingEvaluation> qaAutomaticProcessingMap;
+
+    @Autowired
+    private QAEventActionService qaEventActionService;
+
+    private ObjectMapper jsonMapper;
+
+    public QAEventServiceImpl() {
+        jsonMapper = new JsonMapper();
+        jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+    /**
+     * Non-Static CommonsHttpSolrServer for processing indexing events.
+     */
+    protected SolrClient solr = null;
+
+    public static final String SOURCE = "source";
+    public static final String ORIGINAL_ID = "original_id";
+    public static final String TITLE = "title";
+    public static final String TOPIC = "topic";
+    public static final String TRUST = "trust";
+    public static final String MESSAGE = "message";
+    public static final String EVENT_ID = "event_id";
+    public static final String RESOURCE_UUID = "resource_uuid";
+    public static final String LAST_UPDATE = "last_update";
+    public static final String RELATED_UUID = "related_uuid";
+
+    protected SolrClient getSolr() {
+        if (solr == null) {
+            String solrService = DSpaceServicesFactory.getInstance().getConfigurationService()
+                    .getProperty("qaevents.solr.server", "http://localhost:8983/solr/qaevent");
+            return new HttpSolrClient.Builder(solrService).build();
+        }
+        return solr;
+    }
+
+    @Override
+    public long countTopics() {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery("*:*");
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TOPIC);
+        QueryResponse response;
+        try {
+            response = getSolr().query(solrQuery);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+        return response.getFacetField(TOPIC).getValueCount();
+    }
+
+    @Override
+    public long countTopicsBySource(Context context, String sourceName) {
+        var currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(sourceName) || !qaSecurityService.canSeeSource(context, currentUser, sourceName)) {
+            return 0;
+        }
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, sourceName);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TOPIC);
+        solrQuery.addFilterQuery(SOURCE + ":\"" + sourceName + "\"");
+        QueryResponse response;
+        try {
+            response = getSolr().query(solrQuery);
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+        return response.getFacetField(TOPIC).getValueCount();
+    }
+
+    @Override
+    public QATopic findTopicBySourceAndNameAndTarget(Context context, String sourceName, String topicName,
+                                                     UUID target) {
+        if (isNotSupportedSource(sourceName)
+                || !qaSecurityService.canSeeSource(context, context.getCurrentUser(), sourceName)) {
+            return null;
+        }
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context,
+                context.getCurrentUser(), sourceName);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+
+        solrQuery.addFilterQuery(SOURCE + ":\"" + sourceName + "\"");
+        solrQuery.addFilterQuery(TOPIC + ":\"" + topicName + "\"");
+        if (target != null) {
+            solrQuery.addFilterQuery(RESOURCE_UUID + ":\"" + target.toString() + "\"");
+        }
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TOPIC);
+        QueryResponse response;
+        try {
+            response = getSolr().query(solrQuery);
+            FacetField facetField = response.getFacetField(TOPIC);
+            for (Count c : facetField.getValues()) {
+                if (c.getName().equals(topicName)) {
+                    QATopic topic = new QATopic();
+                    topic.setSource(sourceName);
+                    topic.setKey(c.getName());
+                    topic.setTotalEvents(c.getCount());
+                    topic.setLastEvent(new Date());
+                    return topic;
+                }
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+
+    @Override
+    public void deleteEventByEventId(String id) {
+        try {
+            getSolr().deleteById(id);
+            getSolr().commit();
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void deleteEventsByTargetId(UUID targetId) {
+        try {
+            getSolr().deleteByQuery(RESOURCE_UUID + ":" + targetId.toString());
+            getSolr().commit();
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public QATopic findTopicByTopicId(String topicId) {
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(TOPIC + ":" + topicId.replaceAll("!", "/"));
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TOPIC);
+        QueryResponse response;
+        try {
+            response = getSolr().query(solrQuery);
+            FacetField facetField = response.getFacetField(TOPIC);
+            for (Count c : facetField.getValues()) {
+                if (c.getName().equals(topicId.replace("!", "/"))) {
+                    QATopic topic = new QATopic();
+                    topic.setKey(c.getName());
+                    topic.setTotalEvents(c.getCount());
+                    topic.setLastEvent(new Date());
+                    return topic;
+                }
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<QATopic> findAllTopics(Context context, long offset, long count, String orderField, boolean ascending) {
+        return findAllTopicsBySource(context, null, offset, count, orderField, ascending);
+    }
+
+    @Override
+    public List<QATopic> findAllTopicsBySource(Context context, String source, long offset,
+        long count, String orderField, boolean ascending) {
+        return findAllTopicsBySourceAndTarget(context, source, null, offset, count, orderField, ascending);
+    }
+
+    @Override
+    public List<QATopic> findAllTopicsBySourceAndTarget(Context context, String source, UUID target, long offset,
+        long pageSize, String orderField, boolean ascending) {
+        if (isNotSupportedSource(source)
+                || !qaSecurityService.canSeeSource(context, context.getCurrentUser(), source)) {
+            return List.of();
+        }
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        if (orderField != null) {
+            solrQuery.setSort(orderField, ascending ? ORDER.asc : ORDER.desc);
+            solrQuery.setFacetSort(FacetParams.FACET_SORT_INDEX);
+        }
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context,
+                context.getCurrentUser(), source);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.setFacetLimit((int) (offset + pageSize));
+        solrQuery.addFacetField(TOPIC);
+        solrQuery.addFilterQuery(SOURCE + ":\"" + source + "\"");
+        if (target != null) {
+            solrQuery.addFilterQuery(RESOURCE_UUID + ":" + target.toString());
+        }
+        QueryResponse response;
+        List<QATopic> topics = new ArrayList<>();
+        try {
+            response = getSolr().query(solrQuery);
+            FacetField facetField = response.getFacetField(TOPIC);
+            int idx = 0;
+            for (Count c : facetField.getValues()) {
+                if (idx < offset) {
+                    idx++;
+                    continue;
+                }
+                QATopic topic = new QATopic();
+                topic.setSource(source);
+                topic.setKey(c.getName());
+                topic.setFocus(target);
+                topic.setTotalEvents(c.getCount());
+                topic.setLastEvent(new Date());
+                topics.add(topic);
+                idx++;
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+        return topics;
+    }
+
+    @Override
+    public void store(Context context, QAEvent dto) {
+
+        if (isNotSupportedSource(dto.getSource())) {
+            throw new IllegalArgumentException("The source of the given event is not supported: " + dto.getSource());
+        }
+
+        if (StringUtils.isBlank(dto.getTopic())) {
+            throw new IllegalArgumentException("A topic is mandatory for an event");
+        }
+
+        String checksum = dto.getEventId();
+        try {
+            if (!qaEventsDao.isEventStored(context, checksum)) {
+
+                SolrInputDocument doc = createSolrDocument(context, dto, checksum);
+
+                UpdateRequest updateRequest = new UpdateRequest();
+
+                updateRequest.add(doc);
+                updateRequest.process(getSolr());
+
+                getSolr().commit();
+
+                performAutomaticProcessingIfNeeded(context, dto);
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void performAutomaticProcessingIfNeeded(Context context, QAEvent qaEvent) {
+        if (qaAutomaticProcessingMap == null) {
+            return;
+        }
+        QAEventAutomaticProcessingEvaluation evaluation = qaAutomaticProcessingMap.get(qaEvent.getSource());
+
+        if (evaluation == null) {
+            return;
+        }
+
+        AutomaticProcessingAction action = evaluation.evaluateAutomaticProcessing(context, qaEvent);
+
+        if (action == null) {
+            return;
+        }
+
+        switch (action) {
+            case REJECT:
+                qaEventActionService.reject(context, qaEvent);
+                break;
+            case IGNORE:
+                qaEventActionService.discard(context, qaEvent);
+                break;
+            case ACCEPT:
+                qaEventActionService.accept(context, qaEvent);
+                break;
+            default:
+                throw new IllegalStateException("Unknown automatic action requested " + action);
+        }
+
+    }
+
+    /**
+     * Sends an email notification to the system administrator about a new
+     * Quality Assurance (QA) request event. The email includes details such as the
+     * topic, target, and message associated with the QA event.
+     *
+     * @param qaEvent The Quality Assurance event for which the notification is generated.
+     */
+    public void sentEmailToAdminAboutNewRequest(QAEvent qaEvent) {
+        try {
+            String uiUrl = configurationService.getProperty("dspace.ui.url");
+            Email email = Email.getEmail(I18nUtil.getEmailFilename(Locale.getDefault(), "qaevent_admin_notification"));
+            email.addRecipient(configurationService.getProperty("qaevents.mail.notification"));
+            email.addArgument(qaEvent.getTopic());
+            email.addArgument(uiUrl + "/items/" + qaEvent.getTarget());
+            email.addArgument(parsJson(qaEvent.getMessage()));
+            email.send();
+        } catch (Exception e) {
+            log.warn("Error during sending email of Withdrawn/Reinstate request for item with uuid:  {}",
+                     qaEvent.getTarget(), e);
+        }
+    }
+
+    private String parsJson(String jsonString) {
+        try {
+            ObjectMapper objectMapper = new ObjectMapper();
+            JsonNode jsonNode = objectMapper.readTree(jsonString);
+            return jsonNode.get("reason").asText();
+        } catch (Exception e) {
+            log.warn("Unable to parse the JSON:  {}", jsonString);
+            return jsonString;
+        }
+    }
+
+    @Override
+    public QAEvent findEventByEventId(String eventId) {
+        SolrQuery solrQuery = new SolrQuery("*:*");
+        solrQuery.addFilterQuery(EVENT_ID + ":\"" + eventId + "\"");
+        try {
+            QueryResponse response = getSolr().query(solrQuery);
+            if (response != null) {
+                SolrDocumentList list = response.getResults();
+                if (list != null && list.size() == 1) {
+                    SolrDocument doc = list.get(0);
+                    return getQAEventFromSOLR(doc);
+                }
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException("Exception querying Solr", e);
+        }
+        return null;
+    }
+
+    @Override
+    public List<QAEvent> findEventsByTopic(Context context, String sourceName, String topic, long offset, int pageSize,
+                                           String orderField, boolean ascending) {
+        EPerson currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(sourceName) || !qaSecurityService.canSeeSource(context, currentUser, sourceName)) {
+            return List.of();
+        }
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setStart(((Long) offset).intValue());
+        if (pageSize != -1) {
+            solrQuery.setRows(pageSize);
+        }
+        solrQuery.setSort(orderField, ascending ? ORDER.asc : ORDER.desc);
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, sourceName);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+
+        solrQuery.setQuery(TOPIC + ":" + topic.replaceAll("!", "/"));
+        solrQuery.addFilterQuery(SOURCE + ":\"" + sourceName + "\"");
+
+        try {
+            QueryResponse response = getSolr().query(solrQuery);
+            if (response != null) {
+                SolrDocumentList solrDocuments = response.getResults();
+                List<QAEvent> responseItem = new ArrayList<>();
+                for (SolrDocument doc : solrDocuments) {
+                    QAEvent item = getQAEventFromSOLR(doc);
+                    responseItem.add(item);
+                }
+                return responseItem;
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        return List.of();
+    }
+
+    @Override
+    public long countEventsByTopic(Context context, String sourceName, String topic) {
+        EPerson currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(sourceName) || !qaSecurityService.canSeeSource(context, currentUser, sourceName)) {
+            return 0;
+        }
+
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, sourceName);
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        solrQuery.addFilterQuery(SOURCE + ":\"" + sourceName + "\"");
+        solrQuery.setQuery(TOPIC + ":" + topic.replaceAll("!", "/"));
+        try {
+            return getSolr().query(solrQuery).getResults().getNumFound();
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public QASource findSource(Context context, String sourceName) {
+        String[] split = sourceName.split(":");
+        return findSource(context, split[0], split.length == 2 ? UUID.fromString(split[1]) : null);
+    }
+
+    @Override
+    public QASource findSource(Context context, String sourceName, UUID target) {
+        EPerson currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(sourceName) || !qaSecurityService.canSeeSource(context, currentUser, sourceName)) {
+            return null;
+        }
+
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, sourceName);
+
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        solrQuery.setRows(0);
+        solrQuery.addFilterQuery(SOURCE + ":\"" + sourceName + "\"");
+        if (target != null) {
+            solrQuery.addFilterQuery("resource_uuid:" + target.toString());
+        }
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(SOURCE);
+
+        try {
+            QueryResponse response = getSolr().query(solrQuery);
+            FacetField facetField = response.getFacetField(SOURCE);
+            for (Count c : facetField.getValues()) {
+                if (c.getName().equalsIgnoreCase(sourceName)) {
+                    QASource source = new QASource();
+                    source.setName(c.getName());
+                    source.setFocus(target);
+                    source.setTotalEvents(c.getCount());
+                    source.setLastEvent(new Date());
+                    return source;
+                }
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+
+        QASource source = new QASource();
+        source.setName(sourceName);
+        source.setTotalEvents(0L);
+
+        return source;
+    }
+
+    @Override
+    public List<QASource> findAllSources(Context context, long offset, int pageSize) {
+        return Arrays.stream(getSupportedSources())
+                     .map((sourceName) -> findSource(context, sourceName))
+            .filter(Objects::nonNull)
+                     .sorted(comparing(QASource::getTotalEvents)
+                     .reversed())
+                     .skip(offset)
+                     .limit(pageSize)
+                     .collect(Collectors.toList());
+    }
+
+    @Override
+    public long countSources(Context context) {
+        return Arrays.stream(getSupportedSources())
+                .map((sourceName) -> findSource(context, sourceName))
+                .filter(Objects::nonNull)
+                .filter(source -> source.getTotalEvents() > 0)
+                .count();
+    }
+
+    @Override
+    public long countSourcesByTarget(Context context, UUID target) {
+        return Arrays.stream(getSupportedSources())
+                .map((sourceName) -> findSource(context, sourceName, target))
+                .filter(Objects::nonNull)
+                .filter(source -> source.getTotalEvents() > 0)
+                .count();
+    }
+
+    @Override
+    public boolean isRelatedItemSupported(QAEvent qaevent) {
+        // Currently only PROJECT topics related to OPENAIRE supports related items
+        return qaevent.getSource().equals(OPENAIRE_SOURCE) && endsWith(qaevent.getTopic(), "/PROJECT");
+    }
+
+    private SolrInputDocument createSolrDocument(Context context, QAEvent dto, String checksum) throws Exception {
+        SolrInputDocument doc = new SolrInputDocument();
+        doc.addField(SOURCE, dto.getSource());
+        doc.addField(EVENT_ID, checksum);
+        doc.addField(ORIGINAL_ID, dto.getOriginalId());
+        doc.addField(TITLE, dto.getTitle());
+        doc.addField(TOPIC, dto.getTopic());
+        doc.addField(TRUST, dto.getTrust());
+        doc.addField(MESSAGE, dto.getMessage());
+        doc.addField(LAST_UPDATE, new Date());
+        String resourceUUID = getResourceUUID(context, dto.getOriginalId());
+        if (resourceUUID == null) {
+            resourceUUID = dto.getTarget();
+            /*throw new IllegalArgumentException("Skipped event " + checksum +
+                " related to the oai record " + dto.getOriginalId() + " as the record was not found");*/
+        }
+        doc.addField(RESOURCE_UUID, resourceUUID);
+        doc.addField(RELATED_UUID, dto.getRelated());
+        return doc;
+    }
+
+    private String getResourceUUID(Context context, String originalId) throws Exception {
+        String id = getHandleFromOriginalId(originalId);
+        if (id != null) {
+            Item item = (Item) handleService.resolveToObject(context, id);
+            if (item != null) {
+                final String itemUuid = item.getID().toString();
+                context.uncacheEntity(item);
+                return itemUuid;
+            } else {
+                return null;
+            }
+        } else {
+            throw new IllegalArgumentException("Malformed originalId " + originalId);
+        }
+    }
+
+    // oai:www.openstarts.units.it:10077/21486
+    private String getHandleFromOriginalId(String originalId) {
+        int startPosition = originalId.lastIndexOf(':');
+        if (startPosition != -1) {
+            return originalId.substring(startPosition + 1, originalId.length());
+        } else {
+            return originalId;
+        }
+    }
+
+    private QAEvent getQAEventFromSOLR(SolrDocument doc) {
+        QAEvent item = new QAEvent();
+        item.setSource((String) doc.get(SOURCE));
+        item.setEventId((String) doc.get(EVENT_ID));
+        item.setLastUpdate((Date) doc.get(LAST_UPDATE));
+        item.setMessage((String) doc.get(MESSAGE));
+        item.setOriginalId((String) doc.get(ORIGINAL_ID));
+        item.setTarget((String) doc.get(RESOURCE_UUID));
+        item.setTitle((String) doc.get(TITLE));
+        item.setTopic((String) doc.get(TOPIC));
+        item.setTrust((double) doc.get(TRUST));
+        item.setRelated((String) doc.get(RELATED_UUID));
+        return item;
+    }
+
+    @Override
+    public boolean qaEventsInSource(Context context, EPerson user, String eventId, String source) {
+        SolrQuery solrQuery = new SolrQuery();
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, user, source);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        solrQuery.addFilterQuery(EVENT_ID + ":\"" + eventId + "\"");
+        QueryResponse response;
+        try {
+            response = getSolr().query(solrQuery);
+            if (response != null) {
+                return response.getResults().getNumFound() == 1;
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException("Exception querying Solr", e);
+        }
+        return false;
+    }
+
+    @Override
+    public long countEventsByTopicAndTarget(Context context, String sourceName, String topic, UUID target) {
+        var currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(sourceName) || !qaSecurityService.canSeeSource(context, currentUser, sourceName)) {
+            return 0;
+        }
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, sourceName);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        if (target != null) {
+            solrQuery.addFilterQuery(RESOURCE_UUID + ":\"" + target.toString() + "\"");
+        }
+        solrQuery.addFilterQuery(SOURCE + ":\"" + sourceName + "\"");
+        solrQuery.addFilterQuery(TOPIC + ":\"" + topic + "\"");
+        QueryResponse response = null;
+        try {
+            response = getSolr().query(solrQuery);
+            return response.getResults().getNumFound();
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<QAEvent> findEventsByTopicAndTarget(Context context, String source, String topic, UUID target,
+            long offset, int pageSize) {
+        var currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(source) || !qaSecurityService.canSeeSource(context, currentUser, source)) {
+            return List.of();
+        }
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setStart(((Long) offset).intValue());
+        solrQuery.setRows(pageSize);
+        solrQuery.setSort(TRUST, ORDER.desc);
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, source);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        if (target != null) {
+            solrQuery.addFilterQuery(RESOURCE_UUID + ":\"" + target.toString() + "\"");
+        }
+        solrQuery.addFilterQuery(SOURCE + ":\"" + source + "\"");
+        solrQuery.addFilterQuery(TOPIC + ":\"" + topic + "\"");
+
+        try {
+            QueryResponse response = getSolr().query(solrQuery);
+            if (response != null) {
+                SolrDocumentList list = response.getResults();
+                List<QAEvent> responseItem = new ArrayList<>();
+                for (SolrDocument doc : list) {
+                    QAEvent item = getQAEventFromSOLR(doc);
+                    responseItem.add(item);
+                }
+                return responseItem;
+            }
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+        return List.of();
+    }
+
+    private boolean isNotSupportedSource(String source) {
+        return !ArrayUtils.contains(getSupportedSources(), source);
+    }
+
+    private String[] getSupportedSources() {
+        return configurationService.getArrayProperty(QAEVENTS_SOURCES,
+            new String[] { QAEvent.OPENAIRE_SOURCE, QAEvent.COAR_NOTIFY_SOURCE });
+    }
+
+    @Override
+    public long countTopicsBySourceAndTarget(Context context, String source, UUID target) {
+        var currentUser = context.getCurrentUser();
+        if (isNotSupportedSource(source) || !qaSecurityService.canSeeSource(context, currentUser, source)) {
+            return 0;
+        }
+        SolrQuery solrQuery = new SolrQuery();
+        solrQuery.setRows(0);
+        Optional<String> securityQuery = qaSecurityService.generateQAEventFilterQuery(context, currentUser, source);
+        solrQuery.setQuery(securityQuery.orElse("*:*"));
+        solrQuery.setFacet(true);
+        solrQuery.setFacetMinCount(1);
+        solrQuery.addFacetField(TOPIC);
+        solrQuery.addFilterQuery(SOURCE + ":\"" + source + "\"");
+        if (target != null) {
+            solrQuery.addFilterQuery(RESOURCE_UUID + ":\"" + target.toString() + "\"");
+        }
+        try {
+            QueryResponse response = getSolr().query(solrQuery);
+            return response.getFacetField(TOPIC).getValueCount();
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public List<QASource> findAllSourcesByTarget(Context context, UUID target, long offset, int pageSize) {
+        return Arrays.stream(getSupportedSources())
+                     .map((sourceName) -> findSource(context, sourceName, target))
+                     .filter(Objects::nonNull)
+                     .sorted(comparing(QASource::getTotalEvents).reversed())
+                     .filter(source -> source.getTotalEvents() > 0)
+                     .skip(offset)
+                     .limit(pageSize)
+                     .collect(Collectors.toList());
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java b/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java
index 34ab572d1b..8b43ad69d7 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/RDFConsumer.java
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.UUID;
 
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Model;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
@@ -241,7 +241,7 @@ public class RDFConsumer implements Consumer {
             }
 
             DSOIdentifier id = new DSOIdentifier(dso, ctx);
-            // If an item gets withdrawn, a MODIFIY event is fired. We have to
+            // If an item gets withdrawn, a MODIFY event is fired. We have to
             // delete the item from the triple store instead of converting it.
             // we don't have to take care for reinstantions of items as they can
             // be processed as normal modify events.
diff --git a/dspace-api/src/main/java/org/dspace/rdf/RDFUtil.java b/dspace-api/src/main/java/org/dspace/rdf/RDFUtil.java
index 1e9744aec5..7dea426228 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/RDFUtil.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/RDFUtil.java
@@ -12,8 +12,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 
-import com.hp.hpl.jena.rdf.model.Model;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.Model;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
@@ -90,7 +90,7 @@ public class RDFUtil {
 
     /**
      * Loads converted data of a DSpaceObject identified by the URI provided
-     * as {@code identifier}. This method uses the RDFStorage configurated in
+     * as {@code identifier}. This method uses the RDFStorage configured in
      * the DSpace configuration.  Close the model
      * ({@link com.hp.hpl.jena.rdf.model.Model#close() Model.close()}) as soon
      * as possible to free system resources.
@@ -200,7 +200,7 @@ public class RDFUtil {
             if (!found) {
                 log.warn("Configuration of DSpaceObjects of type "
                              + Constants.typeText[dso.getType()]
-                             + " prohibitted by configuration.");
+                             + " prohibited by configuration.");
                 return null;
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/rdf/RDFizer.java b/dspace-api/src/main/java/org/dspace/rdf/RDFizer.java
index ac4e341c5e..7f0358dfbe 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/RDFizer.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/RDFizer.java
@@ -16,7 +16,6 @@ import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import com.hp.hpl.jena.rdf.model.Model;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
@@ -25,6 +24,7 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.Model;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Collection;
@@ -205,7 +205,7 @@ public class RDFizer {
         }
 
         if (dso.getType() == Constants.SITE) {
-            // we don't need to iterate over all objects, use a shorctut:
+            // we don't need to iterate over all objects, use a shortcut:
             this.deleteAll();
         }
         Callback callback = new Callback() {
@@ -352,11 +352,11 @@ public class RDFizer {
         }
         markProcessed(dso);
         // this is useful to debug depth first search, but it is really noisy.
-        //log.debug("Procesing " + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) + " " + dso
+        //log.debug("Processing " + contentServiceFactory.getDSpaceObjectService(dso).getTypeText(dso) + " " + dso
         // .getID() + ":" + dso.getHandle() + ".");
 
         // if this method is used for conversion we should check if we have the
-        // permissions to read a DSO before converting all of it decendents
+        // permissions to read a DSO before converting all of it descendants
         // (e.g. check read permission on a community before converting all of
         // its subcommunties and collections).
         // just skip items with missing permissions and report them.
@@ -700,11 +700,11 @@ public class RDFizer {
         options.addOption("o", "stdout", false, "Print all converted data to " +
             "stdout using turtle as serialization.");
         options.addOption("n", "dry-run", false, "Don't send any data or commands " +
-            "to the triplestore. Usefull for debugging or in conjunction " +
+            "to the triplestore. Useful for debugging or in conjunction " +
             "with --stdout.");
         options.addOption("c", "convert-all", false, "Convert all DSpace Objects" +
             " that are readable for an anonymous user. This may take a long time" +
-            "depending on the number of stored communties, collections and " +
+            "depending on the number of stored communities, collections and " +
             "items. Existing information in the triple store will be updated.");
 
         Option optIdentifiers = Option.builder("i")
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/ConverterPlugin.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/ConverterPlugin.java
index f0ad88c582..fa00374f9d 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/ConverterPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/ConverterPlugin.java
@@ -10,7 +10,7 @@ package org.dspace.rdf.conversion;
 
 import java.sql.SQLException;
 
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Model;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/DMRM.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/DMRM.java
index 0d0f955e0a..ca95838061 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/DMRM.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/DMRM.java
@@ -8,10 +8,10 @@
 
 package org.dspace.rdf.conversion;
 
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
 
 /**
  * Schema for DSpace Metadata RDF Mappings.
@@ -88,7 +88,7 @@ public class DMRM {
     public static final Resource DSpaceValue = m_model.createResource(NS + "DSpaceValue");
 
     /**
-     * <p>Specifies the RDF to generate for a specified matadata.</p>
+     * <p>Specifies the RDF to generate for a specified metadata.</p>
      */
     public static final Property creates = m_model.createProperty(NS + "creates");
 
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataConverterPlugin.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataConverterPlugin.java
index 72ba03d99d..c9e55cba19 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataConverterPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataConverterPlugin.java
@@ -15,17 +15,17 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import com.hp.hpl.jena.rdf.model.InfModel;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.ResIterator;
-import com.hp.hpl.jena.reasoner.Reasoner;
-import com.hp.hpl.jena.reasoner.ReasonerRegistry;
-import com.hp.hpl.jena.reasoner.ValidityReport;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.util.FileUtils;
-import com.hp.hpl.jena.vocabulary.RDF;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.InfModel;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.ResIterator;
+import org.apache.jena.reasoner.Reasoner;
+import org.apache.jena.reasoner.ReasonerRegistry;
+import org.apache.jena.reasoner.ValidityReport;
+import org.apache.jena.util.FileManager;
+import org.apache.jena.util.FileUtils;
+import org.apache.jena.vocabulary.RDF;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.factory.UtilServiceFactory;
 import org.dspace.authorize.AuthorizeException;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataRDFMapping.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataRDFMapping.java
index 6286f3b87a..4117f3549b 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataRDFMapping.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/MetadataRDFMapping.java
@@ -14,15 +14,15 @@ import java.util.List;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
 
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.Literal;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.RDFNode;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.rdf.model.Statement;
+import org.apache.jena.rdf.model.StmtIterator;
+import org.apache.jena.vocabulary.RDF;
 import org.apache.logging.log4j.Logger;
 
 /**
@@ -159,7 +159,7 @@ public class MetadataRDFMapping {
     }
 
     public void convert(String value, String lang, String dsoIRI, Model m) {
-        log.debug("Using convertion for field " + name + " on value: " + value
+        log.debug("Using conversion for field " + name + " on value: " + value
                       + " for " + dsoIRI + ".");
         // run over all results
         for (Iterator<Resource> iter = this.results.iterator(); iter.hasNext(); ) {
@@ -282,7 +282,7 @@ public class MetadataRDFMapping {
         String uri = predicate.getURI();
         if (uri == null) {
             log.debug("A result predicate is blank node, but not a "
-                          + "ResourceGenerator. Ingoring this result.");
+                          + "ResourceGenerator. Ignoring this result.");
             return null;
         }
         return m.createProperty(uri);
@@ -447,7 +447,7 @@ public class MetadataRDFMapping {
 
             if (!modifierNode.isResource()) {
                 log.error("The modifier of a result is a Literal not an Resource! "
-                              + "Ingoring this result.");
+                              + "Ignoring this result.");
                 return null;
             }
             Resource modifier = modifierNode.asResource();
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverter.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverter.java
index d8e71856a1..7617355db6 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverter.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverter.java
@@ -10,7 +10,7 @@ package org.dspace.rdf.conversion;
 
 import java.sql.SQLException;
 
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Model;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverterImpl.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverterImpl.java
index 93a9b6211d..0842bf5e40 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverterImpl.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/RDFConverterImpl.java
@@ -11,8 +11,8 @@ package org.dspace.rdf.conversion;
 import java.sql.SQLException;
 import java.util.List;
 
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DSpaceObject;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/SimpleDSORelationsConverterPlugin.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/SimpleDSORelationsConverterPlugin.java
index 63382a7c26..4665625702 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/SimpleDSORelationsConverterPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/SimpleDSORelationsConverterPlugin.java
@@ -14,11 +14,11 @@ import java.sql.SQLException;
 import java.util.Iterator;
 import java.util.List;
 
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.util.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.util.FileManager;
+import org.apache.jena.util.FileUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.Util;
 import org.dspace.content.Bitstream;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/conversion/StaticDSOConverterPlugin.java b/dspace-api/src/main/java/org/dspace/rdf/conversion/StaticDSOConverterPlugin.java
index f86af753e6..f18074a1bd 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/conversion/StaticDSOConverterPlugin.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/conversion/StaticDSOConverterPlugin.java
@@ -12,10 +12,10 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
 
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.util.FileManager;
-import com.hp.hpl.jena.util.FileUtils;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.util.FileManager;
+import org.apache.jena.util.FileUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.factory.ContentServiceFactory;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/negotiation/MediaRange.java b/dspace-api/src/main/java/org/dspace/rdf/negotiation/MediaRange.java
index 6b2caa598d..f652838121 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/negotiation/MediaRange.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/negotiation/MediaRange.java
@@ -28,11 +28,11 @@ public class MediaRange {
 
     // SEPARATOR: ( ) < > @ , ; : \ " / [ ] ? = { } <space> <tabulator>
     // the separators can be used in as class inside square brackets. To be able
-    // to negate the class, the spearators necessary square brackets are not
+    // to negate the class, the separators necessary square brackets are not
     // included in the string.
     public static final String separators = "()<>@,;:\\\\\"/\\[\\]?={} \\t";
 
-    // TOKEN: ANY US ASCII except ctl an separtor
+    // TOKEN: ANY US ASCII except ctl an separator
     public static final String token = "[\\040-\\0176" + "&&[^" + separators + "]]+";
 
     // "\" followed by any US ASCII character (octets 0 - 177)
@@ -57,8 +57,8 @@ public class MediaRange {
     // group 5 contains the value of the last parameter before the quality parameter if any
     // group 6 contains the quality value if any
     // group 7 contains all parameters after the quality parameter if any
-    // group 8 contains the name of the last parameter after the quality paremeter if any
-    // group 9 contains the value of the laster parameter after the quality paremeter if any
+    // group 8 contains the name of the last parameter after the quality parameter if any
+    // group 9 contains the value of the laster parameter after the quality parameter if any
     public static final String mediaRangeRegex = "(?:(" + token + ")/(" + token + "?)"
         + "(" + nonQualityParam + "*)" + qualityParam + "?(" + nonQualityParam + "*))";
 
@@ -101,7 +101,7 @@ public class MediaRange {
             throw new IllegalArgumentException("A media range's type cannot "
                                                    + "be wildcarded if its subtype isn't as well.");
         }
-        // initalize with defualt value, parse later
+        // initialize with default value, parse later
         double qvalue = DEFAULT_QVALUE;
         // initialize empty lists, parse parameters later
         List<String> parameterNames = new ArrayList<>();
@@ -142,7 +142,7 @@ public class MediaRange {
                               + unparsedParameters + "') of a previously parsed media "
                               + "range!");
                 throw new IllegalStateException("Run into problems while parsing "
-                                                    + "a substring of a previuosly succesfully parsed string.");
+                                                    + "a substring of a previuosly successfully parsed string.");
             }
             while (m.find()) {
                 if (!StringUtils.isEmpty(m.group(1))) {
diff --git a/dspace-api/src/main/java/org/dspace/rdf/negotiation/NegotiationFilter.java b/dspace-api/src/main/java/org/dspace/rdf/negotiation/NegotiationFilter.java
index 998f57ca4f..d210803ba7 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/negotiation/NegotiationFilter.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/negotiation/NegotiationFilter.java
@@ -10,15 +10,15 @@ package org.dspace.rdf.negotiation;
 import java.io.IOException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.Logger;
 import org.dspace.rdf.RDFUtil;
 import org.dspace.services.factory.DSpaceServicesFactory;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/negotiation/Negotiator.java b/dspace-api/src/main/java/org/dspace/rdf/negotiation/Negotiator.java
index d011d305b1..07891b6d6d 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/negotiation/Negotiator.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/negotiation/Negotiator.java
@@ -12,8 +12,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.UrlValidator;
 import org.apache.logging.log4j.Logger;
@@ -25,7 +25,7 @@ import org.dspace.services.factory.DSpaceServicesFactory;
  */
 public class Negotiator {
 
-    // Serialiazation codes
+    // Serialization codes
     public static final int UNSPECIFIED = -1;
     public static final int WILDCARD = 0;
     public static final int HTML = 1;
diff --git a/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorage.java b/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorage.java
index 31294323c7..52bee26d76 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorage.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorage.java
@@ -10,7 +10,7 @@ package org.dspace.rdf.storage;
 
 import java.util.List;
 
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.Model;
 
 /**
  * @author Pascal-Nicolas Becker (dspace -at- pascal -hyphen- becker -dot- de)
diff --git a/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorageImpl.java b/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorageImpl.java
index fd84db5d5f..2ea5c3c880 100644
--- a/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorageImpl.java
+++ b/dspace-api/src/main/java/org/dspace/rdf/storage/RDFStorageImpl.java
@@ -12,24 +12,15 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import com.hp.hpl.jena.graph.Graph;
-import com.hp.hpl.jena.graph.Node;
-import com.hp.hpl.jena.graph.NodeFactory;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.sparql.core.DatasetGraph;
-import com.hp.hpl.jena.update.GraphStore;
-import com.hp.hpl.jena.update.GraphStoreFactory;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.jena.atlas.web.auth.HttpAuthenticator;
-import org.apache.jena.atlas.web.auth.SimpleAuthenticator;
-import org.apache.jena.web.DatasetGraphAccessor;
-import org.apache.jena.web.DatasetGraphAccessorHTTP;
+import org.apache.jena.http.auth.AuthEnv;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdfconnection.RDFConnection;
+import org.apache.jena.rdfconnection.RDFConnectionRemote;
+import org.apache.jena.sparql.exec.http.QueryExecutionHTTP;
 import org.apache.logging.log4j.Logger;
 import org.dspace.rdf.RDFUtil;
 import org.dspace.services.ConfigurationService;
@@ -47,48 +38,35 @@ public class RDFStorageImpl
 
     @Override
     public void store(String uri, Model model) {
-        Node graphNode = NodeFactory.createURI(uri);
-        DatasetGraphAccessor accessor = this.getAccessor();
-        Dataset ds = DatasetFactory.create(model);
-        DatasetGraph dsg = ds.asDatasetGraph();
-        Graph g = dsg.getDefaultGraph();
-        accessor.httpPut(graphNode, g);
+        RDFConnection connection = this.getConnection();
+        connection.put(uri, model);
     }
 
     @Override
     public Model load(String uri) {
-        Node graphNode = NodeFactory.createURI(uri);
-        DatasetGraphAccessor accessor = this.getAccessor();
-        Graph g = accessor.httpGet(graphNode);
-        if (g == null || g.isEmpty()) {
-            return null;
-        }
-        GraphStore gs = GraphStoreFactory.create(g);
-        Dataset ds = gs.toDataset();
-        Model m = ds.getDefaultModel();
-        return m;
+        RDFConnection connection = this.getConnection();
+        return connection.fetch(uri);
     }
 
-    protected DatasetGraphAccessor getAccessor() {
-        DatasetGraphAccessor accessor;
+    protected RDFConnection getConnection() {
+        RDFConnection connection;
         if (configurationService.hasProperty(RDFUtil.STORAGE_GRAPHSTORE_LOGIN_KEY)
             && configurationService.hasProperty(RDFUtil.STORAGE_GRAPHSTORE_PASSWORD_KEY)) {
-            HttpAuthenticator httpAuthenticator = new SimpleAuthenticator(
-                configurationService.getProperty(RDFUtil.STORAGE_GRAPHSTORE_LOGIN_KEY),
-                configurationService.getProperty(RDFUtil.STORAGE_GRAPHSTORE_PASSWORD_KEY).toCharArray());
-            accessor = new DatasetGraphAccessorHTTP(getGraphStoreEndpoint(),
-                                                    httpAuthenticator);
+            AuthEnv.get()
+                   .registerUsernamePassword(getGraphStoreEndpoint(),
+                                             configurationService.getProperty(RDFUtil.STORAGE_GRAPHSTORE_LOGIN_KEY),
+                                             configurationService.getProperty(RDFUtil.STORAGE_GRAPHSTORE_PASSWORD_KEY));
         } else {
             log.debug("Did not found credential to use for our connection to the "
                           + "Graph Store HTTP endpoint, trying to connect unauthenticated.");
-            accessor = new DatasetGraphAccessorHTTP(getGraphStoreEndpoint());
         }
-        return accessor;
+        connection = RDFConnectionRemote.service(getGraphStoreEndpoint()).build();
+        return connection;
     }
 
     @Override
     public void delete(String uri) {
-        this.getAccessor().httpDelete(NodeFactory.createURI(uri));
+        this.getConnection().delete(uri);
     }
 
     @Override
@@ -97,34 +75,30 @@ public class RDFStorageImpl
             this.delete(graph);
         }
         // clean default graph:
-        this.getAccessor().httpDelete();
+        this.getConnection().delete();
     }
 
     @Override
     public List<String> getAllStoredGraphs() {
         String queryString = "SELECT DISTINCT ?g WHERE { GRAPH ?g { ?s ?p ?o } }";
-        QueryExecution qexec;
         if (configurationService.hasProperty(RDFUtil.STORAGE_SPARQL_LOGIN_KEY)
             && configurationService.hasProperty(RDFUtil.STORAGE_SPARQL_PASSWORD_KEY)) {
-            HttpAuthenticator httpAuthenticator = new SimpleAuthenticator(
-                configurationService.getProperty(RDFUtil.STORAGE_SPARQL_LOGIN_KEY),
-                configurationService.getProperty(RDFUtil.STORAGE_GRAPHSTORE_PASSWORD_KEY).toCharArray());
-            qexec = QueryExecutionFactory.sparqlService(getSparqlEndpoint(),
-                                                        queryString, httpAuthenticator);
-        } else {
-            qexec = QueryExecutionFactory.sparqlService(getSparqlEndpoint(),
-                                                        queryString);
+            AuthEnv.get()
+                   .registerUsernamePassword(getSparqlEndpoint(),
+                                             configurationService.getProperty(RDFUtil.STORAGE_SPARQL_LOGIN_KEY),
+                                             configurationService.getProperty(RDFUtil.STORAGE_GRAPHSTORE_PASSWORD_KEY));
         }
 
-        ResultSet rs = qexec.execSelect();
-        List<String> graphs = Collections.synchronizedList(new ArrayList<String>());
-        while (rs.hasNext()) {
-            QuerySolution solution = rs.next();
-            if (solution.contains("g")) {
-                graphs.add(solution.get("g").asResource().getURI());
+        List<String> graphs = Collections.synchronizedList(new ArrayList<>());
+        try (QueryExecution qexec = QueryExecutionHTTP.service(getSparqlEndpoint()).queryString(queryString).build()) {
+            ResultSet rs = qexec.execSelect();
+            while (rs.hasNext()) {
+                QuerySolution solution = rs.next();
+                if (solution.contains("g")) {
+                    graphs.add(solution.get("g").asResource().getURI());
+                }
             }
         }
-        qexec.close();
         return graphs;
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/scripts/Process.java b/dspace-api/src/main/java/org/dspace/scripts/Process.java
index 9834c78c15..375c39ca55 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/Process.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/Process.java
@@ -10,25 +10,24 @@ package org.dspace.scripts;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.Lob;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 import org.dspace.content.Bitstream;
@@ -36,7 +35,7 @@ import org.dspace.content.ProcessStatus;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
-import org.hibernate.annotations.Type;
+import org.hibernate.Length;
 
 /**
  * This class is the DB Entity representation of the Process object to be stored in the Database
@@ -70,9 +69,7 @@ public class Process implements ReloadableEntity<Integer> {
     @Enumerated(EnumType.STRING)
     private ProcessStatus processStatus;
 
-    @Lob
-    @Type(type = "org.hibernate.type.TextType")
-    @Column(name = "parameters")
+    @Column(name = "parameters", length = Length.LONG32)
     private String parameters;
 
     @ManyToMany(fetch = FetchType.LAZY)
diff --git a/dspace-api/src/main/java/org/dspace/scripts/ScriptServiceImpl.java b/dspace-api/src/main/java/org/dspace/scripts/ScriptServiceImpl.java
index abb700cb10..1d9773f5d6 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/ScriptServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/ScriptServiceImpl.java
@@ -12,19 +12,19 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.core.Context;
 import org.dspace.kernel.ServiceManager;
 import org.dspace.scripts.configuration.ScriptConfiguration;
 import org.dspace.scripts.service.ScriptService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * The implementation for the {@link ScriptService}
  */
 public class ScriptServiceImpl implements ScriptService {
-    private static final Logger log = LoggerFactory.getLogger(ScriptServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private ServiceManager serviceManager;
@@ -48,7 +48,7 @@ public class ScriptServiceImpl implements ScriptService {
         try {
             return (DSpaceRunnable) scriptToExecute.getDspaceRunnableClass().getDeclaredConstructor().newInstance();
         } catch (InvocationTargetException | NoSuchMethodException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
             throw new RuntimeException(e);
         }
     }
diff --git a/dspace-api/src/main/java/org/dspace/scripts/configuration/ScriptConfiguration.java b/dspace-api/src/main/java/org/dspace/scripts/configuration/ScriptConfiguration.java
index ec8e3632cf..70debc172a 100644
--- a/dspace-api/src/main/java/org/dspace/scripts/configuration/ScriptConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/scripts/configuration/ScriptConfiguration.java
@@ -107,8 +107,8 @@ public abstract class ScriptConfiguration<T extends DSpaceRunnable> implements B
     public abstract Options getOptions();
 
     /**
-     * The getter for the options of the Script (help informations)
-     *
+     * The getter for the options of the Script (help information)
+     * 
      * @return the options value of this ScriptConfiguration for help
      */
     public Options getHelpOptions() {
diff --git a/dspace-api/src/main/java/org/dspace/service/ClientInfoService.java b/dspace-api/src/main/java/org/dspace/service/ClientInfoService.java
index ef92afab94..9b28dce142 100644
--- a/dspace-api/src/main/java/org/dspace/service/ClientInfoService.java
+++ b/dspace-api/src/main/java/org/dspace/service/ClientInfoService.java
@@ -7,7 +7,7 @@
  */
 package org.dspace.service;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * Service that can be used to retrieve information about DSpace clients
diff --git a/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java b/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java
index e83aa93e33..edff457ac5 100644
--- a/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/service/impl/ClientInfoServiceImpl.java
@@ -10,17 +10,17 @@ package org.dspace.service.impl;
 import static org.apache.commons.lang3.StringUtils.ordinalIndexOf;
 
 import java.net.Inet4Address;
-import javax.servlet.http.HttpServletRequest;
 
 import com.google.common.net.InetAddresses;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.core.Utils;
 import org.dspace.service.ClientInfoService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.statistics.util.IPTable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -32,16 +32,16 @@ public class ClientInfoServiceImpl implements ClientInfoService {
 
     private static final String X_FORWARDED_FOR_HEADER = "X-Forwarded-For";
 
-    private static final Logger log = LoggerFactory.getLogger(ClientInfoServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     private Boolean useProxiesEnabled;
 
-    private ConfigurationService configurationService;
+    private final ConfigurationService configurationService;
 
     /**
      * Sparse HashTable structure to hold IP address ranges of trusted proxies
      */
-    private IPTable trustedProxies;
+    private final IPTable trustedProxies;
 
     @Autowired(required = true)
     public ClientInfoServiceImpl(ConfigurationService configurationService) {
@@ -84,7 +84,7 @@ public class ClientInfoServiceImpl implements ClientInfoService {
     public boolean isUseProxiesEnabled() {
         if (useProxiesEnabled == null) {
             useProxiesEnabled = configurationService.getBooleanProperty("useProxies", true);
-            log.info("Proxies (useProxies) enabled? " + useProxiesEnabled);
+            log.info("Proxies (useProxies) enabled? {}", useProxiesEnabled);
         }
 
         return useProxiesEnabled;
@@ -163,6 +163,7 @@ public class ClientInfoServiceImpl implements ClientInfoService {
      * @param ipAddress IP address to check for
      * @return true if trusted, false otherwise
      */
+    @Override
     public boolean isRequestFromTrustedProxy(String ipAddress) {
         try {
             return trustedProxies != null && trustedProxies.contains(ipAddress);
@@ -205,15 +206,15 @@ public class ClientInfoServiceImpl implements ClientInfoService {
     }
 
     /**
-     * Anonymize the given IP address by setting the last specified bytes to 0
-     * @param  ipAddress the ip address to be anonymize
+     * Anonymize the given IP address by setting the last specified bytes to 0.
+     * @param  ipAddress the ip address to be anonymized
      * @param  bytes     the number of bytes to be set to 0
      * @return           the modified ip address
      */
     private String anonymizeIpAddress(String ipAddress, int bytes) {
 
         if (bytes > 4) {
-            log.warn("It is not possible to anonymize " + bytes + " bytes of an IPv4 address.");
+            log.warn("It is not possible to anonymize {} bytes of an IPv4 address.", bytes);
             return ipAddress;
         }
 
diff --git a/dspace-api/src/main/java/org/dspace/service/impl/HttpConnectionPoolService.java b/dspace-api/src/main/java/org/dspace/service/impl/HttpConnectionPoolService.java
index c5f7c46b58..31a8ed12c1 100644
--- a/dspace-api/src/main/java/org/dspace/service/impl/HttpConnectionPoolService.java
+++ b/dspace-api/src/main/java/org/dspace/service/impl/HttpConnectionPoolService.java
@@ -8,11 +8,11 @@
 package org.dspace.service.impl;
 
 import java.util.concurrent.TimeUnit;
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
+import jakarta.inject.Singleton;
 import org.apache.http.HeaderElement;
 import org.apache.http.HeaderElementIterator;
 import org.apache.http.HttpResponse;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/AnonymizeStatistics.java b/dspace-api/src/main/java/org/dspace/statistics/AnonymizeStatistics.java
index ef2a612133..aef062bc5c 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/AnonymizeStatistics.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/AnonymizeStatistics.java
@@ -185,7 +185,7 @@ public class AnonymizeStatistics {
             long total = getDocuments().getResults().getNumFound();
             printInfo(total + " documents to update");
 
-            // The documents will be processed in seperate threads.
+            // The documents will be processed in separate threads.
             ExecutorService executorService = Executors.newFixedThreadPool(threads);
 
             QueryResponse documents;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/HttpSolrClientFactory.java b/dspace-api/src/main/java/org/dspace/statistics/HttpSolrClientFactory.java
new file mode 100644
index 0000000000..63496ee5dc
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/statistics/HttpSolrClientFactory.java
@@ -0,0 +1,28 @@
+/**
+ * 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.statistics;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
+
+/**
+ * Factory of HtmlSolrClient instances.
+ *
+ * @author mwood
+ */
+public class HttpSolrClientFactory
+        implements SolrClientFactory {
+
+    @Override
+    public SolrClient getClient(String coreUrl) {
+        SolrClient client = new HttpSolrClient.Builder()
+                .withBaseSolrUrl(coreUrl)
+                .build();
+        return client;
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/statistics/SolrClientFactory.java b/dspace-api/src/main/java/org/dspace/statistics/SolrClientFactory.java
new file mode 100644
index 0000000000..1971e40863
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/statistics/SolrClientFactory.java
@@ -0,0 +1,25 @@
+/**
+ * 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.statistics;
+
+import org.apache.solr.client.solrj.SolrClient;
+
+/**
+ * Build connections to Solr cores.
+ *
+ * @author mwood
+ */
+public interface SolrClientFactory {
+    /**
+     * Instantiate a SolrClient connected to a specified core.
+     *
+     * @param coreUrl URL of the core to connect with.
+     * @return a connection to the given core.
+     */
+    public SolrClient getClient(String coreUrl);
+}
diff --git a/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java b/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
index 5f976bbfd9..90bc1751f9 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/SolrLoggerServiceImpl.java
@@ -37,13 +37,13 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
 
 import com.maxmind.geoip2.DatabaseReader;
 import com.maxmind.geoip2.exception.GeoIp2Exception;
 import com.maxmind.geoip2.model.CityResponse;
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -115,11 +115,9 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author mdiggory at atmire.com
  */
 public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBean {
-
     private static final Logger log = LogManager.getLogger();
 
     private static final String MULTIPLE_VALUES_SPLITTER = "|";
-    protected SolrClient solr;
 
     public static final String DATE_FORMAT_8601 = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
 
@@ -140,22 +138,22 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
     @Autowired(required = true)
     protected ContentServiceFactory contentServiceFactory;
     @Autowired(required = true)
-    private ConfigurationService configurationService;
+    protected ConfigurationService configurationService;
     @Autowired(required = true)
-    private ClientInfoService clientInfoService;
+    protected ClientInfoService clientInfoService;
     @Autowired
-    private SolrStatisticsCore solrStatisticsCore;
+    protected SolrStatisticsCore solrStatisticsCore;
     @Autowired
-    private GeoIpService geoIpService;
+    protected GeoIpService geoIpService;
     @Autowired
     private AuthorizeService authorizeService;
 
-    /** URL to the current-year statistics core.  Prior-year shards will have a year suffixed. */
-    private String statisticsCoreURL;
+    protected SolrClient solr;
 
     /** Name of the current-year statistics core.  Prior-year shards will have a year suffixed. */
     private String statisticsCoreBase;
 
+    /** Possible values of the {@code type} field of a usage event document. */
     public static enum StatisticsType {
         VIEW("view"),
         SEARCH("search"),
@@ -174,13 +172,11 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
     }
 
     protected SolrLoggerServiceImpl() {
-
     }
 
-
     @Override
     public void afterPropertiesSet() throws Exception {
-        statisticsCoreURL = configurationService.getProperty("solr-statistics.server");
+        String statisticsCoreURL = configurationService.getProperty("solr-statistics.server");
 
         if (null != statisticsCoreURL) {
             Path statisticsPath = Paths.get(new URI(statisticsCoreURL).getPath());
@@ -772,83 +768,40 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
         }
     }
 
-
     @Override
-    public void markRobotsByIP() {
-        for (String ip : SpiderDetector.getSpiderIpAddresses()) {
-
-            try {
-
-                /* Result Process to alter record to be identified as a bot */
-                ResultProcessor processor = new ResultProcessor() {
-                    @Override
-                    public void process(SolrInputDocument doc) throws IOException, SolrServerException {
-                        doc.removeField("isBot");
-                        doc.addField("isBot", true);
-                        solr.add(doc);
-                        log.info("Marked " + doc.getFieldValue("ip") + " as bot");
-                    }
-                };
-
-                /* query for ip, exclude results previously set as bots. */
-                processor.execute("ip:" + ip + "* AND -isBot:true");
-
-                solr.commit();
-
-            } catch (Exception e) {
-                log.error(e.getMessage(), e);
-            }
-
-
-        }
-
-    }
-
-    @Override
-    public void markRobotByUserAgent(String agent) {
-        try {
-
-            /* Result Process to alter record to be identified as a bot */
-            ResultProcessor processor = new ResultProcessor() {
-                @Override
-                public void process(SolrInputDocument doc) throws IOException, SolrServerException {
+    public void markRobots() {
+        ResultProcessor processor = new ResultProcessor() {
+            @Override
+            public void process(SolrInputDocument doc)
+                    throws IOException, SolrServerException {
+                String clientIP = (String) doc.getFieldValue("ip");
+                String hostname = (String) doc.getFieldValue("dns");
+                String agent = (String) doc.getFieldValue("userAgent");
+                if (SpiderDetector.isSpider(clientIP, null, hostname, agent)) {
                     doc.removeField("isBot");
                     doc.addField("isBot", true);
                     solr.add(doc);
+                    log.info("Marked {} / {} / {} as a robot in record {}.",
+                            clientIP, hostname, agent,
+                            doc.getField("uid").getValue());
                 }
-            };
-
-            /* query for ip, exclude results previously set as bots. */
-            processor.execute("userAgent:" + agent + " AND -isBot:true");
+            }
+        };
 
+        try {
+            processor.execute("-isBot:true");
             solr.commit();
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
+        } catch (SolrServerException | IOException ex) {
+            log.error("Failed while marking robot accesses.", ex);
         }
     }
 
     @Override
-    public void deleteRobotsByIsBotFlag() {
+    public void deleteRobots() {
         try {
             solr.deleteByQuery("isBot:true");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void deleteIP(String ip) {
-        try {
-            solr.deleteByQuery("ip:" + ip + "*");
-        } catch (Exception e) {
-            log.error(e.getMessage(), e);
-        }
-    }
-
-    @Override
-    public void deleteRobotsByIP() {
-        for (String ip : SpiderDetector.getSpiderIpAddresses()) {
-            deleteIP(ip);
+        } catch (IOException | SolrServerException e) {
+            log.error("Failed while deleting robot accesses.", e);
         }
     }
 
@@ -880,7 +833,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
 
         processor.execute(query);
 
-        // Add the new (updated onces
+        // Add the new (updated once
         for (int i = 0; i < docsToUpdate.size(); i++) {
             SolrInputDocument solrDocument = docsToUpdate.get(i);
 
@@ -1052,7 +1005,6 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
                 } catch (ParseException e1) {
                     e1.printStackTrace();
                 }
-                // e.printStackTrace();
             }
             String dateformatString = "dd-MM-yyyy";
             if ("DAY".equals(type)) {
@@ -1117,7 +1069,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
                 String facetQuery = facetQueries.get(i);
                 solrQuery.addFacetQuery(facetQuery);
             }
-            if (0 < facetQueries.size()) {
+            if (!facetQueries.isEmpty()) {
                 solrQuery.setFacet(true);
             }
         }
@@ -1135,13 +1087,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
         // performance and ensure the search result ordering will
         // not be influenced
 
-        // Choose to filter by the Legacy spider IP list (may get too long to properly filter all IP's
-        if (defaultFilterQueries && configurationService.getBooleanProperty(
-                "solr-statistics.query.filter.spiderIp", false)) {
-            solrQuery.addFilterQuery(getIgnoreSpiderIPs());
-        }
-
-        // Choose to filter by isBot field, may be overriden in future
+        // Choose to filter by isBot field, may be overridden in future
         // to allow views on stats based on bots.
         if (defaultFilterQueries && configurationService.getBooleanProperty(
                 "solr-statistics.query.filter.isBot", true)) {
@@ -1156,7 +1102,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
         if (defaultFilterQueries && bundles != null && bundles.length > 0) {
 
             /**
-             * The code below creates a query that will allow only records which do not have a bundlename
+             * The code below creates a query that will allow only records which do not have a bundle name
              * (items, collections, ...) or bitstreams that have a configured bundle name
              */
             StringBuilder bundleQuery = new StringBuilder();
@@ -1190,32 +1136,6 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
         return response;
     }
 
-
-    /**
-     * String of IP and Ranges in IPTable as a Solr Query
-     */
-    protected String filterQuery = null;
-
-    @Override
-    public String getIgnoreSpiderIPs() {
-        if (filterQuery == null) {
-            StringBuilder query = new StringBuilder();
-            boolean first = true;
-            for (String ip : SpiderDetector.getSpiderIpAddresses()) {
-                if (first) {
-                    query.append(" AND ");
-                    first = false;
-                }
-
-                query.append(" NOT(ip: ").append(ip).append(")");
-            }
-            filterQuery = query.toString();
-        }
-
-        return filterQuery;
-
-    }
-
     @Override
     public void shardSolrIndex() throws IOException, SolrServerException {
         if (!(solr instanceof HttpSolrClient)) {
@@ -1306,7 +1226,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
                 try ( CloseableHttpClient hc = HttpClientBuilder.create().build(); ) {
                     HttpResponse response = hc.execute(get);
                     csvInputstream = response.getEntity().getContent();
-                    //Write the csv ouput to a file !
+                    //Write the csv output to a file !
                     FileUtils.copyInputStreamToFile(csvInputstream, csvFile);
                 }
                 filesToUpload.add(csvFile);
@@ -1653,7 +1573,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
      * The statistics shards should not be initialized until all tomcat webapps
      * are fully initialized.  DS-3457 uncovered an issue in DSpace 6x in which
      * this code triggered Tomcat to hang when statistics shards are present.
-     * This code is synchonized in the event that 2 threads trigger the
+     * This code is synchronized in the event that 2 threads trigger the
      * initialization at the same time.
      */
     protected synchronized void initSolrYearCores() {
@@ -1702,6 +1622,7 @@ public class SolrLoggerServiceImpl implements SolrLoggerService, InitializingBea
         statisticYearCoresInit = true;
     }
 
+    @Override
     public Object anonymizeIp(String ip) throws UnknownHostException {
         InetAddress address = InetAddress.getByName(ip);
         if (address instanceof Inet4Address) {
diff --git a/dspace-api/src/main/java/org/dspace/statistics/SolrStatisticsCore.java b/dspace-api/src/main/java/org/dspace/statistics/SolrStatisticsCore.java
index 9ad72cbf31..d7d249082b 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/SolrStatisticsCore.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/SolrStatisticsCore.java
@@ -9,8 +9,7 @@ package org.dspace.statistics;
 
 import static org.apache.logging.log4j.LogManager.getLogger;
 
-import javax.inject.Named;
-
+import jakarta.inject.Named;
 import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.impl.HttpSolrClient;
@@ -28,10 +27,10 @@ public class SolrStatisticsCore {
     protected SolrClient solr = null;
 
     @Autowired
-    private ConfigurationService configurationService;
+    protected ConfigurationService configurationService;
 
     @Autowired @Named("solrHttpConnectionPoolService")
-    private HttpConnectionPoolService httpConnectionPoolService;
+    protected HttpConnectionPoolService httpConnectionPoolService;
 
     /**
      * Returns the {@link SolrClient} for the Statistics core.
diff --git a/dspace-api/src/main/java/org/dspace/statistics/content/DatasetGenerator.java b/dspace-api/src/main/java/org/dspace/statistics/content/DatasetGenerator.java
index 85bff41593..2b4247e2a7 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/content/DatasetGenerator.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/content/DatasetGenerator.java
@@ -19,7 +19,7 @@ package org.dspace.statistics.content;
 public abstract class DatasetGenerator {
 
     /**
-     * The type of generator can either be CATEGORY or SERIE
+     * The type of generator can either be CATEGORY or SERIES
      **/
     protected int datasetType;
 
diff --git a/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java b/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
index 121e66af48..ba1c51e207 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/content/StatisticsDataVisits.java
@@ -230,7 +230,7 @@ public class StatisticsDataVisits extends StatisticsData {
                         dataset.setRowLabel(0, getResultName(dataSetQuery.getName(), dataSetQuery, context));
                         dataset.setRowLabelAttr(0, getAttributes(dataSetQuery.getName(), dataSetQuery, context));
                     } else {
-                        // We need to get the max objects and the next part of the query on them (next part beeing
+                        // We need to get the max objects and the next part of the query on them (next part being
                         // the datasettimequery
                         ObjectCount[] maxObjectCounts = solrLoggerService
                             .queryFacetField(query, filterQuery, dataSetQuery.getFacetField(), dataSetQuery.getMax(),
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/FailedOpenURLTrackerServiceImpl.java b/dspace-api/src/main/java/org/dspace/statistics/export/FailedOpenURLTrackerServiceImpl.java
index cb8e64cc65..cf0972888e 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/FailedOpenURLTrackerServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/FailedOpenURLTrackerServiceImpl.java
@@ -48,7 +48,7 @@ public class FailedOpenURLTrackerServiceImpl implements FailedOpenURLTrackerServ
     /**
      * Creates a new OpenURLTracker
      * @param context
-     * @return the creatred OpenURLTracker
+     * @return the created OpenURLTracker
      * @throws SQLException
      */
     @Override
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/OpenURLTracker.java b/dspace-api/src/main/java/org/dspace/statistics/export/OpenURLTracker.java
index b853f255e8..47809ad230 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/OpenURLTracker.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/OpenURLTracker.java
@@ -8,18 +8,19 @@
 package org.dspace.statistics.export;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
-import org.hibernate.proxy.HibernateProxyHelper;
+
 
 /**
  * Class that represents an OpenURLTracker which tracks a failed transmission to IRUS
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/processor/BitstreamEventProcessor.java b/dspace-api/src/main/java/org/dspace/statistics/export/processor/BitstreamEventProcessor.java
index 85cb7bc14c..41cf655dbc 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/processor/BitstreamEventProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/processor/BitstreamEventProcessor.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.Item;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/processor/ExportEventProcessor.java b/dspace-api/src/main/java/org/dspace/statistics/export/processor/ExportEventProcessor.java
index 609298779d..434de459ba 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/processor/ExportEventProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/processor/ExportEventProcessor.java
@@ -15,8 +15,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.DCDate;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/processor/ItemEventProcessor.java b/dspace-api/src/main/java/org/dspace/statistics/export/processor/ItemEventProcessor.java
index 92adb67546..76ea30245d 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/processor/ItemEventProcessor.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/processor/ItemEventProcessor.java
@@ -11,14 +11,13 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 
-
 /**
  * Processor that handles Item events from the IrusExportUsageEventListener
  */
diff --git a/dspace-api/src/main/java/org/dspace/statistics/export/service/FailedOpenURLTrackerService.java b/dspace-api/src/main/java/org/dspace/statistics/export/service/FailedOpenURLTrackerService.java
index 9b482e3d54..ed6f8bc3bf 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/export/service/FailedOpenURLTrackerService.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/export/service/FailedOpenURLTrackerService.java
@@ -37,7 +37,7 @@ public interface FailedOpenURLTrackerService {
     /**
      * Creates a new OpenURLTracker
      * @param context
-     * @return the creatred OpenURLTracker
+     * @return the created OpenURLTracker
      * @throws SQLException
      */
     OpenURLTracker create(Context context) throws SQLException;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java b/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java
index 61b2bb6013..74b729c353 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/service/SolrLoggerService.java
@@ -12,8 +12,8 @@ import java.net.UnknownHostException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
@@ -111,15 +111,18 @@ public interface SolrLoggerService {
                                                 List oldFieldVals, String field)
         throws IOException;
 
-    public void markRobotsByIP();
+    /**
+     * Scan the entire 'statistics' collection for documents that should be
+     * marked 'isBot:true' according to
+     * {@link org.dspace.statistics.util.SpiderDetector#isSpider(java.lang.String,
+     * java.lang.String, java.lang.String, java.lang.String)}.
+     */
+    public void markRobots();
 
-    public void markRobotByUserAgent(String agent);
-
-    public void deleteRobotsByIsBotFlag();
-
-    public void deleteIP(String ip);
-
-    public void deleteRobotsByIP();
+    /**
+     * Delete all 'statistics' documents having 'isBot:true'.
+     */
+    public void deleteRobots();
 
     /*
      * update(String query, boolean addField, String fieldName, Object
@@ -259,13 +262,6 @@ public interface SolrLoggerService {
                                int facetMinCount, boolean defaultFilterQueries)
             throws SolrServerException, IOException;
 
-    /**
-     * Returns in a filterQuery string all the ip addresses that should be ignored
-     *
-     * @return a string query with ip addresses
-     */
-    public String getIgnoreSpiderIPs();
-
     public void shardSolrIndex() throws IOException, SolrServerException;
 
     public void reindexBitstreamHits(boolean removeDeletedBitstreams) throws Exception;
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java b/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java
index cb94dcc1a1..9d571cb751 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/IPTable.java
@@ -174,6 +174,9 @@ public class IPTable {
      * @throws IPFormatException Exception Class to deal with IPFormat errors.
      */
     public boolean contains(String ip) throws IPFormatException {
+        if (null == ip) {
+            throw new IPFormatException("Address may not be null");
+        }
 
         try {
             long ipToTest = ipToLong(InetAddress.getByName(ip));
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java
index c4c5765e08..fa5f71e326 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetector.java
@@ -10,14 +10,13 @@ package org.dspace.statistics.util;
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.statistics.factory.StatisticsServiceFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * SpiderDetector delegates static methods to SpiderDetectorService, which is used to find IP's that are spiders...
+ * SpiderDetector delegates static methods to SpiderDetectorService,
+ * which is used to find IPs, hosts, or agents that are spiders...
  *
  * @author kevinvandevelde at atmire.com
  * @author ben at atmire.com
@@ -25,29 +24,16 @@ import org.slf4j.LoggerFactory;
  * @author frederic at atmire.com
  */
 public class SpiderDetector {
-
-    private static final Logger log = LoggerFactory.getLogger(SpiderDetector.class);
-
-    //Service where all methods get delegated to, this is instantiated by a spring-bean defined in core-services.xml
-    private static SpiderDetectorService spiderDetectorService = StatisticsServiceFactory.getInstance()
-                                                                                         .getSpiderDetectorService();
+    //Service where all methods get delegated to.  This is instantiated by a
+    // Spring bean defined in core-services.xml
+    private static final SpiderDetectorService spiderDetectorService
+            = StatisticsServiceFactory.getInstance().getSpiderDetectorService();
 
     /**
      * Default constructor
      */
     private SpiderDetector() { }
 
-    /**
-     * Get an immutable Set representing all the Spider Addresses here
-     *
-     * @return a set of IP addresses as strings
-     */
-    public static Set<String> getSpiderIpAddresses() {
-
-        spiderDetectorService.loadSpiderIpAddresses();
-        return spiderDetectorService.getTable().toSet();
-    }
-
     /**
      * Utility method which reads lines from a file & returns them in a Set.
      *
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorService.java b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorService.java
index 710e8472d2..cf5a5d4319 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorService.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorService.java
@@ -10,26 +10,60 @@ package org.dspace.statistics.util;
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
-import javax.servlet.http.HttpServletRequest;
+
+import jakarta.servlet.http.HttpServletRequest;
 
 /**
- * Interface to implement a SpiderDetectorService
+ * Interface to implement a SpiderDetectorService.
  *
  * @author frederic at atmire.com
  */
 public interface SpiderDetectorService {
 
+    /**
+     * Service Method for testing spiders against existing spider files.
+     *
+     * @param clientIP address of the client.
+     * @param proxyIPs comma-list of X-Forwarded-For addresses, or null.
+     * @param hostname domain name of host, or null.
+     * @param agent    User-Agent header value, or null.
+     * @return true if the client matches any spider characteristics list.
+     */
     public boolean isSpider(String clientIP, String proxyIPs, String hostname, String agent);
 
+    /**
+     * Service Method for testing spiders against existing spider files.
+     *
+     * @param request the current HTTP request.
+     * @return true|false if the request was detected to be from a spider.
+     */
     public boolean isSpider(HttpServletRequest request);
 
+    /**
+     * Check individual IP is a spider.
+     *
+     * @param ip the IP address to be checked.
+     * @return if is spider IP
+     */
     public boolean isSpider(String ip);
 
+    /**
+     *  Loader to populate the IP address table from files.
+     */
     public void loadSpiderIpAddresses();
 
+    /**
+     * Utility method which reads lines from a file & returns them in a Set.
+     *
+     * @param patternFile the location of our spider file
+     * @return a vector full of patterns
+     * @throws IOException could not happen since we check the file be4 we use it
+     */
     public Set<String> readPatterns(File patternFile)
         throws IOException;
 
+    /**
+     * @return the table of IP net blocks.
+     */
     public IPTable getTable();
-
 }
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorServiceImpl.java b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorServiceImpl.java
index 0b5149df74..f1b03b5439 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/SpiderDetectorServiceImpl.java
@@ -17,14 +17,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotNull;
 import org.apache.commons.configuration2.ex.ConversionException;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.service.ClientInfoService;
 import org.dspace.services.ConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -39,18 +40,18 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class SpiderDetectorServiceImpl implements SpiderDetectorService {
 
-    private static final Logger log = LoggerFactory.getLogger(SpiderDetectorServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     private Boolean useCaseInsensitiveMatching;
 
     private final List<Pattern> agents
-        = Collections.synchronizedList(new ArrayList<Pattern>());
+        = Collections.synchronizedList(new ArrayList<>());
 
     private final List<Pattern> domains
-        = Collections.synchronizedList(new ArrayList<Pattern>());
+        = Collections.synchronizedList(new ArrayList<>());
 
-    private ConfigurationService configurationService;
-    private ClientInfoService clientInfoService;
+    private final ConfigurationService configurationService;
+    private final ClientInfoService clientInfoService;
 
     /**
      * Sparse HashTable structure to hold IP address ranges.
@@ -63,23 +64,17 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
         this.clientInfoService = clientInfoService;
     }
 
+    @Override
     public IPTable getTable() {
         return table;
     }
 
-    /**
-     * Service Method for testing spiders against existing spider files.
-     * <p>
+    /*
      * In future spiders HashSet may be optimized as byte offset array to
      * improve performance and memory footprint further.
-     *
-     * @param clientIP address of the client.
-     * @param proxyIPs comma-list of X-Forwarded-For addresses, or null.
-     * @param hostname domain name of host, or null.
-     * @param agent    User-Agent header value, or null.
-     * @return true if the client matches any spider characteristics list.
      */
-    public boolean isSpider(String clientIP, String proxyIPs, String hostname, String agent) {
+    @Override
+    public boolean isSpider(@NotNull String clientIP, String proxyIPs, String hostname, String agent) {
         // See if any agent patterns match
         if (null != agent) {
             synchronized (agents) {
@@ -137,13 +132,7 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
         return false;
     }
 
-    /**
-     * Utility method which reads lines from a file & returns them in a Set.
-     *
-     * @param patternFile the location of our spider file
-     * @return a vector full of patterns
-     * @throws IOException could not happen since we check the file be4 we use it
-     */
+    @Override
     public Set<String> readPatterns(File patternFile)
         throws IOException {
         Set<String> patterns = new HashSet<>();
@@ -191,7 +180,7 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
                     patterns = readPatterns(file);
                 } catch (IOException ex) {
                     log.error("Patterns not read from {}:  {}",
-                              file.getPath(), ex.getMessage());
+                            file::getPath, ex::getMessage);
                     continue;
                 }
                 //If case insensitive matching is enabled, lowercase the patterns so they can be lowercase matched
@@ -203,19 +192,14 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
                 }
 
 
-                log.info("Loaded pattern file:  {}", file.getPath());
+                log.info("Loaded pattern file:  {}", file::getPath);
             }
         } else {
-            log.info("No patterns loaded from {}", patternsDir.getPath());
+            log.info("No patterns loaded from {}", patternsDir::getPath);
         }
     }
 
-    /**
-     * Service Method for testing spiders against existing spider files.
-     *
-     * @param request
-     * @return true|false if the request was detected to be from a spider.
-     */
+    @Override
     public boolean isSpider(HttpServletRequest request) {
         return isSpider(request.getRemoteAddr(),
                         request.getHeader("X-Forwarded-For"),
@@ -223,12 +207,7 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
                         request.getHeader("User-Agent"));
     }
 
-    /**
-     * Check individual IP is a spider.
-     *
-     * @param ip
-     * @return if is spider IP
-     */
+    @Override
     public boolean isSpider(String ip) {
         if (table == null) {
             loadSpiderIpAddresses();
@@ -238,16 +217,15 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
             if (table.contains(ip)) {
                 return true;
             }
-        } catch (Exception e) {
+        } catch (IPTable.IPFormatException e) {
+            log.warn("Assumed not a spider:  {}", e::getMessage);
             return false;
         }
 
         return false;
     }
 
-    /*
-     *  loader to populate the table from files.
-     */
+    @Override
     public synchronized void loadSpiderIpAddresses() {
 
         if (table == null) {
@@ -289,7 +267,7 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
     }
 
     /**
-     * checks if case insensitive matching is enabled
+     * Checks if case insensitive matching is enabled.
      *
      * @return true if it's enabled, false if not
      */
@@ -306,5 +284,4 @@ public class SpiderDetectorServiceImpl implements SpiderDetectorService {
 
         return useCaseInsensitiveMatching;
     }
-
 }
diff --git a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java
index 319fe437d6..95c4f1f813 100644
--- a/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java
+++ b/dspace-api/src/main/java/org/dspace/statistics/util/StatisticsClient.java
@@ -66,7 +66,6 @@ public class StatisticsClient {
 
         options.addOption("m", "mark-spiders", false, "Update isBot Flag in Solr");
         options.addOption("f", "delete-spiders-by-flag", false, "Delete Spiders in Solr By isBot Flag");
-        options.addOption("i", "delete-spiders-by-ip", false, "Delete Spiders in Solr By IP Address");
         options.addOption("b", "reindex-bitstreams", false, "Reindex the bitstreams to ensure we have the bundle name");
         options.addOption("e", "export", false,
                           "Export SOLR view statistics data to usage-statistics-intermediate-format");
@@ -87,11 +86,9 @@ public class StatisticsClient {
         if (line.hasOption("u")) {
             StatisticsClient.updateSpiderFiles();
         } else if (line.hasOption('m')) {
-            solrLoggerService.markRobotsByIP();
+            solrLoggerService.markRobots();
         } else if (line.hasOption('f')) {
-            solrLoggerService.deleteRobotsByIsBotFlag();
-        } else if (line.hasOption('i')) {
-            solrLoggerService.deleteRobotsByIP();
+            solrLoggerService.deleteRobots();
         } else if (line.hasOption('b')) {
             solrLoggerService.reindexBitstreamHits(line.hasOption('r'));
         } else if (line.hasOption('e')) {
@@ -104,7 +101,7 @@ public class StatisticsClient {
     }
 
     /**
-     * Method to update Spiders in config directory.
+     * Method to update Spiders in configuration directory.
      */
     private static void updateSpiderFiles() {
         try {
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java
index 956ac5a7f8..290e480a93 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/BitstreamStorageServiceImpl.java
@@ -15,8 +15,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.logging.log4j.LogManager;
@@ -148,7 +148,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
      * @param assetstore    The assetstore number for the bitstream to be
      *                      registered
      * @param bitstreamPath The relative path of the bitstream to be registered.
-     *                      The path is relative to the path of ths assetstore.
+     *                      The path is relative to the path of this assetstore.
      * @return The ID of the registered bitstream
      * @throws SQLException If a problem occurs accessing the RDBMS
      * @throws IOException  if IO error
@@ -224,7 +224,7 @@ public class BitstreamStorageServiceImpl implements BitstreamStorageService, Ini
         int cleanedBitstreamCount = 0;
 
         int deletedBitstreamCount = bitstreamService.countDeletedBitstreams(context);
-        System.out.println("Found " + deletedBitstreamCount + " deleted bistream to cleanup");
+        System.out.println("Found " + deletedBitstreamCount + " deleted bitstream to cleanup");
 
         try {
             context.turnOffAuthorisationSystem();
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
index e21a101a7e..4d32b50d67 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/S3BitStoreService.java
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.function.Supplier;
-import javax.validation.constraints.NotNull;
 
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.auth.AWSCredentials;
@@ -39,6 +38,7 @@ import com.amazonaws.services.s3.transfer.Download;
 import com.amazonaws.services.s3.transfer.TransferManager;
 import com.amazonaws.services.s3.transfer.TransferManagerBuilder;
 import com.amazonaws.services.s3.transfer.Upload;
+import jakarta.validation.constraints.NotNull;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.DefaultParser;
 import org.apache.commons.cli.HelpFormatter;
@@ -553,7 +553,7 @@ public class S3BitStoreService extends BaseBitStoreService {
         store.bucketName = DEFAULT_BUCKET_PREFIX + hostname + ".s3test";
         store.s3Service.createBucket(store.bucketName);
         /* Broken in DSpace 6 TODO Refactor
-        // time everything, todo, swtich to caliper
+        // time everything, todo, switch to caliper
         long start = System.currentTimeMillis();
         // Case 1: store a file
         String id = store.generateId();
diff --git a/dspace-api/src/main/java/org/dspace/storage/bitstore/service/BitstreamStorageService.java b/dspace-api/src/main/java/org/dspace/storage/bitstore/service/BitstreamStorageService.java
index 7f5ed8f912..8c3a67ee9a 100644
--- a/dspace-api/src/main/java/org/dspace/storage/bitstore/service/BitstreamStorageService.java
+++ b/dspace-api/src/main/java/org/dspace/storage/bitstore/service/BitstreamStorageService.java
@@ -12,8 +12,8 @@ import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.Map;
 import java.util.UUID;
-import javax.annotation.Nullable;
 
+import jakarta.annotation.Nullable;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.core.Context;
@@ -92,7 +92,7 @@ public interface BitstreamStorageService {
      * @param assetstore    The assetstore number for the bitstream to be
      *                      registered
      * @param bitstreamPath The relative path of the bitstream to be registered.
-     *                      The path is relative to the path of ths assetstore.
+     *                      The path is relative to the path of this assetstore.
      * @return The ID of the registered bitstream
      * @throws SQLException       If a problem occurs accessing the RDBMS
      * @throws IOException        if IO error
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
index 0732eea2a0..7a2d3a8b74 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/DatabaseUtils.java
@@ -635,7 +635,7 @@ public class DatabaseUtils {
             // For DSpace, we sometimes have to insert "old" migrations in after a major release
             // if further development/bug fixes are needed in older versions. So, "Ignored" migrations are
             // nothing to worry about...you can always trigger them to run using "database migrate ignored" from CLI
-            flywayConfiguration.ignoreIgnoredMigrations(true);
+            flywayConfiguration.ignoreMigrationPatterns("*:ignored");
 
             // Set Flyway callbacks (i.e. classes which are called post-DB migration and similar)
             List<Callback> flywayCallbacks = DSpaceServicesFactory.getInstance().getServiceManager()
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgresUtils.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgresUtils.java
index 0d049bb6ac..38bb639983 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgresUtils.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/PostgresUtils.java
@@ -26,7 +26,7 @@ import org.flywaydb.core.api.FlywayException;
  * @author Tim Donohue
  */
 public class PostgresUtils {
-    // PostgreSQL pgcrypto extention name, and required versions of Postgres & pgcrypto
+    // PostgreSQL pgcrypto extension name, and required versions of Postgres & pgcrypto
     public static final String PGCRYPTO = "pgcrypto";
     public static final Double PGCRYPTO_VERSION = 1.1;
     public static final Double POSTGRES_VERSION = 9.4;
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
index 7debf3ba44..1419910d52 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/RegistryUpdater.java
@@ -14,6 +14,8 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.xpath.XPathExpressionException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.administer.MetadataImporter;
 import org.dspace.administer.RegistryImportException;
 import org.dspace.administer.RegistryLoader;
@@ -24,8 +26,6 @@ import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.flywaydb.core.api.callback.Callback;
 import org.flywaydb.core.api.callback.Event;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
 /**
@@ -52,7 +52,7 @@ public class RegistryUpdater implements Callback {
     /**
      * logging category
      */
-    private static final Logger log = LoggerFactory.getLogger(RegistryUpdater.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Method to actually update our registries from latest configuration files.
@@ -86,7 +86,7 @@ public class RegistryUpdater implements Callback {
             context.restoreAuthSystemState();
             // Commit changes and close context
             context.complete();
-            log.info("All Bitstream Format Regitry and Metadata Registry updates were completed.");
+            log.info("All Bitstream Format Registry and Metadata Registry updates were completed.");
         } catch (IOException | SQLException | ParserConfigurationException
                 | TransformerException | RegistryImportException
                 | AuthorizeException | NonUniqueMetadataException
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java
index f0c4e4e179..28df30d870 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/MigrationUtils.java
@@ -108,7 +108,7 @@ public class MigrationUtils {
 
         // As long as we have a constraint name, drop it
         if (constraintName != null && !constraintName.isEmpty()) {
-            // This drop constaint SQL should be the same in all databases
+            // This drop constraint SQL should be the same in all databases
             String dropConstraintSQL = "ALTER TABLE " + tableName + " DROP CONSTRAINT " + constraintName;
             if (cascade) {
                 dropConstraintSQL += " CASCADE";
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_3_9__Drop_constraint_for_DSpace_1_4_schema.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_3_9__Drop_constraint_for_DSpace_1_4_schema.java
index 758e745ddc..801e3faadb 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_3_9__Drop_constraint_for_DSpace_1_4_schema.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_3_9__Drop_constraint_for_DSpace_1_4_schema.java
@@ -24,7 +24,7 @@ import org.flywaydb.core.api.migration.Context;
  * since unit tests require H2 and the syntax for H2 is different from Postgres).
  * <P>
  * NOTE: This migration class is very simple because it is meant to be used
- * in conjuction with the corresponding SQL script:
+ * in conjunction with the corresponding SQL script:
  * ./etc/migrations/[db-type]/V1.4__Upgrade_to_DSpace_1.4_schema.sql
  * <P>
  * Also note that this migration is "hackingly" versioned "1.3.9" as it needs to
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_5_9__Drop_constraint_for_DSpace_1_6_schema.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_5_9__Drop_constraint_for_DSpace_1_6_schema.java
index 37100a17f9..2f24f4c254 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_5_9__Drop_constraint_for_DSpace_1_6_schema.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V1_5_9__Drop_constraint_for_DSpace_1_6_schema.java
@@ -24,7 +24,7 @@ import org.flywaydb.core.api.migration.Context;
  * since unit tests require H2 and the syntax for H2 is different from Postgres).
  * <P>
  * NOTE: This migration class is very simple because it is meant to be used
- * in conjuction with the corresponding SQL script:
+ * in conjunction with the corresponding SQL script:
  * ./etc/migrations/[db-type]/V1.6__Upgrade_to_DSpace_1.6_schema.sql
  * <P>
  * Also note that this migration is "hackingly" versioned "1.5.9" as it needs to
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V5_0_2014_09_25__DS_1582_Metadata_For_All_Objects_drop_constraint.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V5_0_2014_09_25__DS_1582_Metadata_For_All_Objects_drop_constraint.java
index 8e2be91127..337190ec39 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V5_0_2014_09_25__DS_1582_Metadata_For_All_Objects_drop_constraint.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V5_0_2014_09_25__DS_1582_Metadata_For_All_Objects_drop_constraint.java
@@ -25,7 +25,7 @@ import org.flywaydb.core.api.migration.Context;
  * since unit tests require H2 and the syntax for H2 is different from Postgres).
  * <P>
  * NOTE: This migration class is very simple because it is meant to be used
- * in conjuction with the corresponding SQL script:
+ * in conjunction with the corresponding SQL script:
  * ./etc/migrations/[db-type]/V5.0_2014_09_26__DS-1582_Metadata_For_All_Objects.sql
  * <P>
  * Also note that this migration is dated as 2014_09_25 so that it will run
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V6_0_2016_01_26__DS_2188_Remove_DBMS_Browse_Tables.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V6_0_2016_01_26__DS_2188_Remove_DBMS_Browse_Tables.java
index daf2269e92..5893650a42 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V6_0_2016_01_26__DS_2188_Remove_DBMS_Browse_Tables.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V6_0_2016_01_26__DS_2188_Remove_DBMS_Browse_Tables.java
@@ -58,7 +58,7 @@ public class V6_0_2016_01_26__DS_2188_Remove_DBMS_Browse_Tables extends BaseJava
         // Keep looping (incrementing our index by 1) until we've hit three index
         // tables that have not been found.
         // We don't actually know how many index tables will be in each database,
-        // and there are no guarrantees it'll match the highest index of the site's
+        // and there are no guarantees it'll match the highest index of the site's
         // existing "webui.browse.index.#" settings.
         // Since that's the case, we'll just keep searching for index tables,
         // until we encounter a total of three that are not found.
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V7_0_2020_10_31__CollectionCommunity_Metadata_Handle.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V7_0_2020_10_31__CollectionCommunity_Metadata_Handle.java
index 21ebcd5edd..973134bfd1 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V7_0_2020_10_31__CollectionCommunity_Metadata_Handle.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/migration/V7_0_2020_10_31__CollectionCommunity_Metadata_Handle.java
@@ -18,7 +18,7 @@ import org.flywaydb.core.api.migration.BaseJavaMigration;
 import org.flywaydb.core.api.migration.Context;
 
 /**
- * Insert a 'dc.idendifier.uri' metadata record for each Community and Collection in the database.
+ * Insert a 'dc.identifier.uri' metadata record for each Community and Collection in the database.
  * The value is calculated concatenating the canonicalPrefix extracted from the configuration
  * (default is "http://hdl.handle.net/) and the object's handle suffix stored inside the handle table.
  *
diff --git a/dspace-api/src/main/java/org/dspace/storage/rdbms/xmlworkflow/V5_0_2014_11_04__Enable_XMLWorkflow_Migration.java b/dspace-api/src/main/java/org/dspace/storage/rdbms/xmlworkflow/V5_0_2014_11_04__Enable_XMLWorkflow_Migration.java
index 0361e68053..d461da4d2d 100644
--- a/dspace-api/src/main/java/org/dspace/storage/rdbms/xmlworkflow/V5_0_2014_11_04__Enable_XMLWorkflow_Migration.java
+++ b/dspace-api/src/main/java/org/dspace/storage/rdbms/xmlworkflow/V5_0_2014_11_04__Enable_XMLWorkflow_Migration.java
@@ -14,8 +14,6 @@ import org.dspace.storage.rdbms.DatabaseUtils;
 import org.dspace.storage.rdbms.migration.MigrationUtils;
 import org.flywaydb.core.api.migration.BaseJavaMigration;
 import org.flywaydb.core.api.migration.Context;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class automatically migrates your DSpace Database to use the
@@ -35,11 +33,6 @@ import org.slf4j.LoggerFactory;
  */
 public class V5_0_2014_11_04__Enable_XMLWorkflow_Migration
     extends BaseJavaMigration {
-    /**
-     * logging category
-     */
-    private static final Logger log = LoggerFactory.getLogger(V5_0_2014_11_04__Enable_XMLWorkflow_Migration.class);
-
     // Size of migration script run
     Integer migration_file_size = -1;
 
diff --git a/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java b/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
index a6421b3f7a..757a01cb1c 100644
--- a/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
+++ b/dspace-api/src/main/java/org/dspace/submit/model/UploadConfiguration.java
@@ -8,8 +8,8 @@
 package org.dspace.submit.model;
 
 import java.util.List;
-import javax.inject.Inject;
 
+import jakarta.inject.Inject;
 import org.dspace.services.ConfigurationService;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/supervision/SupervisionOrder.java b/dspace-api/src/main/java/org/dspace/supervision/SupervisionOrder.java
index 52d5dacb74..6b447361ef 100644
--- a/dspace-api/src/main/java/org/dspace/supervision/SupervisionOrder.java
+++ b/dspace-api/src/main/java/org/dspace/supervision/SupervisionOrder.java
@@ -7,17 +7,16 @@
  */
 package org.dspace.supervision;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
diff --git a/dspace-api/src/main/java/org/dspace/supervision/dao/impl/SupervisionOrderDaoImpl.java b/dspace-api/src/main/java/org/dspace/supervision/dao/impl/SupervisionOrderDaoImpl.java
index 09cd0841e7..ac056d5530 100644
--- a/dspace-api/src/main/java/org/dspace/supervision/dao/impl/SupervisionOrderDaoImpl.java
+++ b/dspace-api/src/main/java/org/dspace/supervision/dao/impl/SupervisionOrderDaoImpl.java
@@ -9,10 +9,10 @@ package org.dspace.supervision.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/usage/TabFileUsageEventListener.java b/dspace-api/src/main/java/org/dspace/usage/TabFileUsageEventListener.java
index dc1aeb56c9..9ed663c39d 100644
--- a/dspace-api/src/main/java/org/dspace/usage/TabFileUsageEventListener.java
+++ b/dspace-api/src/main/java/org/dspace/usage/TabFileUsageEventListener.java
@@ -15,16 +15,16 @@ import java.io.PrintWriter;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.core.Constants;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.model.Event;
 import org.dspace.utils.DSpace;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
- * Serialize {@link UsageEvent} data to a file as Tab delimited. In dspace.cfg
- * specify the path to the file as the value of
+ * Serialize {@link UsageEvent} data to a file as Tab delimited.
+ * In {@code dspace.cfg} specify the path to the file as the value of
  * {@code usageEvent.tabFileLogger.file}.  If that path is not absolute, it
  * will be interpreted as relative to the directory named in {@code log.dir}.
  * If no name is configured, it defaults to "usage-events.tsv".  If the file is
@@ -38,8 +38,7 @@ public class TabFileUsageEventListener
     /**
      * log category.
      */
-    private static final Logger errorLog = LoggerFactory
-        .getLogger(TabFileUsageEventListener.class);
+    private static final Logger errorLog = LogManager.getLogger();
 
     /**
      * ISO 8601 Basic string format for record timestamps.
@@ -77,11 +76,11 @@ public class TabFileUsageEventListener
         try {
             eventLog = new PrintWriter(new OutputStreamWriter(
                 new FileOutputStream(logFile, true)));
-            errorLog.debug("Writing to {}", logFile.getAbsolutePath());
+            errorLog.debug("Writing to {}", logFile::getAbsolutePath);
         } catch (FileNotFoundException e) {
             errorLog.error("{} cannot open file, will not log events:  {}",
-                           TabFileUsageEventListener.class.getName(),
-                           e.getMessage());
+                           TabFileUsageEventListener.class::getName,
+                           e::getMessage);
             throw new IllegalArgumentException("Cannot open event log file", e);
         }
 
@@ -104,9 +103,7 @@ public class TabFileUsageEventListener
             init();
         }
 
-        if (errorLog.isDebugEnabled()) {
-            errorLog.debug("got: {}", event.toString());
-        }
+        errorLog.debug("got: {}", event::toString);
 
         if (!(event instanceof UsageEvent)) {
             return;
diff --git a/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java b/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
index ec9a2b1264..90dd9e47e2 100644
--- a/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
+++ b/dspace-api/src/main/java/org/dspace/usage/UsageEvent.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.usage;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/usage/UsageSearchEvent.java b/dspace-api/src/main/java/org/dspace/usage/UsageSearchEvent.java
index 938f9e7984..f285a4f90a 100644
--- a/dspace-api/src/main/java/org/dspace/usage/UsageSearchEvent.java
+++ b/dspace-api/src/main/java/org/dspace/usage/UsageSearchEvent.java
@@ -8,8 +8,8 @@
 package org.dspace.usage;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
 
diff --git a/dspace-api/src/main/java/org/dspace/util/DSpacePostgreSQLDialect.java b/dspace-api/src/main/java/org/dspace/util/DSpacePostgreSQLDialect.java
new file mode 100644
index 0000000000..8b982d4544
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/util/DSpacePostgreSQLDialect.java
@@ -0,0 +1,50 @@
+/**
+ * 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.util;
+
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.type.BasicTypeRegistry;
+import org.hibernate.type.StandardBasicTypes;
+
+/**
+ * PostgreSQL-specific dialect that adds regular expression support as a JPA function.
+ * @see org.dspace.contentreport.QueryOperator
+ * @author Jean-François Morin (Université Laval)
+ */
+public class DSpacePostgreSQLDialect extends PostgreSQLDialect {
+
+    public static final String REGEX_MATCHES = "matches";
+    public static final String REGEX_IMATCHES = "imatches";
+    public static final String REGEX_NOT_MATCHES = "not_matches";
+    public static final String REGEX_NOT_IMATCHES = "not_imatches";
+
+    @Override
+    public void initializeFunctionRegistry(FunctionContributions functionContributions) {
+        super.initializeFunctionRegistry(functionContributions);
+
+        BasicTypeRegistry basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry();
+
+        functionContributions.getFunctionRegistry().registerPattern(
+            REGEX_MATCHES,
+            "?1 ~ ?2",
+            basicTypeRegistry.resolve( StandardBasicTypes.BOOLEAN ));
+        functionContributions.getFunctionRegistry().registerPattern(
+            REGEX_IMATCHES,
+            "?1 ~* ?2",
+            basicTypeRegistry.resolve( StandardBasicTypes.BOOLEAN ));
+        functionContributions.getFunctionRegistry().registerPattern(
+            REGEX_NOT_MATCHES,
+            "?1 !~ ?2",
+            basicTypeRegistry.resolve( StandardBasicTypes.BOOLEAN ));
+        functionContributions.getFunctionRegistry().registerPattern(
+            REGEX_NOT_IMATCHES,
+            "?1 !~* ?2",
+            basicTypeRegistry.resolve( StandardBasicTypes.BOOLEAN ));
+    }
+}
diff --git a/dspace-api/src/main/java/org/dspace/util/FrontendUrlService.java b/dspace-api/src/main/java/org/dspace/util/FrontendUrlService.java
index a50baf910e..d183ec7eac 100644
--- a/dspace-api/src/main/java/org/dspace/util/FrontendUrlService.java
+++ b/dspace-api/src/main/java/org/dspace/util/FrontendUrlService.java
@@ -14,6 +14,8 @@ import static org.apache.commons.lang3.StringUtils.lowerCase;
 import java.util.List;
 import java.util.Optional;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
@@ -22,18 +24,16 @@ import org.dspace.discovery.DiscoverResult;
 import org.dspace.discovery.SearchService;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.services.ConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
- * Service class for generation of front-end urls.
+ * Service class for generation of front-end URLs.
  */
 @Component
 public class FrontendUrlService {
 
-    private static final Logger log = LoggerFactory.getLogger(FrontendUrlService.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private ConfigurationService configurationService;
@@ -80,7 +80,8 @@ public class FrontendUrlService {
                 }
             }
         } catch (SearchServiceException e) {
-            log.error("Failed getting entitytype through solr for item " + item.getID() + ": " + e.getMessage());
+            log.error("Failed getting entitytype through solr for item {}:  {}",
+                    item::getID, e::getMessage);
         }
         return Optional.empty();
     }
diff --git a/dspace-api/src/main/java/org/dspace/util/JpaCriteriaBuilderKit.java b/dspace-api/src/main/java/org/dspace/util/JpaCriteriaBuilderKit.java
new file mode 100644
index 0000000000..7f74f0a728
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/util/JpaCriteriaBuilderKit.java
@@ -0,0 +1,49 @@
+/**
+ * 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.util;
+
+import jakarta.persistence.criteria.AbstractQuery;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Root;
+
+/**
+ * Data structure containing the required objects to build criteria
+ * for a JPA query built using the JPA Criteria API.
+ * The getters match those generated by the JVM when using a record
+ * so that no API changes will be required when this class gets converted
+ * into a record when DSpace gets promoted to Java 17 or later.
+ * @author Jean-François Morin (Université Laval)
+ */
+// TODO: Convert this data structure into a record when DSpace gets promoted to Java 17 or later
+public class JpaCriteriaBuilderKit<T> {
+
+    private CriteriaBuilder criteriaBuilder;
+    /** Can be a CriteriaQuery as well as a Subquery - both extend AbstractQuery. */
+    private AbstractQuery<T> query;
+    private Root<T> root;
+
+    public JpaCriteriaBuilderKit(CriteriaBuilder criteriaBuilder, AbstractQuery<T> query,
+            Root<T> root) {
+        this.criteriaBuilder = criteriaBuilder;
+        this.query = query;
+        this.root = root;
+    }
+
+    public CriteriaBuilder criteriaBuilder() {
+        return criteriaBuilder;
+    }
+
+    public AbstractQuery<T> query() {
+        return query;
+    }
+
+    public Root<T> root() {
+        return root;
+    }
+
+}
diff --git a/dspace-api/src/main/java/org/dspace/util/MultiFormatDateParser.java b/dspace-api/src/main/java/org/dspace/util/MultiFormatDateParser.java
index 87dc6d9db8..de3ef92619 100644
--- a/dspace-api/src/main/java/org/dspace/util/MultiFormatDateParser.java
+++ b/dspace-api/src/main/java/org/dspace/util/MultiFormatDateParser.java
@@ -21,11 +21,11 @@ import java.util.Map.Entry;
 import java.util.TimeZone;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
-import javax.inject.Inject;
 
+import jakarta.inject.Inject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.servicemanager.DSpaceKernelInit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Attempt to parse date strings in a variety of formats.  This uses an external
@@ -38,7 +38,7 @@ import org.slf4j.LoggerFactory;
  * @author mwood
  */
 public class MultiFormatDateParser {
-    private static final Logger log = LoggerFactory.getLogger(MultiFormatDateParser.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * A list of rules, each binding a regular expression to a date format.
@@ -70,8 +70,8 @@ public class MultiFormatDateParser {
             try {
                 pattern = Pattern.compile(rule.getKey(), Pattern.CASE_INSENSITIVE);
             } catch (PatternSyntaxException ex) {
-                log.error("Skipping format with unparseable pattern '{}'",
-                          rule.getKey());
+                log.error("Skipping format with unparsable pattern '{}'",
+                        rule::getKey);
                 continue;
             }
 
@@ -80,7 +80,7 @@ public class MultiFormatDateParser {
                 format = new SimpleDateFormat(rule.getValue());
             } catch (IllegalArgumentException ex) {
                 log.error("Skipping uninterpretable date format '{}'",
-                          rule.getValue());
+                        rule::getValue);
                 continue;
             }
             format.setCalendar(Calendar.getInstance(UTC_ZONE));
@@ -107,7 +107,7 @@ public class MultiFormatDateParser {
                     }
                 } catch (ParseException ex) {
                     log.info("Date string '{}' matched pattern '{}' but did not parse:  {}",
-                             new String[] {dateString, candidate.format.toPattern(), ex.getMessage()});
+                        () -> dateString, candidate.format::toPattern, ex::getMessage);
                     continue;
                 }
                 return result;
diff --git a/dspace-api/src/main/java/org/dspace/util/RawJsonDeserializer.java b/dspace-api/src/main/java/org/dspace/util/RawJsonDeserializer.java
new file mode 100644
index 0000000000..baadf0d283
--- /dev/null
+++ b/dspace-api/src/main/java/org/dspace/util/RawJsonDeserializer.java
@@ -0,0 +1,35 @@
+/**
+ * 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.util;
+
+import java.io.IOException;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationContext;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Extension of {@link JsonDeserializer} that convert a json to a String.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class RawJsonDeserializer extends JsonDeserializer<String> {
+
+    @Override
+    public String deserialize(JsonParser jp, DeserializationContext ctxt)
+           throws IOException, JsonProcessingException {
+
+        ObjectMapper mapper = (ObjectMapper) jp.getCodec();
+        JsonNode node = mapper.readTree(jp);
+        return mapper.writeValueAsString(node);
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java b/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java
index b23e4396e2..c132af1855 100644
--- a/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java
+++ b/dspace-api/src/main/java/org/dspace/util/SolrImportExport.java
@@ -293,7 +293,7 @@ public class SolrImportExport {
                                        + ") but usable space in export directory is only "
                                        + FileUtils.byteCountToDisplaySize(usableExportSpace)
                                        + ". Not continuing with reindex, please use the " + DIRECTORY_OPTION
-                                       + " option to specify an alternative export directy with sufficient space.");
+                                       + " option to specify an alternative export directly with sufficient space.");
                 return;
             }
 
diff --git a/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java b/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java
index 9342cb8b39..044d9792be 100644
--- a/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java
+++ b/dspace-api/src/main/java/org/dspace/util/SolrUpgradePre6xStatistics.java
@@ -78,7 +78,7 @@ public class SolrUpgradePre6xStatistics {
     private static final int    NUMREC_DEFAULT = 100000;
     private static final int    BATCH_DEFAULT = 10000;
 
-    //After processing each batch of updates to SOLR, evaulate if the hibernate cache needs to be cleared
+    //After processing each batch of updates to SOLR, evaluate if the hibernate cache needs to be cleared
     private static final int    CACHE_LIMIT = 20000;
 
     private static final String INDEX_DEFAULT = "statistics";
@@ -112,7 +112,7 @@ public class SolrUpgradePre6xStatistics {
     //Logger
     private static final Logger log = LogManager.getLogger();
 
-    //DSpace Servcies
+    //DSpace Services
     private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     protected CommunityService   communityService     = ContentServiceFactory.getInstance().getCommunityService();
     protected CollectionService  collectionService    = ContentServiceFactory.getInstance().getCollectionService();
@@ -271,7 +271,7 @@ public class SolrUpgradePre6xStatistics {
         options.addOption(HELP_OPTION, "help", false, "Get help on options for this command.");
         options.addOption(INDEX_NAME_OPTION, "index-name", true,
                 "The names of the indexes to process. At least one is required (default=statistics)");
-        options.addOption(NUMREC_OPTION, "num-rec", true, "Total number of records to update (defaut=100,000).");
+        options.addOption(NUMREC_OPTION, "num-rec", true, "Total number of records to update (default=100,000).");
         options.addOption(BATCH_OPTION, "batch-size", true,
                 "Number of records to batch update to SOLR at one time (default=10,000).");
         return options;
@@ -327,7 +327,7 @@ public class SolrUpgradePre6xStatistics {
         System.out.println(" * This process should be run iteratively over every statistics shard ");
         System.out.println(" * until there are no remaining records with legacy ids present.");
         System.out.println(" * This process can be run while the system is in use.");
-        System.out.println(" * It is likely to take 1 hour/1,000,000 legacy records to be udpated.");
+        System.out.println(" * It is likely to take 1 hour/1,000,000 legacy records to be updated.");
         System.out.println(" *");
         System.out.println(" * This process will rewrite most solr statistics records and may temporarily double ");
         System.out.println(
@@ -408,7 +408,7 @@ public class SolrUpgradePre6xStatistics {
                 } else if (id == Constants.ITEM) {
                     name = "Item " + s;
                 } else if (id == Constants.BITSTREAM) {
-                    name = "Bistream " + s;
+                    name = "Bitstream " + s;
                 } else {
                     /*
                      * In testing, I discovered some unexpected values in the scopeType field. It
@@ -479,7 +479,7 @@ public class SolrUpgradePre6xStatistics {
         sQ.setRows(batchSize);
 
         // Ensure that items are grouped by id
-        // Sort by id fails due to presense of id and string fields. The ord function
+        // Sort by id fails due to presence of id and string fields. The ord function
         // seems to help
         sQ.addSort("type", SolrQuery.ORDER.desc);
         sQ.addSort("scopeType", SolrQuery.ORDER.desc);
diff --git a/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java b/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
index 329332d315..1dae5427f8 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java
@@ -84,8 +84,8 @@ public abstract class AbstractVersionProvider {
             // DSpace knows several types of resource policies (see the class
             // org.dspace.authorize.ResourcePolicy): Submission, Workflow, Custom
             // and inherited. Submission, Workflow and Inherited policies will be
-            // set automatically as neccessary. We need to copy the custom policies
-            // only to preserve customly set policies and embargos (which are
+            // set automatically as necessary. We need to copy the custom policies
+            // only to preserve customly set policies and embargoes (which are
             // realized by custom policies with a start date).
             List<ResourcePolicy> bundlePolicies =
                 authorizeService.findPoliciesByDSOAndType(c, nativeBundle, ResourcePolicy.TYPE_CUSTOM);
diff --git a/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java b/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java
index fa89b34414..c41b985690 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/DefaultItemVersionProvider.java
@@ -72,7 +72,7 @@ public class DefaultItemVersionProvider extends AbstractVersionProvider implemen
             if (versionHistoryService.isLastVersion(c, history, versionToDelete)
                 && versioningService.getVersionsByHistory(c, history).size() > 1) {
                 // if a new version gets archived, the old one is set to false.
-                // we need to do the oposite now, if the old version was previously
+                // we need to do the opposite now, if the old version was previously
                 // unarchived. If the old version is still archived, the new
                 // version is a WorkspaceItem or WorkflowItem we should skip this,
                 // as unarchiving of previous versions is done only when a newer
@@ -116,8 +116,8 @@ public class DefaultItemVersionProvider extends AbstractVersionProvider implemen
             // DSpace knows several types of resource policies (see the class
             // org.dspace.authorize.ResourcePolicy): Submission, Workflow, Custom
             // and inherited. Submission, Workflow and Inherited policies will be
-            // set automatically as neccessary. We need to copy the custom policies
-            // only to preserve customly set policies and embargos (which are
+            // set automatically as necessary. We need to copy the custom policies
+            // only to preserve customly set policies and embargoes (which are
             // realized by custom policies with a start date).
             List<ResourcePolicy> policies =
                 authorizeService.findPoliciesByDSOAndType(c, previousItem, ResourcePolicy.TYPE_CUSTOM);
diff --git a/dspace-api/src/main/java/org/dspace/versioning/Version.java b/dspace-api/src/main/java/org/dspace/versioning/Version.java
index ee5c1c4183..ada857c1cf 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/Version.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/Version.java
@@ -8,24 +8,25 @@
 package org.dspace.versioning;
 
 import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.persistence.Temporal;
+import jakarta.persistence.TemporalType;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
-import org.hibernate.proxy.HibernateProxyHelper;
+
 
 /**
  * @author Fabio Bolognesi (fabio at atmire dot com)
diff --git a/dspace-api/src/main/java/org/dspace/versioning/VersionHistory.java b/dspace-api/src/main/java/org/dspace/versioning/VersionHistory.java
index 231ccc29d9..f207fe8d4f 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/VersionHistory.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/VersionHistory.java
@@ -10,21 +10,22 @@ package org.dspace.versioning;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OrderBy;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.apache.commons.collections4.CollectionUtils;
 import org.dspace.core.Context;
+import org.dspace.core.HibernateProxyHelper;
 import org.dspace.core.ReloadableEntity;
-import org.hibernate.proxy.HibernateProxyHelper;
+
 
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/versioning/VersioningServiceImpl.java b/dspace-api/src/main/java/org/dspace/versioning/VersioningServiceImpl.java
index ece536e81b..b9c3a524a1 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/VersioningServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/VersioningServiceImpl.java
@@ -247,7 +247,7 @@ public class VersioningServiceImpl implements VersioningService {
     protected int getNextVersionNumer(Context c, VersionHistory vh) throws SQLException {
         int next = versionDAO.getNextVersionNumber(c, vh);
 
-        // check if we have uncommited versions in DSpace's cache
+        // check if we have uncommitted versions in DSpace's cache
         if (versionHistoryService.getLatestVersion(c, vh) != null
             && versionHistoryService.getLatestVersion(c, vh).getVersionNumber() >= next) {
             next = versionHistoryService.getLatestVersion(c, vh).getVersionNumber() + 1;
diff --git a/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionDAOImpl.java b/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionDAOImpl.java
index 0e28e72d07..0ef01b8262 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionDAOImpl.java
@@ -10,11 +10,11 @@ package org.dspace.versioning.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
@@ -74,7 +74,7 @@ public class VersionDAOImpl extends AbstractHibernateDAO<Version> implements Ver
                    )
         );
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.desc(versionRoot.get(Version_.versionNumber)));
         criteriaQuery.orderBy(orderList);
 
@@ -84,9 +84,9 @@ public class VersionDAOImpl extends AbstractHibernateDAO<Version> implements Ver
     @Override
     public int countVersionsByHistoryWithItem(Context context, VersionHistory versionHistory) throws SQLException {
         Query query = createQuery(context, "SELECT count(*) FROM " + Version.class.getSimpleName()
-                + " WHERE versionhistory_id = (:versionhistoryId)"
-                + " AND  item_id IS NOT NULL");
-        query.setParameter("versionhistoryId", versionHistory);
+                + " WHERE versionHistory = :versionhistory"
+                + " AND  item IS NOT NULL");
+        query.setParameter("versionhistory", versionHistory);
         return count(query);
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionHistoryDAOImpl.java b/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionHistoryDAOImpl.java
index eac78c3e62..b71ef59f2f 100644
--- a/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionHistoryDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/versioning/dao/impl/VersionHistoryDAOImpl.java
@@ -10,11 +10,11 @@ package org.dspace.versioning.dao.impl;
 import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Item;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
@@ -47,7 +47,7 @@ public class VersionHistoryDAOImpl extends AbstractHibernateDAO<VersionHistory>
         criteriaQuery.select(versionHistoryRoot);
         criteriaQuery.where(criteriaBuilder.equal(join.get(Version_.item), item));
 
-        List<javax.persistence.criteria.Order> orderList = new LinkedList<>();
+        List<jakarta.persistence.criteria.Order> orderList = new LinkedList<>();
         orderList.add(criteriaBuilder.desc(join.get(Version_.versionNumber)));
         criteriaQuery.orderBy(orderList);
 
diff --git a/dspace-api/src/main/java/org/dspace/web/ContextUtil.java b/dspace-api/src/main/java/org/dspace/web/ContextUtil.java
index 4bdf26c053..a17d05002b 100644
--- a/dspace-api/src/main/java/org/dspace/web/ContextUtil.java
+++ b/dspace-api/src/main/java/org/dspace/web/ContextUtil.java
@@ -10,10 +10,10 @@ package org.dspace.web;
 import java.sql.SQLException;
 import java.util.Enumeration;
 import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/workflow/CurationTaskConfig.java b/dspace-api/src/main/java/org/dspace/workflow/CurationTaskConfig.java
index be870ee33e..675fbb03be 100644
--- a/dspace-api/src/main/java/org/dspace/workflow/CurationTaskConfig.java
+++ b/dspace-api/src/main/java/org/dspace/workflow/CurationTaskConfig.java
@@ -18,14 +18,14 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.validation.constraints.NotNull;
 import javax.xml.XMLConstants;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
 import javax.xml.validation.Schema;
 import javax.xml.validation.SchemaFactory;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
 import org.xml.sax.SAXException;
 
 /**
diff --git a/dspace-api/src/main/java/org/dspace/workflow/FlowStep.java b/dspace-api/src/main/java/org/dspace/workflow/FlowStep.java
index b133c51cfb..8709481834 100644
--- a/dspace-api/src/main/java/org/dspace/workflow/FlowStep.java
+++ b/dspace-api/src/main/java/org/dspace/workflow/FlowStep.java
@@ -9,7 +9,8 @@ package org.dspace.workflow;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
+
+import jakarta.validation.constraints.NotNull;
 
 /**
  * Linkage between a workflow step and some {@link org.dspace.curate.CurationTask}s.
diff --git a/dspace-api/src/main/java/org/dspace/workflow/Task.java b/dspace-api/src/main/java/org/dspace/workflow/Task.java
index 112e7c5585..94e92a6713 100644
--- a/dspace-api/src/main/java/org/dspace/workflow/Task.java
+++ b/dspace-api/src/main/java/org/dspace/workflow/Task.java
@@ -11,7 +11,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.validation.constraints.NotNull;
+
+import jakarta.validation.constraints.NotNull;
 
 /**
  * An association between a {@link org.dspace.curate.CurationTask curation task}
diff --git a/dspace-api/src/main/java/org/dspace/workflow/TaskSet.java b/dspace-api/src/main/java/org/dspace/workflow/TaskSet.java
index 951940d5bb..a077bfddbe 100644
--- a/dspace-api/src/main/java/org/dspace/workflow/TaskSet.java
+++ b/dspace-api/src/main/java/org/dspace/workflow/TaskSet.java
@@ -8,7 +8,8 @@
 package org.dspace.workflow;
 
 import java.util.List;
-import javax.validation.constraints.NotNull;
+
+import jakarta.validation.constraints.NotNull;
 
 /**
  * A collection of {@link org.dspace.curate.CurationTask curation tasks} to be
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java
index aecdccd55a..82296b38f1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowRequirementsServiceImpl.java
@@ -31,7 +31,7 @@ import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * A class that contains utililty methods related to the workflow
+ * A class that contains utility methods related to the workflow
  * The adding/removing from claimed users and ensuring that
  * if multiple users have to perform these steps that a count is kept
  * so that no more then the allowed user count are allowed to perform their actions
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java
index a81bebcd5a..b4e9f3d7f1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/WorkflowUtils.java
@@ -15,9 +15,9 @@ import java.util.Date;
 import java.util.Enumeration;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
index faf15d02c6..06ded267d1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
@@ -18,9 +18,9 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.MissingResourceException;
 import java.util.UUID;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.Logger;
@@ -416,7 +416,7 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
                 || currentOutcome.getType() == ActionResult.TYPE.TYPE_SUBMISSION_PAGE) {
             //We either pressed the cancel button or got an order to return to the submission page, so don't return
             // an action
-            //By not returning an action we ensure ourselfs that we go back to the submission page
+            //By not returning an action we ensure ourselves that we go back to the submission page
             c.restoreAuthSystemState();
             return null;
         } else if (currentOutcome.getType() == ActionResult.TYPE.TYPE_OUTCOME) {
@@ -1191,14 +1191,20 @@ public class XmlWorkflowServiceImpl implements XmlWorkflowService {
         // Create provenance description
         StringBuffer provmessage = new StringBuffer();
 
-        if (myitem.getSubmitter() != null) {
+        //behavior to generate provenance message, if set true, personal data (e.g. email) of submitter will be hidden
+        //default value false, personal data of submitter will be shown in provenance message
+        String isProvenancePrivacyActiveProperty =
+                configurationService.getProperty("metadata.privacy.dc.description.provenance", "false");
+        boolean isProvenancePrivacyActive = Boolean.parseBoolean(isProvenancePrivacyActiveProperty);
+
+        if (myitem.getSubmitter() != null && !isProvenancePrivacyActive) {
             provmessage.append("Submitted by ").append(myitem.getSubmitter().getFullName())
-                .append(" (").append(myitem.getSubmitter().getEmail()).append(") on ")
-                .append(now.toString());
+                    .append(" (").append(myitem.getSubmitter().getEmail()).append(") on ")
+                    .append(now.toString());
         } else {
             // else, null submitter
-            provmessage.append("Submitted by unknown (probably automated) on")
-                .append(now.toString());
+            provmessage.append("Submitted by unknown (probably automated or submitter hidden) on ")
+                    .append(now.toString());
         }
         if (action != null) {
             provmessage.append(" workflow start=").append(action.getProvenanceStartId()).append("\n");
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/migration/RestartWorkflow.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/migration/RestartWorkflow.java
index 8490107518..c780d66a0c 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/migration/RestartWorkflow.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/migration/RestartWorkflow.java
@@ -28,7 +28,7 @@ import org.dspace.workflow.WorkflowService;
 import org.dspace.workflow.factory.WorkflowServiceFactory;
 
 /**
- * A utility class that will send all the worklfow items
+ * A utility class that will send all the workflow items
  * back to their submitters
  *
  * @author Bram De Schouwer (bram.deschouwer at dot com)
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/service/XmlWorkflowService.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/service/XmlWorkflowService.java
index 6b03803d8a..6dce02de83 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/service/XmlWorkflowService.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/service/XmlWorkflowService.java
@@ -10,9 +10,9 @@ package org.dspace.xmlworkflow.service;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/Action.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/Action.java
index 1cfa33b121..f16ef419e7 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/Action.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/Action.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.DCDate;
 import org.dspace.content.MetadataSchemaEnum;
@@ -229,7 +229,7 @@ public abstract class Action {
      * Adds info in the metadata field dc.description.provenance about item being approved containing in which step
      * it was approved, which user approved it and the time
      *
-     * @param c   DSpace contect
+     * @param c   DSpace contact
      * @param wfi Workflow item we're adding workflow accept provenance on
      */
     public void addApprovedProvenance(Context c, XmlWorkflowItem wfi) throws SQLException, AuthorizeException {
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/AcceptEditRejectAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/AcceptEditRejectAction.java
index 67b400c659..b55df1a5db 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/AcceptEditRejectAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/AcceptEditRejectAction.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.util.Util;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/FinalEditAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/FinalEditAction.java
index 9b83be5d7b..b287d0c3d1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/FinalEditAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/FinalEditAction.java
@@ -10,8 +10,8 @@ package org.dspace.xmlworkflow.state.actions.processingaction;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.util.Util;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ProcessingAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ProcessingAction.java
index 7a1c62adbd..6a41f40398 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ProcessingAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ProcessingAction.java
@@ -9,8 +9,8 @@ package org.dspace.xmlworkflow.state.actions.processingaction;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ReviewAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ReviewAction.java
index bd74ab3c71..ad2cbe06b1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ReviewAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ReviewAction.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.util.Util;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreEvaluationAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreEvaluationAction.java
index 16d35b3668..c8fd3ecb66 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreEvaluationAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreEvaluationAction.java
@@ -14,8 +14,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreReviewAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreReviewAction.java
index 43a3decacc..a8ed4fd3da 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreReviewAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/ScoreReviewAction.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SelectReviewerAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SelectReviewerAction.java
index 0e8ab40a52..4adeb127ea 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SelectReviewerAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SelectReviewerAction.java
@@ -12,9 +12,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java
index b3fe896ace..64e0957b65 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/processingaction/SingleUserReviewAction.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.Util;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignAction.java
index e837a8a893..4d645ae6a5 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignAction.java
@@ -10,8 +10,8 @@ package org.dspace.xmlworkflow.state.actions.userassignment;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.xmlworkflow.RoleMembers;
 import org.dspace.xmlworkflow.WorkflowConfigurationException;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java
index 0cd82fe770..79e2ffc900 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AssignOriginalSubmitterAction.java
@@ -12,9 +12,9 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AutoAssignAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AutoAssignAction.java
index 401a7c506b..cf3ceff575 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AutoAssignAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/AutoAssignAction.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java
index 21fcf6f309..385d6feea6 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/ClaimAction.java
@@ -11,9 +11,9 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/InheritUsersAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/InheritUsersAction.java
index 1ffce1afdb..25be8da25c 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/InheritUsersAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/InheritUsersAction.java
@@ -10,8 +10,8 @@ package org.dspace.xmlworkflow.state.actions.userassignment;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.xmlworkflow.RoleMembers;
 import org.dspace.xmlworkflow.WorkflowConfigurationException;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/NoUserSelectionAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/NoUserSelectionAction.java
index d23a98cedb..9606892554 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/NoUserSelectionAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/NoUserSelectionAction.java
@@ -9,8 +9,8 @@ package org.dspace.xmlworkflow.state.actions.userassignment;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.xmlworkflow.RoleMembers;
 import org.dspace.xmlworkflow.state.Step;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/UserSelectionAction.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/UserSelectionAction.java
index 6a0d3e9ca6..f405242aab 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/UserSelectionAction.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/state/actions/userassignment/UserSelectionAction.java
@@ -9,8 +9,8 @@ package org.dspace.xmlworkflow.state.actions.userassignment;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
@@ -88,7 +88,7 @@ public abstract class UserSelectionAction extends Action {
         throws WorkflowConfigurationException, SQLException;
 
     /**
-     * A boolean indicating wether or not the task pool is used for this type of user selection
+     * A boolean indicating whether or not the task pool is used for this type of user selection
      *
      * @return a boolean
      */
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/ClaimedTask.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/ClaimedTask.java
index 8f4794cb3b..adaf0ec06e 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/ClaimedTask.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/ClaimedTask.java
@@ -7,17 +7,16 @@
  */
 package org.dspace.xmlworkflow.storedcomponents;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
@@ -44,18 +43,12 @@ public class ClaimedTask implements ReloadableEntity<Integer> {
     @JoinColumn(name = "workflowitem_id")
     private XmlWorkflowItem workflowItem;
 
-    //    @Column(name = "workflow_id")
-//    @Lob
     @Column(name = "workflow_id", columnDefinition = "text")
     private String workflowId;
 
-    //    @Column(name = "step_id")
-//    @Lob
     @Column(name = "step_id", columnDefinition = "text")
     private String stepId;
 
-    //    @Column(name = "action_id")
-//    @Lob
     @Column(name = "action_id", columnDefinition = "text")
     private String actionId;
 
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/CollectionRole.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/CollectionRole.java
index c9a7995e03..4cbaf1c411 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/CollectionRole.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/CollectionRole.java
@@ -8,17 +8,17 @@
 package org.dspace.xmlworkflow.storedcomponents;
 
 import java.sql.SQLException;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.Collection;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
@@ -44,8 +44,6 @@ public class CollectionRole implements ReloadableEntity<Integer> {
     @SequenceGenerator(name = "cwf_collectionrole_seq", sequenceName = "cwf_collectionrole_seq", allocationSize = 1)
     private Integer id;
 
-    //    @Column(name = "role_id")
-    //    @Lob
     @Column(name = "role_id", columnDefinition = "text")
     private String roleId;
 
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/InProgressUser.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/InProgressUser.java
index efbd26bde5..38f410566d 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/InProgressUser.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/InProgressUser.java
@@ -7,17 +7,16 @@
  */
 package org.dspace.xmlworkflow.storedcomponents;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTask.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTask.java
index 9cfc9ea068..0c6b01f5c1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTask.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTask.java
@@ -7,18 +7,17 @@
  */
 package org.dspace.xmlworkflow.storedcomponents;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
@@ -46,18 +45,12 @@ public class PoolTask implements ReloadableEntity<Integer> {
     @JoinColumn(name = "workflowitem_id")
     private XmlWorkflowItem workflowItem;
 
-    //    @Column(name = "workflow_id")
-//    @Lob
     @Column(name = "workflow_id", columnDefinition = "text")
     private String workflowId;
 
-    //    @Column(name = "step_id")
-//    @Lob
     @Column(name = "step_id", columnDefinition = "text")
     private String stepId;
 
-    //    @Column(name = "action_id")
-//    @Lob
     @Column(name = "action_id", columnDefinition = "text")
     private String actionId;
 
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java
index fb673725e1..d3c8f6334d 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/PoolTaskServiceImpl.java
@@ -13,6 +13,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -100,12 +101,17 @@ public class PoolTaskServiceImpl implements PoolTaskService {
                 //If the user does not have a claimedtask yet, see whether one of the groups of the user has pooltasks
                 //for this workflow item
                 Set<Group> groups = groupService.allMemberGroupsSet(context, ePerson);
-                for (Group group : groups) {
-                    poolTask = poolTaskDAO.findByWorkflowItemAndGroup(context, group, workflowItem);
-                    if (poolTask != null) {
-                        return poolTask;
-                    }
+                List<PoolTask> generalTasks = poolTaskDAO.findByWorkflowItem(context, workflowItem);
 
+                Optional<PoolTask> firstClaimedTask = groups.stream()
+                        .flatMap(group -> generalTasks.stream()
+                                .filter(f -> f.getGroup().getID().equals(group.getID()))
+                                .findFirst()
+                                .stream())
+                        .findFirst();
+
+                if (firstClaimedTask.isPresent()) {
+                    return firstClaimedTask.get();
                 }
             }
         }
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/WorkflowItemRole.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/WorkflowItemRole.java
index cc6df9731b..a0d46c27d1 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/WorkflowItemRole.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/WorkflowItemRole.java
@@ -8,17 +8,17 @@
 package org.dspace.xmlworkflow.storedcomponents;
 
 import java.sql.SQLException;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.core.Context;
 import org.dspace.core.ReloadableEntity;
 import org.dspace.eperson.EPerson;
@@ -44,8 +44,6 @@ public class WorkflowItemRole implements ReloadableEntity<Integer> {
     @SequenceGenerator(name = "cwf_workflowitemrole_seq", sequenceName = "cwf_workflowitemrole_seq", allocationSize = 1)
     private Integer id;
 
-    //    @Column(name = "role_id")
-//    @Lob
     @Column(name = "role_id", columnDefinition = "text")
     private String roleId;
 
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java
index f6ffe6049a..529a35bda3 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java
@@ -7,18 +7,17 @@
  */
 package org.dspace.xmlworkflow.storedcomponents;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToOne;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/ClaimedTaskDAOImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/ClaimedTaskDAOImpl.java
index 956a4648c5..70fe74de8a 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/ClaimedTaskDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/ClaimedTaskDAOImpl.java
@@ -9,10 +9,10 @@ package org.dspace.xmlworkflow.storedcomponents.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/CollectionRoleDAOImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/CollectionRoleDAOImpl.java
index b3cd32c74f..5c19fd5a8e 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/CollectionRoleDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/CollectionRoleDAOImpl.java
@@ -9,11 +9,11 @@ package org.dspace.xmlworkflow.storedcomponents.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.Query;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Collection;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/InProgressUserDAOImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/InProgressUserDAOImpl.java
index 783d403c05..a02a947e2c 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/InProgressUserDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/InProgressUserDAOImpl.java
@@ -9,10 +9,10 @@ package org.dspace.xmlworkflow.storedcomponents.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
@@ -78,7 +78,7 @@ public class InProgressUserDAOImpl extends AbstractHibernateDAO<InProgressUser>
         CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
 
         Root<InProgressUser> inProgressUserRoot = criteriaQuery.from(InProgressUser.class);
-
+        criteriaQuery.select(criteriaBuilder.count(inProgressUserRoot));
         criteriaQuery.where(criteriaBuilder.and(
             criteriaBuilder.equal(inProgressUserRoot.get(InProgressUser_.workflowItem), workflowItem),
             criteriaBuilder.equal(inProgressUserRoot.get(InProgressUser_.finished), false)
@@ -94,7 +94,7 @@ public class InProgressUserDAOImpl extends AbstractHibernateDAO<InProgressUser>
         CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
 
         Root<InProgressUser> inProgressUserRoot = criteriaQuery.from(InProgressUser.class);
-
+        criteriaQuery.select(criteriaBuilder.count(inProgressUserRoot));
         criteriaQuery.where(criteriaBuilder.and(
             criteriaBuilder.equal(inProgressUserRoot.get(InProgressUser_.workflowItem), workflowItem),
             criteriaBuilder.equal(inProgressUserRoot.get(InProgressUser_.finished), true)
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/PoolTaskDAOImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/PoolTaskDAOImpl.java
index 0857a325b5..2e95c2f9d0 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/PoolTaskDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/PoolTaskDAOImpl.java
@@ -9,10 +9,10 @@ package org.dspace.xmlworkflow.storedcomponents.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/WorkflowItemRoleDAOImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/WorkflowItemRoleDAOImpl.java
index fdc2413b5f..6dc2fc9601 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/WorkflowItemRoleDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/WorkflowItemRoleDAOImpl.java
@@ -9,10 +9,10 @@ package org.dspace.xmlworkflow.storedcomponents.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import org.dspace.core.AbstractHibernateDAO;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/XmlWorkflowItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/XmlWorkflowItemDAOImpl.java
index 659a2123d9..8994efae1a 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/XmlWorkflowItemDAOImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/dao/impl/XmlWorkflowItemDAOImpl.java
@@ -9,11 +9,11 @@ package org.dspace.xmlworkflow.storedcomponents.dao.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.Root;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Join;
+import jakarta.persistence.criteria.Root;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.content.Item_;
@@ -66,12 +66,11 @@ public class XmlWorkflowItemDAOImpl extends AbstractHibernateDAO<XmlWorkflowItem
 
     @Override
     public int countAllInCollection(Context context, Collection collection) throws SQLException {
-
-
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
 
         Root<XmlWorkflowItem> xmlWorkflowItemRoot = criteriaQuery.from(XmlWorkflowItem.class);
+        criteriaQuery.select(criteriaBuilder.count(xmlWorkflowItemRoot));
         if (collection != null) {
             criteriaQuery.where(criteriaBuilder.equal(xmlWorkflowItemRoot.get(XmlWorkflowItem_.collection),
                                                       collection));
@@ -109,7 +108,8 @@ public class XmlWorkflowItemDAOImpl extends AbstractHibernateDAO<XmlWorkflowItem
         CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context);
         CriteriaQuery<Long> criteriaQuery = criteriaBuilder.createQuery(Long.class);
         Root<XmlWorkflowItem> xmlWorkflowItemRoot = criteriaQuery.from(XmlWorkflowItem.class);
-        Join<XmlWorkflowItem, Item> join = xmlWorkflowItemRoot.join("item");
+        criteriaQuery.select(criteriaBuilder.count(xmlWorkflowItemRoot));
+        Join<XmlWorkflowItem, Item> join = xmlWorkflowItemRoot.join(XmlWorkflowItem_.item);
         criteriaQuery.where(criteriaBuilder.equal(join.get(Item_.submitter), ep));
         return count(context, criteriaQuery, criteriaBuilder, xmlWorkflowItemRoot);
     }
diff --git a/dspace-api/src/main/resources/Messages.properties b/dspace-api/src/main/resources/Messages.properties
index efbbeedde0..3304e8ce8d 100644
--- a/dspace-api/src/main/resources/Messages.properties
+++ b/dspace-api/src/main/resources/Messages.properties
@@ -50,8 +50,6 @@ metadata.bitstream.iiif-virtual.mimetype         = Mime Type
 metadata.bitstream.iiif-virtual.bytes            = File size
 metadata.bitstream.iiif-virtual.checksum         = Checksum
 
-org.dspace.app.itemexport.no-result = The DSpaceObject that you specified has no items.
-org.dspace.app.util.SyndicationFeed.no-description = No Description
 org.dspace.checker.ResultsLogger.bitstream-format                               = Bitstream format
 org.dspace.checker.ResultsLogger.bitstream-found                                = Bitstream found
 org.dspace.checker.ResultsLogger.bitstream-id                                   = Bitstream ID
@@ -99,9 +97,9 @@ org.dspace.checker.SimpleReporterImpl.result
 org.dspace.checker.SimpleReporterImpl.size                                      = Size
 org.dspace.checker.SimpleReporterImpl.source                                    = Source
 org.dspace.checker.SimpleReporterImpl.store-number                              = Store Number
-org.dspace.checker.SimpleReporterImpl.unchecked-bitstream-report                = The following is a UN-CHECKED BITSTREAM REPORT report for
+org.dspace.checker.SimpleReporterImpl.unchecked-bitstream-report                = The following is a UN-CHECKED BITSTREAM report for
+
 org.dspace.content.untitled                                                     = Untitled
-org.dspace.eperson.X509Authentication.title                                     = Enter DSpace using Web Certificate
 org.dspace.eperson.Subscribe.authors                                            = Authors:
 org.dspace.eperson.Subscribe.id                                                 = ID:
 org.dspace.eperson.Subscribe.new-items                                          = New Items:
@@ -109,11 +107,10 @@ org.dspace.eperson.Subscribe.title
 org.dspace.statistics.util.LocationUtils.unknown-continent                      = Unknown Continent
 org.dspace.statistics.util.LocationUtils.unknown-country                        = Unknown Country
 org.dspace.xmlworkflow.XMLWorkflowService.untitled                              = Untitled
-# used by discovery (standard sort index <metadata>_sort)
-search.sort-by.dc.title_sort                                                    = Title
-# used by discovery (date sort index <metadata>_dt)
-search.sort-by.dc.date.issued_dt                                                = Issue Date
+
+org.dspace.app.itemexport.no-result                                             = The DSpace object that you specified has no items.
 org.dspace.app.requestitem.RequestItemHelpdeskStrategy.helpdeskname             = Help Desk
+org.dspace.app.util.SyndicationFeed.no-description                              = No Description
 
 # User exposed REST API error messages
 org.dspace.app.rest.exception.RESTEmptyWorkflowGroupException.message = Refused to delete user {0} because it is the only member of the \
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V8.0_2023.08.07__qaevent_processed.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V8.0_2023.08.07__qaevent_processed.sql
new file mode 100644
index 0000000000..467de85f85
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V8.0_2023.08.07__qaevent_processed.sql
@@ -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/
+--
+
+CREATE TABLE qaevent_processed (
+  qaevent_id VARCHAR(255) NOT NULL,
+  qaevent_timestamp TIMESTAMP NULL,
+  eperson_uuid UUID NULL REFERENCES eperson(uuid),
+  item_uuid uuid NOT NULL REFERENCES item(uuid)
+);
+
+CREATE INDEX item_uuid_idx ON qaevent_processed(item_uuid);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V8.0_2024.02.14__ldn_tables.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V8.0_2024.02.14__ldn_tables.sql
new file mode 100644
index 0000000000..f5ea59254f
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/h2/V8.0_2024.02.14__ldn_tables.sql
@@ -0,0 +1,90 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- CREATE notifyservice table
+-----------------------------------------------------------------------------------
+
+
+CREATE SEQUENCE if NOT EXISTS notifyservice_id_seq;
+
+CREATE TABLE notifyservice (
+    id INTEGER PRIMARY KEY,
+    name VARCHAR(255),
+    description TEXT,
+    url VARCHAR(255),
+    ldn_url VARCHAR(255),
+    enabled BOOLEAN NOT NULL,
+    score NUMERIC(6, 5),
+    lower_ip VARCHAR(45),
+    upper_ip VARCHAR(45),
+    CONSTRAINT ldn_url_unique UNIQUE (ldn_url)
+);
+
+-----------------------------------------------------------------------------------
+-- CREATE notifyservice_inbound_pattern_id_seq table
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE if NOT EXISTS notifyservice_inbound_pattern_id_seq;
+
+CREATE TABLE notifyservice_inbound_pattern (
+    id INTEGER PRIMARY KEY,
+    service_id INTEGER REFERENCES notifyservice(id) ON DELETE CASCADE,
+    pattern VARCHAR(255),
+    constraint_name VARCHAR(255),
+    automatic BOOLEAN
+);
+
+CREATE INDEX notifyservice_inbound_idx ON notifyservice_inbound_pattern (service_id);
+
+
+-------------------------------------------------------------------------------
+-- Table to store LDN messages
+-------------------------------------------------------------------------------
+
+CREATE TABLE ldn_message
+(
+  id VARCHAR(255) PRIMARY KEY,
+  object uuid,
+  message TEXT,
+  type VARCHAR(255),
+  origin INTEGER,
+  target INTEGER,
+  inReplyTo VARCHAR(255),
+  context uuid,
+  activity_stream_type VARCHAR(255),
+  coar_notify_type VARCHAR(255),
+  queue_status INTEGER DEFAULT NULL,
+  queue_attempts INTEGER DEFAULT 0,
+  queue_last_start_time TIMESTAMP,
+  queue_timeout TIMESTAMP,
+  source_ip VARCHAR(45),
+  FOREIGN KEY (object) REFERENCES dspaceobject (uuid) ON DELETE SET NULL,
+  FOREIGN KEY (context) REFERENCES dspaceobject (uuid) ON DELETE SET NULL,
+  FOREIGN KEY (origin) REFERENCES notifyservice (id) ON DELETE SET NULL,
+  FOREIGN KEY (target) REFERENCES notifyservice (id) ON DELETE SET NULL,
+  FOREIGN KEY (inReplyTo) REFERENCES ldn_message (id) ON DELETE SET NULL
+);
+
+
+-------------------------------------------------------------------------------
+-- Table to store notify patterns that will be triggered
+-------------------------------------------------------------------------------
+
+CREATE SEQUENCE if NOT EXISTS notifypatterns_to_trigger_id_seq;
+
+CREATE TABLE notifypatterns_to_trigger
+(
+  id INTEGER PRIMARY KEY,
+  item_id UUID REFERENCES Item(uuid) ON DELETE CASCADE,
+  service_id INTEGER REFERENCES notifyservice(id) ON DELETE CASCADE,
+  pattern VARCHAR(255)
+);
+
+CREATE INDEX notifypatterns_to_trigger_item_idx ON notifypatterns_to_trigger (item_id);
+CREATE INDEX notifypatterns_to_trigger_service_idx ON notifypatterns_to_trigger (service_id);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V8.0_2023.08.07__qaevent_processed.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V8.0_2023.08.07__qaevent_processed.sql
new file mode 100644
index 0000000000..5c3f0fac73
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V8.0_2023.08.07__qaevent_processed.sql
@@ -0,0 +1,19 @@
+--
+-- The contents of this file are subject to the license and copyright
+-- detailed in the LICENSE and NOTICE files at the root of the source
+-- tree and available online at
+--
+-- http://www.dspace.org/license/
+--
+
+CREATE TABLE qaevent_processed (
+  qaevent_id VARCHAR(255) NOT NULL,
+  qaevent_timestamp TIMESTAMP NULL,
+  eperson_uuid UUID NULL,
+  item_uuid UUID NULL,
+  CONSTRAINT qaevent_pk PRIMARY KEY (qaevent_id),
+  CONSTRAINT eperson_uuid_fkey FOREIGN KEY (eperson_uuid) REFERENCES eperson (uuid),
+  CONSTRAINT item_uuid_fkey FOREIGN KEY (item_uuid) REFERENCES item (uuid)
+);
+
+CREATE INDEX item_uuid_idx ON qaevent_processed(item_uuid);
diff --git a/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V8.0_2024.02.14__ldn_tables.sql b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V8.0_2024.02.14__ldn_tables.sql
new file mode 100644
index 0000000000..f5ea59254f
--- /dev/null
+++ b/dspace-api/src/main/resources/org/dspace/storage/rdbms/sqlmigration/postgres/V8.0_2024.02.14__ldn_tables.sql
@@ -0,0 +1,90 @@
+--
+-- 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/
+--
+
+-----------------------------------------------------------------------------------
+-- CREATE notifyservice table
+-----------------------------------------------------------------------------------
+
+
+CREATE SEQUENCE if NOT EXISTS notifyservice_id_seq;
+
+CREATE TABLE notifyservice (
+    id INTEGER PRIMARY KEY,
+    name VARCHAR(255),
+    description TEXT,
+    url VARCHAR(255),
+    ldn_url VARCHAR(255),
+    enabled BOOLEAN NOT NULL,
+    score NUMERIC(6, 5),
+    lower_ip VARCHAR(45),
+    upper_ip VARCHAR(45),
+    CONSTRAINT ldn_url_unique UNIQUE (ldn_url)
+);
+
+-----------------------------------------------------------------------------------
+-- CREATE notifyservice_inbound_pattern_id_seq table
+-----------------------------------------------------------------------------------
+
+CREATE SEQUENCE if NOT EXISTS notifyservice_inbound_pattern_id_seq;
+
+CREATE TABLE notifyservice_inbound_pattern (
+    id INTEGER PRIMARY KEY,
+    service_id INTEGER REFERENCES notifyservice(id) ON DELETE CASCADE,
+    pattern VARCHAR(255),
+    constraint_name VARCHAR(255),
+    automatic BOOLEAN
+);
+
+CREATE INDEX notifyservice_inbound_idx ON notifyservice_inbound_pattern (service_id);
+
+
+-------------------------------------------------------------------------------
+-- Table to store LDN messages
+-------------------------------------------------------------------------------
+
+CREATE TABLE ldn_message
+(
+  id VARCHAR(255) PRIMARY KEY,
+  object uuid,
+  message TEXT,
+  type VARCHAR(255),
+  origin INTEGER,
+  target INTEGER,
+  inReplyTo VARCHAR(255),
+  context uuid,
+  activity_stream_type VARCHAR(255),
+  coar_notify_type VARCHAR(255),
+  queue_status INTEGER DEFAULT NULL,
+  queue_attempts INTEGER DEFAULT 0,
+  queue_last_start_time TIMESTAMP,
+  queue_timeout TIMESTAMP,
+  source_ip VARCHAR(45),
+  FOREIGN KEY (object) REFERENCES dspaceobject (uuid) ON DELETE SET NULL,
+  FOREIGN KEY (context) REFERENCES dspaceobject (uuid) ON DELETE SET NULL,
+  FOREIGN KEY (origin) REFERENCES notifyservice (id) ON DELETE SET NULL,
+  FOREIGN KEY (target) REFERENCES notifyservice (id) ON DELETE SET NULL,
+  FOREIGN KEY (inReplyTo) REFERENCES ldn_message (id) ON DELETE SET NULL
+);
+
+
+-------------------------------------------------------------------------------
+-- Table to store notify patterns that will be triggered
+-------------------------------------------------------------------------------
+
+CREATE SEQUENCE if NOT EXISTS notifypatterns_to_trigger_id_seq;
+
+CREATE TABLE notifypatterns_to_trigger
+(
+  id INTEGER PRIMARY KEY,
+  item_id UUID REFERENCES Item(uuid) ON DELETE CASCADE,
+  service_id INTEGER REFERENCES notifyservice(id) ON DELETE CASCADE,
+  pattern VARCHAR(255)
+);
+
+CREATE INDEX notifypatterns_to_trigger_item_idx ON notifypatterns_to_trigger (item_id);
+CREATE INDEX notifypatterns_to_trigger_service_idx ON notifypatterns_to_trigger (service_id);
diff --git a/dspace-api/src/main/resources/org/dspace/workflow/workflow-curation.xsd b/dspace-api/src/main/resources/org/dspace/workflow/workflow-curation.xsd
index 184ee4bfb6..3c56e2a323 100644
--- a/dspace-api/src/main/resources/org/dspace/workflow/workflow-curation.xsd
+++ b/dspace-api/src/main/resources/org/dspace/workflow/workflow-curation.xsd
@@ -11,9 +11,9 @@
 <xsd:schema targetNamespace='https://dspace.org/workflow-curation'
             elementFormDefault='qualified'
             xmlns:xsd='http://www.w3.org/2001/XMLSchema'
-            xmlns:jaxb='http://java.sun.com/xml/ns/jaxb'
+            xmlns:jaxb='https://jakarta.ee/xml/ns/jaxb'
             xmlns='https://dspace.org/workflow-curation'
-            jaxb:version='2.1'>
+            jaxb:version='3.0'>
     <xsd:annotation>
 	<xsd:documentation>
 	    Workflow curation enables curation tasks to be assigned to
diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
index 6b0ef3e9b9..f7943fb232 100644
--- a/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
+++ b/dspace-api/src/main/resources/spring/spring-dspace-addon-import-services.xml
@@ -30,10 +30,24 @@
                 <ref bean="csvImportService" />
                 <ref bean="tsvImportService" />
                 <ref bean="endnoteImportService" />
+                <ref bean="DoiImportService" />
             </list>
          </property>
     </bean>
 
+    <bean id="DoiImportService"
+          class="org.dspace.importer.external.MultipleParallelImportMetadataSourceServiceImpl" scope="singleton">
+        <constructor-arg name="innerProviders">
+            <list>
+                <ref bean="CrossRefImportService"/>
+                <ref bean="DataCiteImportService"/>
+            </list>
+        </constructor-arg>
+        <constructor-arg name="sourceName">
+            <value>doi</value>
+        </constructor-arg>
+    </bean>
+
     <bean id="DataCiteImportService"
           class="org.dspace.importer.external.datacite.DataCiteImportMetadataSourceServiceImpl" scope="singleton">
         <property name="metadataFieldMapping" ref="DataCiteMetadataFieldMapping"/>
@@ -123,6 +137,20 @@
           </property>
     </bean>
 
+    <bean id="openaireImportServiceByAuthor"
+          class="org.dspace.importer.external.openaire.service.OpenAireImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="openairePublicationMetadataFieldMapping"/>
+        <property name="queryParam" value="author"/>
+    </bean>
+    <bean id="openaireImportServiceByTitle"
+          class="org.dspace.importer.external.openaire.service.OpenAireImportMetadataSourceServiceImpl" scope="singleton">
+        <property name="metadataFieldMapping" ref="openairePublicationMetadataFieldMapping"/>
+        <property name="queryParam" value="title"/>
+    </bean>
+    <bean id="openairePublicationMetadataFieldMapping"
+          class="org.dspace.importer.external.openaire.metadatamapping.OpenAIREPublicationFieldMapping">
+    </bean>
+    
     <bean id="CrossRefImportService" class="org.dspace.importer.external.crossref.CrossRefImportMetadataSourceServiceImpl" scope="singleton">
         <property name="metadataFieldMapping" ref="CrossRefMetadataFieldMapping"/>
         <property name="url" value="${crossref.url}"/>
@@ -150,6 +178,12 @@
         <property name="viewMode" value="${scopus.search-api.viewMode}"/>
     </bean>
     <bean id="scopusMetadataFieldMapping" class="org.dspace.importer.external.scopus.service.ScopusFieldMapping"/>
+    
+    <bean id="rorImportService" class="org.dspace.importer.external.ror.service.RorImportMetadataSourceServiceImpl">
+          <property name="metadataFieldMapping" ref="rorMetadataFieldMapping"/>
+          <property name="url" value="${ror.orgunit-import.api-url}"/>
+    </bean>
+    <bean id="rorMetadataFieldMapping" class="org.dspace.importer.external.ror.service.RorFieldMapping"/>
 
     <bean id="vufindImportService" class="org.dspace.importer.external.vufind.VuFindImportMetadataSourceServiceImpl" scope="singleton">
           <!-- Set to empty to use the default set of fields  -->
diff --git a/dspace-api/src/main/resources/spring/spring-dspace-addon-suggestion-services.xml b/dspace-api/src/main/resources/spring/spring-dspace-addon-suggestion-services.xml
new file mode 100644
index 0000000000..fb720137c4
--- /dev/null
+++ b/dspace-api/src/main/resources/spring/spring-dspace-addon-suggestion-services.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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/
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/> <!-- allows us to use spring annotations in beans -->
+
+    <bean class="org.dspace.app.suggestion.SuggestionServiceImpl" id="org.dspace.app.suggestion.SuggestionService" />
+</beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
index 2b4cee0449..feb3c7c12b 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/item-submission.xml
@@ -24,8 +24,11 @@
         <name-map collection-handle="123456789/typebind-test" submission-name="typebindtest"/>
         <name-map collection-handle="123456789/accessCondition-not-discoverable" submission-name="accessConditionNotDiscoverable"/>
         <name-map collection-handle="123456789/test-hidden" submission-name="test-hidden"/>
+        <name-map community-handle="123456789/topcommunity-test" submission-name="topcommunitytest"/>
+        <name-map community-handle="123456789/subcommunity-test" submission-name="subcommunitytest"/>
         <name-map collection-handle="123456789/collection-test" submission-name="collectiontest"/>
         <name-map collection-entity-type="CustomEntityType" submission-name="entitytypetest"/>
+        <name-map collection-handle="123456789/test-duplicate-detection" submission-name="test-duplicate-detection"/>
     </submission-map>
 
 
@@ -179,6 +182,19 @@
             <scope visibility="hidden" visibilityOutside="hidden">submission</scope>
         </step-definition>
 
+        <!-- Detect duplicates step -->
+        <step-definition id="duplicates">
+            <heading>submit.progressbar.duplicates</heading>
+            <processing-class>org.dspace.app.rest.submit.step.DuplicateDetectionStep</processing-class>
+            <type>duplicates</type>
+        </step-definition>
+
+        <step-definition id="coarnotify">
+            <heading>submit.progressbar.coarnotify</heading>
+            <processing-class>org.dspace.app.rest.submit.step.NotifyStep</processing-class>
+            <type>coarnotify</type>
+        </step-definition>
+
     </step-definitions>
 
     <!-- The submission-definitions map lays out the detailed definition of -->
@@ -211,6 +227,9 @@
             <step id="traditionalpageone"/>
             <step id="traditionalpagetwo"/>
 
+            <!--Step will be COAR Notify services to the item -->
+            <step id="coarnotify"/>
+
             <!--Step will be to Upload the item -->
             <step id="upload"/>
             <!-- <step id="upload-with-embargo"/> -->
@@ -259,6 +278,14 @@
             <step id="test-always-hidden"/>
         </submission-process>
 
+        <submission-process name="topcommunitytest">
+            <step id="collection"/>
+        </submission-process>
+
+        <submission-process name="subcommunitytest">
+            <step id="collection"/>
+        </submission-process>
+
         <submission-process name="collectiontest">
             <step id="collection"/>
         </submission-process>
@@ -267,6 +294,12 @@
             <step id="collection"/>
         </submission-process>
 
+        <submission-process name="test-duplicate-detection">
+            <step id="collection"/>
+            <step id="duplicates"/>
+            <step id="traditionalpageone"/>
+        </submission-process>
+
     </submission-definitions>
 
 </item-submission>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
index 35ed8a235b..b44f319a35 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/local.cfg
+++ b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -95,14 +95,14 @@ loglevel.dspace = INFO
 #  IIIF TEST SETTINGS  #
 ########################
 iiif.enabled = true
-event.dispatcher.default.consumers = versioning, discovery, eperson, orcidqueue, iiif
+event.dispatcher.default.consumers = versioning, discovery, eperson, orcidqueue, iiif, qaeventsdelete, ldnmessage
 
 ###########################################
 # CUSTOM UNIT / INTEGRATION TEST SETTINGS #
 ###########################################
 # custom dispatcher to be used by dspace-api IT that doesn't need SOLR
 event.dispatcher.exclude-discovery.class = org.dspace.event.BasicDispatcher
-event.dispatcher.exclude-discovery.consumers = versioning, eperson
+event.dispatcher.exclude-discovery.consumers = versioning, eperson, qaeventsdelete, ldnmessage
 
 # Configure authority control for Unit Testing (in DSpaceControlledVocabularyTest)
 # (This overrides default, commented out settings in dspace.cfg)
@@ -174,3 +174,21 @@ authority.controlled.dspace.object.owner = true
 # Configuration required for thorough testing of browse links
 webui.browse.link.1 = author:dc.contributor.*
 webui.browse.link.2 = subject:dc.subject.*
+
+# Enable duplicate detection for tests
+duplicate.enable = true
+
+###########################################
+#  LDN CONFIGURATIONS                     #
+###########################################
+ldn.enabled = true
+qaevents.enabled = true
+ldn.ip-range.enabled = true
+ldn.notify.inbox.block-untrusted = true
+ldn.notify.inbox.block-untrusted-ip = true
+
+###########################################
+# ERROR LOGGING                           #
+###########################################
+# Log full stacktrace of other common 4xx errors (for easier debugging of these errors in tests)
+logging.server.include-stacktrace-for-httpcode = 422, 400
\ No newline at end of file
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
index f1e6c30d13..8a5277ab2d 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
@@ -7,7 +7,7 @@
                            http://www.springframework.org/schema/util/spring-util.xsd"
        default-lazy-init="true">
 
-    <bean id="mockOpenAIRERestConnector" class="org.dspace.external.MockOpenAIRERestConnector">
+    <bean id="mockOpenaireRestConnector" class="org.dspace.external.MockOpenaireRestConnector">
         <constructor-arg value="${openaire.api.url:https://api.openaire.eu}"/>
 		<property name="tokenEnabled" value="${openaire.token.enabled:false}"/>
 		<property name="tokenServiceUrl" value="${openaire.token.url:https://aai.openaire.eu/oidc/token}"/>
@@ -15,10 +15,10 @@
 		<property name="clientSecret" value="${openaire.token.clientSecret}"/>
     </bean>
 	<bean
-		class="org.dspace.external.provider.impl.OpenAIREFundingDataProvider"
+		class="org.dspace.external.provider.impl.OpenaireFundingDataProvider"
 		init-method="init">
-		<property name="sourceIdentifier" value="openAIREFunding" />
-		<property name="connector" ref="mockOpenAIRERestConnector" />
+		<property name="sourceIdentifier" value="openaireFunding" />
+		<property name="connector" ref="mockOpenaireRestConnector" />
 	    <property name="metadataFields" ref="mapOfmetadata"/>
 		<property name="supportedEntityTypes">
 			<list>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml
index 37e1fb5089..83d45b38cc 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/external-services.xml
@@ -90,6 +90,8 @@
             </list>
         </property>
     </bean>
+    
+    <bean class="org.dspace.app.suggestion.MockSuggestionExternalDataSource" />
 
     <bean id="dataciteLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
         <property name="metadataSource" ref="DataCiteImportService"/>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/item-filters.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/item-filters.xml
index 4107202be5..8af8bcff22 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/item-filters.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/item-filters.xml
@@ -286,7 +286,7 @@
         </property>
     </bean>
 
-    <!-- An example of an OpenAIRE compliance filter based on the same rules in xoai.xml
+    <!-- An example of an Openaire compliance filter based on the same rules in xoai.xml
          some sub-statements are defined within this bean, and some are referenced from earlier definitions
     -->
     <bean id="openaire_filter" class="org.dspace.content.logic.DefaultFilter">
@@ -328,7 +328,7 @@
                                 </list>
                             </property>
                         </bean>
-                        <!-- AND the dc.relation is a valid OpenAIRE identifier
+                        <!-- AND the dc.relation is a valid Openaire identifier
                              (starts with "info:eu-repo/grantAgreement/") -->
                         <bean id="has-openaire-relation_condition"
                               class="org.dspace.content.logic.condition.MetadataValueMatchCondition">
@@ -365,4 +365,12 @@
         </property>
     </bean>
 
+    <util:map id="ldnItemFilters" key-type="java.lang.String"
+              value-type="org.dspace.content.logic.LogicalStatement">
+       <entry key="always_true_filter" value-ref="always_true_filter"/>
+       <entry key="in-outfit-collection_condition" value-ref="in-outfit-collection_condition"/>
+       <entry key="demo_filter" value-ref="demo_filter"/>
+       <entry key="doi-filter" value-ref="doi-filter"/>
+       <entry key="type_filter" value-ref="type_filter"/>
+	</util:map>
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/qaevents-test.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/qaevents-test.xml
new file mode 100644
index 0000000000..8738d6cbef
--- /dev/null
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/qaevents-test.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+           http://www.springframework.org/schema/util
+           http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
+
+    <!-- this file contains extra beans related to the qaevent feature configured only for test purpose -->
+    <util:map id="qaAutomaticProcessingMap">
+        <entry key="coar-notify" value-ref="qaScoreEvaluation"/>
+    </util:map>
+
+    <bean id="qaScoreEvaluation" class="org.dspace.qaevent.QAScoreAutomaticProcessingEvaluation">
+        <property name="scoreToReject" value="0.3" />
+        <property name="scoreToIgnore" value="0.5" />
+        <property name="scoreToApprove" value="0.8" />
+        <property name="itemFilterToReject" ref="simple-demo_filter" />
+        <property name="itemFilterToIgnore" ref="simple-demo_filter" />
+        <property name="itemFilterToApprove" ref="simple-demo_filter" />
+    </bean>
+</beans>
\ No newline at end of file
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
index 808d22a5bf..a197b2910b 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/scripts.xml
@@ -64,6 +64,11 @@
         <property name="description" value="Perform the bulk synchronization of all the BATCH configured ORCID entities placed in the ORCID queue"/>
         <property name="dspaceRunnableClass" value="org.dspace.orcid.script.OrcidBulkPush"/>
     </bean>
+    
+    <bean id="import-openaire-events" class="org.dspace.qaevent.script.OpenaireEventsImportCliScriptConfiguration" primary="true">
+        <property name="description" value="Import new openaire quality assurance broker events"/>
+        <property name="dspaceRunnableClass" value="org.dspace.qaevent.script.OpenaireEventsImportCli"/>
+    </bean>
 
     <bean id="process-cleaner" class="org.dspace.administer.ProcessCleanerCliConfiguration">
         <property name="description" value="Cleanup all the old processes in the specified state"/>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml
index 32ab90b2cc..d60dea2c34 100644
--- a/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/solr-services.xml
@@ -38,8 +38,6 @@
     <!--<bean class="org.dspace.discovery.SolrServiceIndexOutputPlugin"
           id="solrServiceIndexOutputPlugin"/>-->
 
-    <!-- Statistics services are both lazy loaded (by name), as you are likely
-          just using ONE of them and not both -->
     <bean id="solrLoggerService"
           class="org.dspace.statistics.MockSolrLoggerServiceImpl"
           lazy-init="true"/>
@@ -47,7 +45,20 @@
     <bean id="org.dspace.statistics.SolrStatisticsCore"
           class="org.dspace.statistics.MockSolrStatisticsCore"
           autowire-candidate="true"/>
+    
+    <!-- qa events -->
+    <bean class="org.dspace.qaevent.MockQAEventService"
+          id="org.dspace.qaevent.service.QAEventService" />
           
     <bean class="org.dspace.statistics.GeoIpService" autowire-candidate="true"/>
+          
+    <!-- suggestion service for solr providers -->
+    <bean id="org.dspace.app.suggestion.SolrSuggestionStorageService" class="org.dspace.app.suggestion.MockSolrSuggestionStorageService" />
+
+    <bean id='EmbeddedSolrClientFactory'
+          class='org.dspace.statistics.EmbeddedSolrClientFactory'
+          autowire-candidate='true'>
+        <description>Connection to an embedded Solr instance.</description>
+    </bean>
 
 </beans>
diff --git a/dspace-api/src/test/data/dspaceFolder/config/spring/api/suggestions.xml b/dspace-api/src/test/data/dspaceFolder/config/spring/api/suggestions.xml
new file mode 100644
index 0000000000..a3ae1cb875
--- /dev/null
+++ b/dspace-api/src/test/data/dspaceFolder/config/spring/api/suggestions.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+           http://www.springframework.org/schema/util 
+           http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+
+    <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
+
+    <!-- This is defined in the solr-services.xml
+	<bean id="org.dspace.app.nbevent.service.NBEventService" 
+	   class="org.dspace.app.nbevent.service.impl.NBEventServiceImpl" /> -->
+ 
+	 <util:map id="suggestionProviders" map-class="java.util.HashMap" 
+	          key-type="java.lang.String" value-type="org.dspace.app.suggestion.SuggestionProvider">
+	    <entry key="scopus">
+			<bean class="org.dspace.app.suggestion.MockSolrSuggestionProvider">
+				<property name="sourceName" value="scopus"></property>
+			</bean>
+		</entry>
+	    <entry key="reciter">
+            <bean class="org.dspace.app.suggestion.MockSolrSuggestionProvider">
+                <property name="sourceName" value="reciter"></property>
+            </bean>
+        </entry>
+	</util:map>
+
+ </beans>
diff --git a/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java b/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java
index 5a5ce8bf6d..516f13bfd8 100644
--- a/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java
+++ b/dspace-api/src/test/java/org/dspace/AbstractDSpaceIntegrationTest.java
@@ -21,8 +21,12 @@ import org.dspace.builder.AbstractBuilder;
 import org.dspace.discovery.SearchUtils;
 import org.dspace.servicemanager.DSpaceKernelImpl;
 import org.dspace.servicemanager.DSpaceKernelInit;
+import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.rules.TestName;
 
 /**
  * Abstract Test class copied from DSpace API
@@ -46,6 +50,12 @@ public class AbstractDSpaceIntegrationTest {
      */
     protected static DSpaceKernelImpl kernelImpl;
 
+    /**
+     * Obtain the TestName from JUnit, so that we can print it out in the test logs (see below)
+     */
+    @Rule
+    public TestName testName = new TestName();
+
     /**
      * Default constructor
      */
@@ -60,7 +70,7 @@ public class AbstractDSpaceIntegrationTest {
     @BeforeClass
     public static void initTestEnvironment() {
         try {
-            //Stops System.exit(0) throws exception instead of exitting
+            //Stops System.exit(0) throws exception instead of exiting
             System.setSecurityManager(new NoExitSecurityManager());
 
             //set a standard time zone for the tests
@@ -90,6 +100,20 @@ public class AbstractDSpaceIntegrationTest {
         }
     }
 
+    @Before
+    public void printTestMethodBefore() {
+        // Log the test method being executed. Put lines around it to make it stand out.
+        log.info("---");
+        log.info("Starting execution of test method: {}()",  testName.getMethodName());
+        log.info("---");
+    }
+
+    @After
+    public void printTestMethodAfter() {
+        // Log the test method just completed.
+        log.info("Finished execution of test method: {}()", testName.getMethodName());
+    }
+
     /**
      * This method will be run after all tests finish as per @AfterClass.  It
      * will clean resources initialized by the @BeforeClass methods.
diff --git a/dspace-api/src/test/java/org/dspace/AbstractDSpaceTest.java b/dspace-api/src/test/java/org/dspace/AbstractDSpaceTest.java
index 36477556d3..136af83f07 100644
--- a/dspace-api/src/test/java/org/dspace/AbstractDSpaceTest.java
+++ b/dspace-api/src/test/java/org/dspace/AbstractDSpaceTest.java
@@ -18,9 +18,13 @@ import java.util.TimeZone;
 import org.apache.logging.log4j.Logger;
 import org.dspace.servicemanager.DSpaceKernelImpl;
 import org.dspace.servicemanager.DSpaceKernelInit;
+import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 import org.mockito.junit.MockitoJUnitRunner;
 
@@ -62,6 +66,12 @@ public class AbstractDSpaceTest {
      */
     protected static DSpaceKernelImpl kernelImpl;
 
+    /**
+     * Obtain the TestName from JUnit, so that we can print it out in the test logs (see below)
+     */
+    @Rule
+    public TestName testName = new TestName();
+
     /**
      * This method will be run before the first test as per @BeforeClass. It will
      * initialize shared resources required for all tests of this class.
@@ -94,6 +104,19 @@ public class AbstractDSpaceTest {
         }
     }
 
+    @Before
+    public void printTestMethodBefore() {
+        // Log the test method being executed. Put lines around it to make it stand out.
+        log.info("---");
+        log.info("Starting execution of test method: {}()",  testName.getMethodName());
+        log.info("---");
+    }
+
+    @After
+    public void printTestMethodAfter() {
+        // Log the test method just completed.
+        log.info("Finished execution of test method: {}()", testName.getMethodName());
+    }
 
     /**
      * This method will be run after all tests finish as per @AfterClass. It
diff --git a/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java b/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java
index e27fb19a68..9bacbb97ee 100644
--- a/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java
+++ b/dspace-api/src/test/java/org/dspace/AbstractIntegrationTestWithDatabase.java
@@ -9,7 +9,10 @@ package org.dspace;
 
 import static org.junit.Assert.fail;
 
+import java.sql.Connection;
 import java.sql.SQLException;
+import java.sql.Statement;
+import javax.sql.DataSource;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -29,6 +32,8 @@ import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.kernel.ServiceManager;
+import org.dspace.qaevent.MockQAEventService;
+import org.dspace.qaevent.service.QAEventService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.statistics.MockSolrLoggerServiceImpl;
 import org.dspace.statistics.MockSolrStatisticsCore;
@@ -89,6 +94,14 @@ public class AbstractIntegrationTestWithDatabase extends AbstractDSpaceIntegrati
         try {
             // Update/Initialize the database to latest version (via Flyway)
             DatabaseUtils.updateDatabase();
+
+            // Register custom functions in the H2 database
+            DataSource dataSource = DSpaceServicesFactory.getInstance()
+                    .getServiceManager()
+                    .getServiceByName("dataSource", DataSource.class);
+            try (Connection c = dataSource.getConnection(); Statement stmt = c.createStatement()) {
+                stmt.execute("CREATE ALIAS IF NOT EXISTS matches FOR 'org.dspace.util.DSpaceH2Dialect.matches'");
+            }
         } catch (SQLException se) {
             log.error("Error initializing database", se);
             fail("Error initializing database: " + se.getMessage()
@@ -177,25 +190,38 @@ public class AbstractIntegrationTestWithDatabase extends AbstractDSpaceIntegrati
             AbstractBuilder.cleanupObjects();
             parentCommunity = null;
             cleanupContext();
+        } catch (Exception e) {
+            throw new RuntimeException("Error cleaning up builder objects & context object", e);
+        }
 
-            ServiceManager serviceManager = DSpaceServicesFactory.getInstance().getServiceManager();
-            // Clear the search core.
-            MockSolrSearchCore searchService = serviceManager
-                    .getServiceByName(null, MockSolrSearchCore.class);
-            searchService.reset();
-            // Clear the statistics core.
-            serviceManager
-                    .getServiceByName(SolrStatisticsCore.class.getName(), MockSolrStatisticsCore.class)
-                    .reset();
+        ServiceManager serviceManager = DSpaceServicesFactory.getInstance().getServiceManager();
 
-            MockSolrLoggerServiceImpl statisticsService = serviceManager
-                    .getServiceByName("solrLoggerService", MockSolrLoggerServiceImpl.class);
-            statisticsService.reset();
+        // Clear the search core.
+        MockSolrSearchCore searchService = serviceManager
+                .getServiceByName(null, MockSolrSearchCore.class);
+        searchService.reset();
 
-            MockAuthoritySolrServiceImpl authorityService = serviceManager
-                    .getServiceByName(AuthoritySearchService.class.getName(), MockAuthoritySolrServiceImpl.class);
-            authorityService.reset();
+        // Clear the statistics core.
+        serviceManager
+                .getServiceByName(SolrStatisticsCore.class.getName(), MockSolrStatisticsCore.class)
+                .reset();
 
+        // Reset the statistics logger service
+        MockSolrLoggerServiceImpl loggerService = serviceManager
+                .getServiceByName("solrLoggerService", MockSolrLoggerServiceImpl.class);
+        loggerService.reset();
+
+        // Clear the authority core
+        MockAuthoritySolrServiceImpl authorityService = serviceManager
+                .getServiceByName(AuthoritySearchService.class.getName(), MockAuthoritySolrServiceImpl.class);
+        authorityService.reset();
+
+        // Clear the QA events core
+        MockQAEventService qaEventService = serviceManager
+            .getServiceByName(QAEventService.class.getName(), MockQAEventService.class);
+        qaEventService.reset();
+
+        try {
             // Reload our ConfigurationService (to reset configs to defaults again)
             DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
 
@@ -204,7 +230,7 @@ public class AbstractIntegrationTestWithDatabase extends AbstractDSpaceIntegrati
             // NOTE: we explicitly do NOT destroy our default eperson & admin as they
             // are cached and reused for all tests. This speeds up all tests.
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException("Error reloading configuration & resetting builders", e);
         }
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java b/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java
index 59dfbb2095..bc1fa8a9bb 100644
--- a/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java
+++ b/dspace-api/src/test/java/org/dspace/access/status/DefaultAccessStatusHelperTest.java
@@ -14,6 +14,8 @@ import static org.junit.Assert.fail;
 import java.io.ByteArrayInputStream;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
+import java.time.LocalDate;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -42,7 +44,6 @@ import org.dspace.core.Constants;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.GroupService;
-import org.joda.time.LocalDate;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -129,7 +130,7 @@ public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
             fail("SQL Error in init: " + ex.getMessage());
         }
         helper = new DefaultAccessStatusHelper();
-        threshold = new LocalDate(10000, 1, 1).toDate();
+        threshold = dateFrom(10000, 1, 1);
     }
 
     /**
@@ -265,7 +266,7 @@ public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
         ResourcePolicy policy = resourcePolicyService.create(context, null, group);
         policy.setRpName("Embargo");
         policy.setAction(Constants.READ);
-        policy.setStartDate(new LocalDate(9999, 12, 31).toDate());
+        policy.setStartDate(dateFrom(9999, 12, 31));
         policies.add(policy);
         authorizeService.removeAllPolicies(context, bitstream);
         authorizeService.addPolicies(context, policies, bitstream);
@@ -293,7 +294,7 @@ public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
         ResourcePolicy policy = resourcePolicyService.create(context, null, group);
         policy.setRpName("Restriction");
         policy.setAction(Constants.READ);
-        policy.setStartDate(new LocalDate(10000, 1, 1).toDate());
+        policy.setStartDate(dateFrom(10000, 1, 1));
         policies.add(policy);
         authorizeService.removeAllPolicies(context, bitstream);
         authorizeService.addPolicies(context, policies, bitstream);
@@ -381,7 +382,7 @@ public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
         ResourcePolicy policy = resourcePolicyService.create(context, null, group);
         policy.setRpName("Embargo");
         policy.setAction(Constants.READ);
-        policy.setStartDate(new LocalDate(9999, 12, 31).toDate());
+        policy.setStartDate(dateFrom(9999, 12, 31));
         policies.add(policy);
         authorizeService.removeAllPolicies(context, primaryBitstream);
         authorizeService.addPolicies(context, policies, primaryBitstream);
@@ -411,7 +412,7 @@ public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
         ResourcePolicy policy = resourcePolicyService.create(context, null, group);
         policy.setRpName("Embargo");
         policy.setAction(Constants.READ);
-        policy.setStartDate(new LocalDate(9999, 12, 31).toDate());
+        policy.setStartDate(dateFrom(9999, 12, 31));
         policies.add(policy);
         authorizeService.removeAllPolicies(context, anotherBitstream);
         authorizeService.addPolicies(context, policies, anotherBitstream);
@@ -421,4 +422,19 @@ public class DefaultAccessStatusHelperTest  extends AbstractUnitTest {
         String embargoDate = helper.getEmbargoFromItem(context, itemWithEmbargo, threshold);
         assertThat("testWithNoPrimaryAndMultipleBitstreams 1", embargoDate, equalTo(null));
     }
+
+    /**
+     * Create a Date from local year, month, day.
+     *
+     * @param year the year.
+     * @param month the month.
+     * @param day the day.
+     * @return the assembled date.
+     */
+    private Date dateFrom(int year, int month, int day) {
+        return Date.from(LocalDate.of(year, month, day)
+                .atStartOfDay()
+                .atZone(ZoneId.systemDefault())
+                .toInstant());
+    }
 }
diff --git a/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java b/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java
index 63340698ac..ead338bc8e 100644
--- a/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java
+++ b/dspace-api/src/test/java/org/dspace/administer/StructBuilderIT.java
@@ -23,11 +23,12 @@ import javax.xml.transform.stream.StreamSource;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.dspace.AbstractIntegrationTest;
+import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
-import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.CommunityService;
@@ -38,7 +39,6 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.w3c.dom.Attr;
 import org.w3c.dom.Node;
-import org.xml.sax.SAXException;
 import org.xmlunit.builder.DiffBuilder;
 import org.xmlunit.diff.Comparison;
 import org.xmlunit.diff.ComparisonFormatter;
@@ -52,7 +52,7 @@ import org.xmlunit.diff.Difference;
  * @author Mark H. Wood <mwood@iupui.edu>
  */
 public class StructBuilderIT
-        extends AbstractIntegrationTest {
+        extends AbstractIntegrationTestWithDatabase {
     private static final Logger log = LogManager.getLogger();
 
     private static final CommunityService communityService
@@ -79,7 +79,8 @@ public class StructBuilderIT
      * @throws IOException passed through.
      */
     @Before
-    public void setUp() throws SQLException, AuthorizeException, IOException {
+    public void setUp() throws Exception {
+        super.setUp();
         // Clear out all communities and collections.
         context.turnOffAuthorisationSystem();
         for (Community community : communityService.findAllTop(context)) {
@@ -285,19 +286,15 @@ public class StructBuilderIT
      * @throws org.dspace.authorize.AuthorizeException passed through.
      */
     @Test
-    public void testExportStructure()
-            throws ParserConfigurationException, SAXException, IOException,
-            SQLException, AuthorizeException {
+    public void testExportStructure() {
         // Create some structure to test.
         context.turnOffAuthorisationSystem();
-        Community community0 = communityService.create(null, context);
-        communityService.setMetadataSingleValue(context, community0,
-                MetadataSchemaEnum.DC.getName(), "title", null,
-                null, "Top Community 0");
-        Collection collection0_0 = collectionService.create(context, community0);
-        collectionService.setMetadataSingleValue(context, collection0_0,
-                MetadataSchemaEnum.DC.getName(), "title", null,
-                null, "Collection 0.0");
+        // Top level community
+        Community community0 = CommunityBuilder.createCommunity(context)
+                .withName("Top Community 0").build();
+        // Collection below top level community
+        Collection collection0_0 = CollectionBuilder.createCollection(context, community0)
+                .withName("Collection 0.0").build();
 
         // Export the current structure.
         System.out.println("exportStructure");
diff --git a/dspace-api/src/test/java/org/dspace/app/bulkaccesscontrol/BulkAccessControlIT.java b/dspace-api/src/test/java/org/dspace/app/bulkaccesscontrol/BulkAccessControlIT.java
index 73f02e4049..c115c04f6c 100644
--- a/dspace-api/src/test/java/org/dspace/app/bulkaccesscontrol/BulkAccessControlIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/bulkaccesscontrol/BulkAccessControlIT.java
@@ -943,7 +943,7 @@ public class BulkAccessControlIT extends AbstractIntegrationTestWithDatabase {
         Bitstream bitstreamOne;
         try (InputStream is = IOUtils.toInputStream(bitstreamOneContent, CharEncoding.UTF_8)) {
             bitstreamOne  = BitstreamBuilder.createBitstream(context, bundle, is)
-                                            .withName("bistream one")
+                                            .withName("bitstream one")
                                             .build();
         }
 
@@ -951,7 +951,7 @@ public class BulkAccessControlIT extends AbstractIntegrationTestWithDatabase {
         Bitstream bitstreamTwo;
         try (InputStream is = IOUtils.toInputStream(bitstreamTwoContent, CharEncoding.UTF_8)) {
             bitstreamTwo  = BitstreamBuilder.createBitstream(context, bundle, is)
-                                            .withName("bistream two")
+                                            .withName("bitstream two")
                                             .build();
         }
 
@@ -1188,7 +1188,7 @@ public class BulkAccessControlIT extends AbstractIntegrationTestWithDatabase {
             String bitstreamContent = "Dummy content";
             try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
                 BitstreamBuilder.createBitstream(context, bundle, is)
-                                .withName("bistream")
+                                .withName("bitstream")
                                 .build();
             }
         }
@@ -1297,7 +1297,7 @@ public class BulkAccessControlIT extends AbstractIntegrationTestWithDatabase {
             String bitstreamContent = "Dummy content";
             try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
                 BitstreamBuilder.createBitstream(context, bundle, is)
-                                .withName("bistream")
+                                .withName("bitstream")
                                 .build();
             }
         }
@@ -1404,7 +1404,7 @@ public class BulkAccessControlIT extends AbstractIntegrationTestWithDatabase {
             String bitstreamContent = "Dummy content";
             try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
                 BitstreamBuilder.createBitstream(context, bundle, is)
-                                .withName("bistream")
+                                .withName("bitstream")
                                 .build();
             }
         }
@@ -1753,7 +1753,7 @@ public class BulkAccessControlIT extends AbstractIntegrationTestWithDatabase {
         try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
             bitstreamOne =
                 BitstreamBuilder.createBitstream(context, bundleOne, is)
-                                .withName("bistream of bundle one")
+                                .withName("bitstream of bundle one")
                                 .build();
         }
 
diff --git a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
index ae079df560..de1dcc91c9 100644
--- a/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/bulkedit/MetadataImportIT.java
@@ -75,6 +75,31 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
         context.restoreAuthSystemState();
     }
 
+    @Test
+    public void metadataImportTestWithDuplicateHeader() {
+        String[] csv = {"id,collection,dc.title,dc.title,dc.contributor.author",
+            "+," + collection.getHandle() + ",\"Test Import 1\",\"Test Import 2\"," + "\"Donald, SmithImported\"," +
+            "+," + collection.getHandle() + ",\"Test Import 3\",\"Test Import 4\"," + "\"Donald, SmithImported\""};
+        // Should throw an exception because of duplicate header
+        try {
+            performImportScript(csv);
+        } catch (Exception e) {
+            assertTrue(e instanceof MetadataImportInvalidHeadingException);
+        }
+    }
+
+    @Test
+    public void metadataImportTestWithAnyLanguage() {
+        String[] csv = {"id,collection,dc.title[*],dc.contributor.author",
+            "+," + collection.getHandle() + ",\"Test Import 1\"," + "\"Donald, SmithImported\""};
+        // Should throw an exception because of invalid ANY language (*) in metadata field
+        try {
+            performImportScript(csv);
+        } catch (Exception e) {
+            assertTrue(e instanceof MetadataImportInvalidHeadingException);
+        }
+    }
+
     @Test
     public void metadataImportTest() throws Exception {
         String[] csv = {"id,collection,dc.title,dc.contributor.author",
@@ -230,7 +255,7 @@ public class MetadataImportIT extends AbstractIntegrationTestWithDatabase {
                 itemService.getMetadata(item, "dc", "contributor", "author", Item.ANY).get(0).getValue(),
                 "TestAuthorToRemove"));
 
-        String[] csv = {"id,collection,dc.title,dc.contributor.author[*]",
+        String[] csv = {"id,collection,dc.title,dc.contributor.author",
             item.getID().toString() + "," + personCollection.getHandle() + "," + item.getName() + ","};
         performImportScript(csv);
         item = findItemByName(itemTitle);
diff --git a/dspace-api/src/test/java/org/dspace/app/csv/CSVMetadataImportReferenceIT.java b/dspace-api/src/test/java/org/dspace/app/csv/CSVMetadataImportReferenceIT.java
index aee4b4d267..4329092b98 100644
--- a/dspace-api/src/test/java/org/dspace/app/csv/CSVMetadataImportReferenceIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/csv/CSVMetadataImportReferenceIT.java
@@ -721,7 +721,7 @@ public class CSVMetadataImportReferenceIT extends AbstractIntegrationTestWithDat
      *
      * @param value the value of the dc.identifier.other to query for
      *
-     * @return first retrived UUID
+     * @return first retrieved UUID
      */
     private UUID getUUIDByIdentifierOther(String value) throws Exception {
         ArrayList<UUID> uuidList = new ArrayList<>();
diff --git a/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java b/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java
index 6db37bdbcd..af12cfd553 100644
--- a/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/itemexport/ItemExportCLIIT.java
@@ -83,9 +83,9 @@ public class ItemExportCLIIT extends AbstractIntegrationTestWithDatabase {
     @After
     @Override
     public void destroy() throws Exception {
-        PathUtils.deleteDirectory(tempDir);
+        PathUtils.deleteOnExit(tempDir);
         for (Path path : Files.list(workDir).collect(Collectors.toList())) {
-            PathUtils.delete(path);
+            PathUtils.deleteOnExit(path);
         }
         super.destroy();
     }
diff --git a/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java b/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java
index 08ae3af4ae..d6daa06aaa 100644
--- a/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/itemimport/ItemImportCLIIT.java
@@ -92,9 +92,9 @@ public class ItemImportCLIIT extends AbstractIntegrationTestWithDatabase {
     @After
     @Override
     public void destroy() throws Exception {
-        PathUtils.deleteDirectory(tempDir);
+        PathUtils.deleteOnExit(tempDir);
         for (Path path : Files.list(workDir).collect(Collectors.toList())) {
-            PathUtils.delete(path);
+            PathUtils.deleteOnExit(path);
         }
         super.destroy();
     }
diff --git a/dspace-api/src/test/java/org/dspace/app/ldn/LDNMessageConsumerIT.java b/dspace-api/src/test/java/org/dspace/app/ldn/LDNMessageConsumerIT.java
new file mode 100644
index 0000000000..4f5fa6762d
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/ldn/LDNMessageConsumerIT.java
@@ -0,0 +1,451 @@
+/**
+ * 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.ldn;
+
+import static org.dspace.app.ldn.LDNMessageEntity.QUEUE_STATUS_QUEUED;
+import static org.dspace.matcher.NotifyServiceEntityMatcher.matchesNotifyServiceEntity;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
+import java.io.InputStream;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Set;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.ldn.factory.NotifyServiceFactory;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.builder.NotifyServiceInboundPatternBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Constants;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.workflow.WorkflowItem;
+import org.dspace.workflow.WorkflowService;
+import org.dspace.workflow.factory.WorkflowServiceFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration Tests against {@link LDNMessageConsumer}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageConsumerIT extends AbstractIntegrationTestWithDatabase {
+
+    private Collection collection;
+    private EPerson submitter;
+
+    private LDNMessageService ldnMessageService = NotifyServiceFactory.getInstance().getLDNMessageService();
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private WorkflowService workflowService = WorkflowServiceFactory.getInstance().getWorkflowService();
+    private ItemService itemService = ContentServiceFactory.getInstance().getItemService();
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        //** GIVEN **
+        //1. create a normal user to use as submitter
+        submitter = EPersonBuilder.createEPerson(context)
+                                          .withEmail("submitter@example.com")
+                                          .withPassword(password)
+                                          .build();
+
+        //2. A community with one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .withName("Collection 1")
+                                                 .withSubmitterGroup(submitter)
+                                                 .build();
+        context.setCurrentUser(submitter);
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestReview() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-review")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+
+        assertThat(notifyService, matchesNotifyServiceEntity(ldnMessage.getTarget()));
+        assertEquals(workflowItem.getItem().getID(), ldnMessage.getObject().getID());
+        assertEquals(QUEUE_STATUS_QUEUED, ldnMessage.getQueueStatus());
+        assertNull(ldnMessage.getOrigin());
+        assertNotNull(ldnMessage.getMessage());
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        // check id
+        assertThat(notification.getId(), containsString("urn:uuid:"));
+
+        // check object
+        assertEquals(notification.getObject().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle());
+        assertEquals(notification.getObject().getIetfCiteAs(),
+            itemService.getMetadataByMetadataString(item, "dc.identifier.uri").get(0).getValue());
+        assertEquals(notification.getObject().getUrl().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/bitstreams/" +
+                item.getBundles(Constants.CONTENT_BUNDLE_NAME).get(0).getBitstreams().get(0).getID() + "/download");
+
+        // check target
+        assertEquals(notification.getTarget().getId(), notifyService.getUrl());
+        assertEquals(notification.getTarget().getInbox(), notifyService.getLdnUrl());
+        assertEquals(notification.getTarget().getType(), Set.of("Service"));
+
+        // check origin
+        assertEquals(notification.getOrigin().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getOrigin().getInbox(), configurationService.getProperty("ldn.notify.inbox"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check actor
+        assertEquals(notification.getActor().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getActor().getName(), configurationService.getProperty("dspace.name"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check types
+        assertEquals(notification.getType(), Set.of("coar-notify:ReviewAction", "Offer"));
+
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestReviewAutomatic() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyService)
+                                          .withPattern("request-review")
+                                          .withConstraint("simple-demo_filter")
+                                          .isAutomatic(true)
+                                          .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("demo Item")
+                                .withIssueDate("2023-11-20")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+
+        assertThat(notifyService, matchesNotifyServiceEntity(ldnMessage.getTarget()));
+        assertEquals(workflowItem.getItem().getID(), ldnMessage.getObject().getID());
+        assertEquals(QUEUE_STATUS_QUEUED, ldnMessage.getQueueStatus());
+        assertNull(ldnMessage.getOrigin());
+        assertNotNull(ldnMessage.getMessage());
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        // check id
+        assertThat(notification.getId(), containsString("urn:uuid:"));
+
+        // check object
+        assertEquals(notification.getObject().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle());
+        assertEquals(notification.getObject().getIetfCiteAs(),
+            itemService.getMetadataByMetadataString(item, "dc.identifier.uri").get(0).getValue());
+        assertEquals(notification.getObject().getUrl().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/bitstreams/" +
+                item.getBundles(Constants.CONTENT_BUNDLE_NAME).get(0).getBitstreams().get(0).getID() + "/download");
+
+        // check target
+        assertEquals(notification.getTarget().getId(), notifyService.getUrl());
+        assertEquals(notification.getTarget().getInbox(), notifyService.getLdnUrl());
+        assertEquals(notification.getTarget().getType(), Set.of("Service"));
+
+        // check origin
+        assertEquals(notification.getOrigin().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getOrigin().getInbox(), configurationService.getProperty("ldn.notify.inbox"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check actor
+        assertEquals(notification.getActor().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getActor().getName(), configurationService.getProperty("dspace.name"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check types
+        assertEquals(notification.getType(), Set.of("coar-notify:ReviewAction", "Offer"));
+
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestEndorsement() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-endorsement")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+
+        assertThat(notifyService, matchesNotifyServiceEntity(ldnMessage.getTarget()));
+        assertEquals(workflowItem.getItem().getID(), ldnMessage.getObject().getID());
+        assertEquals(QUEUE_STATUS_QUEUED, ldnMessage.getQueueStatus());
+        assertNull(ldnMessage.getOrigin());
+        assertNotNull(ldnMessage.getMessage());
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        // check id
+        assertThat(notification.getId(), containsString("urn:uuid:"));
+
+        // check object
+        assertEquals(notification.getObject().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle());
+        assertEquals(notification.getObject().getIetfCiteAs(),
+            itemService.getMetadataByMetadataString(item, "dc.identifier.uri").get(0).getValue());
+        assertEquals(notification.getObject().getUrl().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/bitstreams/" +
+                item.getBundles(Constants.CONTENT_BUNDLE_NAME).get(0).getBitstreams().get(0).getID() + "/download");
+
+        // check target
+        assertEquals(notification.getTarget().getId(), notifyService.getUrl());
+        assertEquals(notification.getTarget().getInbox(), notifyService.getLdnUrl());
+        assertEquals(notification.getTarget().getType(), Set.of("Service"));
+
+        // check origin
+        assertEquals(notification.getOrigin().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getOrigin().getInbox(), configurationService.getProperty("ldn.notify.inbox"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check actor
+        assertEquals(notification.getActor().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getActor().getName(), configurationService.getProperty("dspace.name"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check types
+        assertEquals(notification.getType(), Set.of("coar-notify:EndorsementAction", "Offer"));
+
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestIngest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-ingest")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+
+        assertThat(notifyService, matchesNotifyServiceEntity(ldnMessage.getTarget()));
+        assertEquals(workflowItem.getItem().getID(), ldnMessage.getObject().getID());
+        assertEquals(QUEUE_STATUS_QUEUED, ldnMessage.getQueueStatus());
+        assertNull(ldnMessage.getOrigin());
+        assertNotNull(ldnMessage.getMessage());
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        // check id
+        assertThat(notification.getId(), containsString("urn:uuid:"));
+
+        // check object
+        assertEquals(notification.getObject().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle());
+        assertEquals(notification.getObject().getIetfCiteAs(),
+            itemService.getMetadataByMetadataString(item, "dc.identifier.uri").get(0).getValue());
+        assertEquals(notification.getObject().getUrl().getId(),
+            configurationService.getProperty("dspace.ui.url") + "/bitstreams/" +
+                item.getBundles(Constants.CONTENT_BUNDLE_NAME).get(0).getBitstreams().get(0).getID() + "/download");
+
+        // check target
+        assertEquals(notification.getTarget().getId(), notifyService.getUrl());
+        assertEquals(notification.getTarget().getInbox(), notifyService.getLdnUrl());
+        assertEquals(notification.getTarget().getType(), Set.of("Service"));
+
+        // check origin
+        assertEquals(notification.getOrigin().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getOrigin().getInbox(), configurationService.getProperty("ldn.notify.inbox"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check actor
+        assertEquals(notification.getActor().getId(), configurationService.getProperty("dspace.ui.url"));
+        assertEquals(notification.getActor().getName(), configurationService.getProperty("dspace.name"));
+        assertEquals(notification.getOrigin().getType(), Set.of("Service"));
+
+        // check types
+        assertEquals(notification.getType(), Set.of("coar-notify:IngestAction", "Offer"));
+
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestFake() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-fake")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        workflowService.start(context, workspaceItem);
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+        assertNull(ldnMessage);
+
+    }
+
+    @Test
+    public void testLDNMessageConsumerNoRequests() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .grantLicense()
+                                .build();
+
+        workflowService.start(context, workspaceItem);
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+        assertNull(ldnMessage);
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<LDNMessageEntity> ldnMessageEntities = ldnMessageService.findAll(context);
+        if (CollectionUtils.isNotEmpty(ldnMessageEntities)) {
+            ldnMessageEntities.forEach(ldnMessage -> {
+                try {
+                    ldnMessageService.delete(context, ldnMessage);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        super.destroy();
+    }
+}
+
diff --git a/dspace-api/src/test/java/org/dspace/app/ldn/action/SendLDNMessageActionIT.java b/dspace-api/src/test/java/org/dspace/app/ldn/action/SendLDNMessageActionIT.java
new file mode 100644
index 0000000000..73f97b2a6a
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/ldn/action/SendLDNMessageActionIT.java
@@ -0,0 +1,252 @@
+/**
+ * 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.ldn.action;
+
+import static org.dspace.app.ldn.action.LDNActionStatus.ABORT;
+import static org.dspace.app.ldn.action.LDNActionStatus.CONTINUE;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.sql.SQLException;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.http.HttpStatus;
+import org.apache.http.StatusLine;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.message.BasicStatusLine;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.factory.NotifyServiceFactory;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.workflow.WorkflowItem;
+import org.dspace.workflow.WorkflowService;
+import org.dspace.workflow.factory.WorkflowServiceFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration Tests against {@link SendLDNMessageAction}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class SendLDNMessageActionIT extends AbstractIntegrationTestWithDatabase {
+
+    private Collection collection;
+    private EPerson submitter;
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private LDNMessageService ldnMessageService = NotifyServiceFactory.getInstance().getLDNMessageService();
+    private WorkflowService workflowService = WorkflowServiceFactory.getInstance().getWorkflowService();
+    private SendLDNMessageAction sendLDNMessageAction;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        configurationService.setProperty("ldn.enabled", "true");
+        sendLDNMessageAction = new SendLDNMessageAction();
+        context.turnOffAuthorisationSystem();
+        //** GIVEN **
+        //1. create a normal user to use as submitter
+        submitter = EPersonBuilder.createEPerson(context)
+                                          .withEmail("submitter@example.com")
+                                          .withPassword(password)
+                                          .build();
+
+        //2. A community with one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .withName("Collection 1")
+                                                 .withSubmitterGroup(submitter)
+                                                 .build();
+        context.setCurrentUser(submitter);
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestReview() throws Exception {
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine sl = mock(BasicStatusLine.class);
+        when(response.getStatusLine()).thenReturn(sl);
+        when(sl.getStatusCode()).thenReturn(HttpStatus.SC_ACCEPTED);
+        CloseableHttpClient mockedClient = mock(CloseableHttpClient.class);
+        when(mockedClient.execute(any(HttpPost.class))).
+        thenReturn(response);
+        ObjectMapper mapper = new ObjectMapper();
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://www.notify-inbox.info/")
+                                .withLdnUrl("https://notify-inbox.info/inbox/")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-review")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+        ldnMessage.getQueueStatus();
+
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        sendLDNMessageAction = new SendLDNMessageAction(mockedClient);
+        assertEquals(sendLDNMessageAction.execute(context, notification, item), CONTINUE);
+        mockedClient.close();
+        response.close();
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestReviewGotRedirection() throws Exception {
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine sl = mock(BasicStatusLine.class);
+        when(response.getStatusLine()).thenReturn(sl);
+        when(sl.getStatusCode()).thenReturn(HttpStatus.SC_ACCEPTED);
+        CloseableHttpClient mockedClient = mock(CloseableHttpClient.class);
+        when(mockedClient.execute(any(HttpPost.class))).
+        thenReturn(response);
+        ObjectMapper mapper = new ObjectMapper();
+
+        context.turnOffAuthorisationSystem();
+
+        // ldnUrl should be https://notify-inbox.info/inbox/
+        // but used https://notify-inbox.info/inbox for redirection
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://www.notify-inbox.info/")
+                                .withLdnUrl("https://notify-inbox.info/inbox")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-review")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        sendLDNMessageAction = new SendLDNMessageAction(mockedClient);
+        assertEquals(sendLDNMessageAction.execute(context, notification, item), CONTINUE);
+        mockedClient.close();
+        response.close();
+    }
+
+    @Test
+    public void testLDNMessageConsumerRequestReviewWithInvalidLdnUrl() throws Exception {
+        CloseableHttpResponse response = mock(CloseableHttpResponse.class);
+        StatusLine sl = mock(BasicStatusLine.class);
+        when(response.getStatusLine()).thenReturn(sl);
+        when(sl.getStatusCode()).thenReturn(HttpStatus.SC_NOT_FOUND);
+        CloseableHttpClient mockedClient = mock(CloseableHttpClient.class);
+        when(mockedClient.execute(any(HttpPost.class))).
+        thenReturn(response);
+        ObjectMapper mapper = new ObjectMapper();
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://www.notify-inbox.info/")
+                                .withLdnUrl("https://notify-inbox.info/invalidLdnUrl/")
+                                .build();
+
+        //3. a workspace item ready to go
+        WorkspaceItem workspaceItem =
+            WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                                .withTitle("Submission Item")
+                                .withIssueDate("2023-11-20")
+                                .withCOARNotifyService(notifyService, "request-review")
+                                .withFulltext("test.txt", "test", InputStream.nullInputStream())
+                                .grantLicense()
+                                .build();
+
+        WorkflowItem workflowItem = workflowService.start(context, workspaceItem);
+        Item item = workflowItem.getItem();
+        context.dispatchEvents();
+        context.restoreAuthSystemState();
+
+        LDNMessageEntity ldnMessage =
+            ldnMessageService.findAll(context).stream().findFirst().orElse(null);
+
+        Notification notification = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+        sendLDNMessageAction = new SendLDNMessageAction(mockedClient);
+        assertEquals(sendLDNMessageAction.execute(context, notification, item), ABORT);
+        mockedClient.close();
+        response.close();
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<LDNMessageEntity> ldnMessageEntities = ldnMessageService.findAll(context);
+        if (CollectionUtils.isNotEmpty(ldnMessageEntities)) {
+            ldnMessageEntities.forEach(ldnMessage -> {
+                try {
+                    ldnMessageService.delete(context, ldnMessage);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        super.destroy();
+    }
+}
+
diff --git a/dspace-api/src/test/java/org/dspace/app/mediafilter/MediaFilterIT.java b/dspace-api/src/test/java/org/dspace/app/mediafilter/MediaFilterIT.java
index aef2476fdc..938dc92de4 100644
--- a/dspace-api/src/test/java/org/dspace/app/mediafilter/MediaFilterIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/mediafilter/MediaFilterIT.java
@@ -199,9 +199,9 @@ public class MediaFilterIT extends AbstractIntegrationTestWithDatabase {
         List<Bitstream> bitstreams = textBundles.get(0).getBitstreams();
         assertTrue("The item " + item.getName() + " has NOT exactly 1 bitstream in the TEXT bundle",
                 bitstreams.size() == 1);
-        assertTrue("The text bistream in the " + item.getName() + " is NOT named properly [" + expectedFileName + "]",
+        assertTrue("The text bitstream in the " + item.getName() + " is NOT named properly [" + expectedFileName + "]",
                 StringUtils.equals(bitstreams.get(0).getName(), expectedFileName));
-        assertTrue("The text bistream in the " + item.getName() + " doesn't contain the proper content ["
+        assertTrue("The text bitstream in the " + item.getName() + " doesn't contain the proper content ["
                 + expectedContent + "]", StringUtils.contains(getContent(bitstreams.get(0)), expectedContent));
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java b/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java
index 2cddbb511f..d9ee0fb9bf 100644
--- a/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/packager/PackagerIT.java
@@ -24,6 +24,7 @@ import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
@@ -159,7 +160,7 @@ public class PackagerIT extends AbstractIntegrationTestWithDatabase {
         performExportScript(article.getHandle(), tempFile);
         UUID id = article.getID();
         itemService.delete(context, article);
-        WorkspaceItem workspaceItem = workspaceItemService.create(context, col1, id, false, false);
+        WorkspaceItem workspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, col1, id).build();
         installItemService.installItem(context, workspaceItem, "123456789/0100");
         performImportNoForceScript(tempFile);
         Iterator<Item> items = itemService.findByCollection(context, col1);
@@ -171,7 +172,7 @@ public class PackagerIT extends AbstractIntegrationTestWithDatabase {
     }
 
     private String getID() throws IOException, MetadataValidationException {
-        //this method gets the UUID from the mets file thats stored in the attribute element
+        //this method gets the UUID from the mets file that's stored in the attribute element
         METSManifest manifest = null;
         ZipFile zip = new ZipFile(tempFile);
         ZipEntry manifestEntry = zip.getEntry(METSManifest.MANIFEST_FILE);
diff --git a/dspace-api/src/test/java/org/dspace/app/requestitem/JavaMailTestTransport.java b/dspace-api/src/test/java/org/dspace/app/requestitem/JavaMailTestTransport.java
index 96cf00c312..f6fbfe02f3 100644
--- a/dspace-api/src/test/java/org/dspace/app/requestitem/JavaMailTestTransport.java
+++ b/dspace-api/src/test/java/org/dspace/app/requestitem/JavaMailTestTransport.java
@@ -7,12 +7,12 @@
  */
 package org.dspace.app.requestitem;
 
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.URLName;
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.Session;
+import jakarta.mail.Transport;
+import jakarta.mail.URLName;
 
 /**
  * A dummy load for SMTP transport, which saves the last message "sent" for
diff --git a/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemEmailNotifierTest.java b/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemEmailNotifierTest.java
index 713e007c58..0868017ed9 100644
--- a/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemEmailNotifierTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemEmailNotifierTest.java
@@ -12,12 +12,11 @@ import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.Provider;
-import javax.mail.Session;
-import javax.mail.internet.InternetAddress;
-
+import jakarta.mail.Address;
+import jakarta.mail.Message;
+import jakarta.mail.Provider;
+import jakarta.mail.Session;
+import jakarta.mail.internet.InternetAddress;
 import org.dspace.AbstractUnitTest;
 import org.dspace.app.requestitem.factory.RequestItemServiceFactory;
 import org.dspace.app.requestitem.service.RequestItemService;
@@ -34,6 +33,7 @@ import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -78,6 +78,13 @@ public class RequestItemEmailNotifierTest
                 = RequestItemServiceFactory.getInstance().getRequestItemService();
     }
 
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        // AbstractUnitTest doesn't do this for us.
+        AbstractBuilder.cleanupObjects();
+        AbstractBuilder.destroy();
+    }
+
     /**
      * Test of sendRequest method, of class RequestItemEmailNotifier.
      * @throws java.lang.Exception passed through.
@@ -154,7 +161,7 @@ public class RequestItemEmailNotifierTest
         assertThat("To: should be an Internet address",
                 myAddresses[0], instanceOf(InternetAddress.class));
         String address = ((InternetAddress)myAddresses[0]).getAddress();
-        assertEquals("To: address should match requestor.",
+        assertEquals("To: address should match requester.",
                 ri.getReqEmail(), address);
 
         // Check the message body.
@@ -239,7 +246,7 @@ public class RequestItemEmailNotifierTest
         assertThat("To: should be an Internet address",
                 myAddresses[0], instanceOf(InternetAddress.class));
         String address = ((InternetAddress)myAddresses[0]).getAddress();
-        assertEquals("To: address should match requestor.",
+        assertEquals("To: address should match requester.",
                 ri.getReqEmail(), address);
 
         // Check the message body.
diff --git a/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategyTest.java b/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategyTest.java
index b03d7576f9..816756f9d5 100644
--- a/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategyTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemHelpdeskStrategyTest.java
@@ -67,8 +67,10 @@ public class RequestItemHelpdeskStrategyTest
     }
 
     @AfterClass
-    public static void tearDownClass() {
-        AbstractBuilder.destroy(); // AbstractUnitTest doesn't do this for us.
+    public static void tearDownClass() throws Exception {
+        // AbstractUnitTest doesn't do this for us.
+        AbstractBuilder.cleanupObjects();
+        AbstractBuilder.destroy();
     }
 
     @Before
diff --git a/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemSubmitterStrategyTest.java b/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemSubmitterStrategyTest.java
index f485a591b0..964b3fe303 100644
--- a/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemSubmitterStrategyTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/requestitem/RequestItemSubmitterStrategyTest.java
@@ -56,8 +56,10 @@ public class RequestItemSubmitterStrategyTest
     }
 
     @AfterClass
-    public static void tearDownClass() {
-        AbstractBuilder.destroy(); // AbstractUnitTest doesn't do this for us.
+    public static void tearDownClass() throws Exception {
+        // AbstractUnitTest doesn't do this for us.
+        AbstractBuilder.cleanupObjects();
+        AbstractBuilder.destroy();
     }
 
     @Before
diff --git a/dspace-api/src/test/java/org/dspace/app/scripts/handler/impl/TestDSpaceRunnableHandler.java b/dspace-api/src/test/java/org/dspace/app/scripts/handler/impl/TestDSpaceRunnableHandler.java
index aced81cbdf..7cc1e8cb45 100644
--- a/dspace-api/src/test/java/org/dspace/app/scripts/handler/impl/TestDSpaceRunnableHandler.java
+++ b/dspace-api/src/test/java/org/dspace/app/scripts/handler/impl/TestDSpaceRunnableHandler.java
@@ -61,6 +61,12 @@ public class TestDSpaceRunnableHandler extends CommandLineDSpaceRunnableHandler
         errorMessages.add(message);
     }
 
+    @Override
+    public void logError(String message, Throwable throwable) {
+        super.logError(message, throwable);
+        errorMessages.add(message);
+    }
+
     public List<String> getInfoMessages() {
         return infoMessages;
     }
diff --git a/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java b/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java
index 239d2864bf..5c5e9f7364 100644
--- a/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java
+++ b/dspace-api/src/test/java/org/dspace/app/sherpa/MockSHERPAService.java
@@ -43,7 +43,7 @@ public class MockSHERPAService extends SHERPAService {
                 "https://v2.sherpa.ac.uk/cgi/retrieve");
             String apiKey = configurationService.getProperty("sherpa.romeo.apikey");
 
-            // Rather than search, we will simply attempt to build the URI using the real pepare method
+            // Rather than search, we will simply attempt to build the URI using the real prepare method
             // so that any errors there are caught, and will return a valid response for The Lancet
             InputStream content = null;
             try {
@@ -100,7 +100,7 @@ public class MockSHERPAService extends SHERPAService {
                 "https://v2.sherpa.ac.uk/cgi/retrieve");
             String apiKey = configurationService.getProperty("sherpa.romeo.apikey");
 
-            // Rather than search, we will simply attempt to build the URI using the real pepare method
+            // Rather than search, we will simply attempt to build the URI using the real prepare method
             // so that any errors there are caught, and will return a valid response for The Lancet
             InputStream content = null;
             try {
diff --git a/dspace-api/src/test/java/org/dspace/app/sherpa/SHERPADataProviderTest.java b/dspace-api/src/test/java/org/dspace/app/sherpa/SHERPADataProviderTest.java
index 6b9666c830..cbea55ea07 100644
--- a/dspace-api/src/test/java/org/dspace/app/sherpa/SHERPADataProviderTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/sherpa/SHERPADataProviderTest.java
@@ -8,6 +8,7 @@
 package org.dspace.app.sherpa;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -352,4 +353,88 @@ public class SHERPADataProviderTest extends AbstractDSpaceTest {
         // Does dc.identifier.other match the expected value?
         assertEquals("Publisher URL must equal " + validUrl, validUrl, url);
     }
+
+    /**
+     * Perform the same essential test as prior, but making sure the new comparator and equals methods
+     * in MetadataValueDTO and ExternalDataObject properly compare objects (even when DTO values are not strictly
+     * in the same order)
+     * The provider is configured to use the Mock SHERPAService.
+     */
+    @Test
+    public void testComparePublisherExternalObjects() {
+        // Get a response with a single valid ISSN, using the mock service which will return a response based on
+        // thelancet.json stored response in test resources
+        // We expect to see the following values set correctly:
+        // dc.title =                       Public Library of Science
+        // dc.identifier.sherpaPublisher    112
+        // dc.identifier.other              http://www.plos.org/
+
+        // Set expected values
+        String validName = "Public Library of Science";
+        String validIdentifier = "112";
+        String validUrl = "http://www.plos.org/";
+
+        // First exemplar object should be identical
+        ExternalDataObject exemplarDataObject = new ExternalDataObject();
+        exemplarDataObject.setSource("sherpaPublisher");
+        exemplarDataObject.setId(validIdentifier);
+        exemplarDataObject.setValue(validName);
+        exemplarDataObject.setDisplayValue(validName);
+        exemplarDataObject.addMetadata(new MetadataValueDTO("dc", "title", null, null,
+                validName));
+        exemplarDataObject.addMetadata(new MetadataValueDTO("dc", "identifier", "sherpaPublisher", null,
+                validIdentifier));
+        exemplarDataObject.addMetadata(new MetadataValueDTO("dc", "identifier", "other", null,
+                validUrl));
+
+        // Exemplar object 2 has a different order of metadata values
+        // (we still expect it to be 'equal' when comparing since there is no concept of place for DTOs)
+        ExternalDataObject exemplarDataObject2 = new ExternalDataObject();
+        exemplarDataObject2.setSource("sherpaPublisher");
+        exemplarDataObject2.setId(validIdentifier);
+        exemplarDataObject2.setValue(validName);
+        exemplarDataObject2.setDisplayValue(validName);
+        exemplarDataObject2.addMetadata(new MetadataValueDTO("dc", "identifier", "other", null,
+                validUrl));
+        exemplarDataObject2.addMetadata(new MetadataValueDTO("dc", "title", null, null,
+                validName));
+        exemplarDataObject2.addMetadata(new MetadataValueDTO("dc", "identifier", "sherpaPublisher", null,
+                validIdentifier));
+
+        // Nonequal object should NOT evaluate as equal to our data
+        ExternalDataObject nonEqualObject = new ExternalDataObject();
+        nonEqualObject.setSource("sherpaPublisher");
+        nonEqualObject.setId(validIdentifier);
+        nonEqualObject.setValue(validName);
+        nonEqualObject.setDisplayValue(validName);
+        nonEqualObject.addMetadata(new MetadataValueDTO("dc", "title", null, null,
+                "Private Library of Science"));
+        nonEqualObject.addMetadata(new MetadataValueDTO("dc", "identifier", "sherpaPublisher", null,
+                validIdentifier));
+        nonEqualObject.addMetadata(new MetadataValueDTO("dc", "identifier", "other", null,
+                validUrl));
+
+
+        // Retrieve the dataobject(s) from the data provider
+        List<ExternalDataObject> externalDataObjects =
+                sherpaPublisherProvider.searchExternalDataObjects(validName, 0, 1);
+
+        // Assert that the response is valid and not empty
+        assertTrue("Couldn't find a data object for publication name " + validName,
+                externalDataObjects != null && !externalDataObjects.isEmpty());
+
+        ExternalDataObject dataObject = externalDataObjects.get(0);
+
+        // Assert that the data object itself is not null
+        assertNotNull("External data object must not be null", dataObject);
+
+        // Assert equality to the exemplar object
+        assertEquals(exemplarDataObject, dataObject);
+
+        // Assert equality to the 2nd exemplar object
+        assertEquals(exemplarDataObject2, dataObject);
+
+        // Assert NON-equality to the 3rd object
+        assertNotEquals(nonEqualObject, dataObject);
+    }
 }
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/app/suggestion/MockSolrSuggestionProvider.java b/dspace-api/src/test/java/org/dspace/app/suggestion/MockSolrSuggestionProvider.java
new file mode 100644
index 0000000000..af890da455
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/suggestion/MockSolrSuggestionProvider.java
@@ -0,0 +1,20 @@
+/**
+ * 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.suggestion;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+
+public class MockSolrSuggestionProvider extends SolrSuggestionProvider {
+
+    @Override
+    protected boolean isExternalDataObjectPotentiallySuggested(Context context, ExternalDataObject externalDataObject) {
+        return StringUtils.equals(MockSuggestionExternalDataSource.NAME, externalDataObject.getSource());
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/suggestion/MockSolrSuggestionStorageService.java b/dspace-api/src/test/java/org/dspace/app/suggestion/MockSolrSuggestionStorageService.java
new file mode 100644
index 0000000000..1c843026d4
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/suggestion/MockSolrSuggestionStorageService.java
@@ -0,0 +1,38 @@
+/**
+ * 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.suggestion;
+
+import org.dspace.solr.MockSolrServer;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Service;
+
+/**
+ * Mock SOLR service for the suggestion Core.
+ */
+@Service
+public class MockSolrSuggestionStorageService extends SolrSuggestionStorageServiceImpl
+        implements InitializingBean, DisposableBean {
+    private MockSolrServer mockSolrServer;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        mockSolrServer = new MockSolrServer("suggestion");
+        solrSuggestionClient = mockSolrServer.getSolrServer();
+    }
+
+    /** Clear all records from the search core. */
+    public void reset() {
+        mockSolrServer.reset();
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        mockSolrServer.destroy();
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/app/suggestion/MockSuggestionExternalDataSource.java b/dspace-api/src/test/java/org/dspace/app/suggestion/MockSuggestionExternalDataSource.java
new file mode 100644
index 0000000000..cf0303debd
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/suggestion/MockSuggestionExternalDataSource.java
@@ -0,0 +1,67 @@
+/**
+ * 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.suggestion;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.commons.codec.binary.StringUtils;
+import org.dspace.core.Context;
+import org.dspace.external.model.ExternalDataObject;
+import org.dspace.external.provider.AbstractExternalDataProvider;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.dspace.utils.DSpace;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class MockSuggestionExternalDataSource extends AbstractExternalDataProvider {
+    public static final String NAME = "suggestion";
+
+    @Autowired
+    private SuggestionService suggestionService;
+
+    @Override
+    public String getSourceIdentifier() {
+        return NAME;
+    }
+
+    @Override
+    public Optional<ExternalDataObject> getExternalDataObject(String id) {
+        RequestService requestService = new DSpace().getRequestService();
+        Request currentRequest = requestService.getCurrentRequest();
+        Context context = (Context) currentRequest.getAttribute("dspace.context");
+        Suggestion suggestion = suggestionService.findUnprocessedSuggestion(context, id);
+        if (suggestion != null) {
+            ExternalDataObject extDataObj = new ExternalDataObject(NAME);
+            extDataObj.setDisplayValue(suggestion.getDisplay());
+            extDataObj.setId(suggestion.getExternalSourceUri()
+                    .substring(suggestion.getExternalSourceUri().lastIndexOf("/") + 1));
+            extDataObj.setMetadata(suggestion.getMetadata());
+            return Optional.of(extDataObj);
+        }
+        return null;
+    }
+
+    @Override
+    public List<ExternalDataObject> searchExternalDataObjects(String query, int start, int limit) {
+        return null;
+    }
+
+    @Override
+    public boolean supports(String source) {
+        return StringUtils.equals(NAME, source);
+    }
+
+    @Override
+    public int getNumberOfResults(String query) {
+        return 0;
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/suggestion/SuggestionUtilsIT.java b/dspace-api/src/test/java/org/dspace/app/suggestion/SuggestionUtilsIT.java
new file mode 100644
index 0000000000..98abfdb7d0
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/app/suggestion/SuggestionUtilsIT.java
@@ -0,0 +1,218 @@
+/**
+ * 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.suggestion;
+
+import static java.util.Optional.of;
+import static org.dspace.app.suggestion.SuggestionUtils.getFirstEntryByMetadatum;
+import static org.dspace.orcid.model.OrcidProfileSectionType.EXTERNAL_IDS;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.net.URL;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
+import org.apache.commons.collections.CollectionUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
+import org.dspace.external.factory.ExternalServiceFactory;
+import org.dspace.external.model.ExternalDataObject;
+import org.dspace.external.provider.ExternalDataProvider;
+import org.dspace.external.provider.impl.OrcidPublicationDataProvider;
+import org.dspace.external.service.ExternalDataService;
+import org.dspace.kernel.ServiceManager;
+import org.dspace.orcid.client.OrcidClient;
+import org.dspace.orcid.client.OrcidConfiguration;
+import org.dspace.orcid.factory.OrcidServiceFactory;
+import org.dspace.orcid.model.OrcidTokenResponseDTO;
+import org.dspace.orcid.service.OrcidProfileSectionFactoryService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.orcid.jaxb.model.v3.release.record.Work;
+import org.orcid.jaxb.model.v3.release.record.WorkBulk;
+import org.orcid.jaxb.model.v3.release.record.summary.Works;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Tests for suggestion utilities @see SuggestionUtils
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ */
+public class SuggestionUtilsIT extends AbstractIntegrationTestWithDatabase  {
+
+    private static ConfigurationService cfg;
+    private static final String ORCID = "0000-1111-2222-3333";
+    private static final String ACCESS_TOKEN = "32c83ccb-c6d5-4981-b6ea-6a34a36de8ab";
+    private static final String BASE_XML_DIR_PATH = "org/dspace/app/orcid-works/";
+    private OrcidPublicationDataProvider dataProvider;
+    private SolrSuggestionProvider solrSuggestionProvider;
+    private OrcidProfileSectionFactoryService profileSectionFactoryService;
+    private ItemService itemService;
+    private Collection collection;
+    private ExternalDataProvider primaryProvider;
+    private Collection persons;
+    private OrcidConfiguration orcidConfiguration;
+    private OrcidClient orcidClientMock;
+    private OrcidClient orcidClient;
+    private String originalClientId;
+
+    @Autowired
+    private SuggestionService suggestionService;
+
+    @Before
+    public void setup() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        persons = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Person")
+            .withName("Profiles")
+            .build();
+
+        profileSectionFactoryService = OrcidServiceFactory.getInstance().getOrcidProfileSectionFactoryService();
+        itemService = ContentServiceFactory.getInstance().getItemService();
+
+        context.restoreAuthSystemState();
+
+        cfg = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+        ServiceManager serviceManager = DSpaceServicesFactory.getInstance().getServiceManager();
+        HashMap<String,SuggestionProvider> providers = serviceManager.getServiceByName("suggestionProviders",
+            HashMap.class);
+        solrSuggestionProvider = (SolrSuggestionProvider) providers.get("scopus");
+        dataProvider = new DSpace().getServiceManager()
+            .getServiceByName("orcidPublicationDataProvider", OrcidPublicationDataProvider.class);
+        ExternalDataService externalDataService = ExternalServiceFactory.getInstance().getExternalDataService();
+        primaryProvider = externalDataService.getExternalDataProvider("openaireFunding");
+
+        orcidConfiguration = new DSpace().getServiceManager()
+            .getServiceByName("org.dspace.orcid.client.OrcidConfiguration", OrcidConfiguration.class);
+
+        orcidClientMock = mock(OrcidClient.class);
+        orcidClient = dataProvider.getOrcidClient();
+
+        dataProvider.setReadPublicAccessToken(null);
+        dataProvider.setOrcidClient(orcidClientMock);
+
+        originalClientId = orcidConfiguration.getClientId();
+        orcidConfiguration.setClientId("DSPACE-CLIENT-ID");
+        orcidConfiguration.setClientSecret("DSPACE-CLIENT-SECRET");
+
+        when(orcidClientMock.getReadPublicAccessToken()).thenReturn(buildTokenResponse(ACCESS_TOKEN));
+
+        when(orcidClientMock.getWorks(any(), eq(ORCID))).thenReturn(unmarshall("works.xml", Works.class));
+        when(orcidClientMock.getWorks(eq(ORCID))).thenReturn(unmarshall("works.xml", Works.class));
+
+        when(orcidClientMock.getObject(any(), eq(ORCID), any(), eq(Work.class)))
+            .then((invocation) -> of(unmarshall("work-" + invocation.getArgument(2) + ".xml", Work.class)));
+        when(orcidClientMock.getObject(eq(ORCID), any(), eq(Work.class)))
+            .then((invocation) -> of(unmarshall("work-" + invocation.getArgument(1) + ".xml", Work.class)));
+
+        when(orcidClientMock.getWorkBulk(any(), eq(ORCID), any()))
+            .then((invocation) -> unmarshallWorkBulk(invocation.getArgument(2)));
+        when(orcidClientMock.getWorkBulk(eq(ORCID), any()))
+            .then((invocation) -> unmarshallWorkBulk(invocation.getArgument(1)));
+    }
+
+    @After
+    public void after() {
+        dataProvider.setOrcidClient(orcidClient);
+        orcidConfiguration.setClientId(originalClientId);
+    }
+
+    @Test
+    public void testGetAllEntriesByMetadatum() {
+        context.turnOffAuthorisationSystem();
+        Item item = ItemBuilder.createItem(context, persons)
+            .withTitle("Test profile")
+            .withScopusAuthorIdentifier("SCOPUS-123456")
+            .withResearcherIdentifier("R-ID-01")
+            .build();
+        context.restoreAuthSystemState();
+
+        List<MetadataValue> values = List.of(getMetadata(item, "person.identifier.scopus-author-id", 0));
+
+        Object firstOrcidObject = profileSectionFactoryService.createOrcidObject(context, values, EXTERNAL_IDS);
+        Optional<ExternalDataObject> optional = dataProvider.getExternalDataObject(ORCID + "::277902");
+
+        ExternalDataObject externalDataObject = optional.get();
+        String openAireId = externalDataObject.getId();
+        Suggestion suggestion = new Suggestion(solrSuggestionProvider.getSourceName(), item, openAireId);
+        suggestion.getMetadata().add(
+                new MetadataValueDTO("dc", "title", null, null, "dcTitle"));
+        suggestion.setDisplay(getFirstEntryByMetadatum(externalDataObject, "dc", "title", null));
+        suggestion.getMetadata().add(new MetadataValueDTO("dc", "date", "issued", null, new Date().toString()));
+        suggestion.getMetadata().add(new MetadataValueDTO("dc", "description", "abstract", null, "description"));
+        suggestion.setExternalSourceUri(cfg.getProperty("dspace.server.url")
+                + "/api/integration/externalsources/" + primaryProvider.getSourceIdentifier() + "/entryValues/"
+                + openAireId);
+        List<String> result = SuggestionUtils.getAllEntriesByMetadatum(externalDataObject, "dc", "title", null);
+
+        assertTrue(result != null && !result.isEmpty());
+
+        assertTrue(CollectionUtils.isEqualCollection(
+            SuggestionUtils.getAllEntriesByMetadatum(externalDataObject, "dc.title"),
+            result));
+
+        String firstResult = SuggestionUtils.getFirstEntryByMetadatum(externalDataObject, "dc", "title", null);
+        assertTrue("Another cautionary tale.".equalsIgnoreCase(firstResult));
+        firstResult = SuggestionUtils.getFirstEntryByMetadatum(externalDataObject, "dc.title");
+        assertTrue("Another cautionary tale.".equalsIgnoreCase(firstResult));
+    }
+
+    private MetadataValue getMetadata(Item item, String metadataField, int place) {
+        List<MetadataValue> values = itemService.getMetadataByMetadataString(item, metadataField);
+        assertThat(values.size(), greaterThan(place));
+        return values.get(place);
+    }
+
+    private OrcidTokenResponseDTO buildTokenResponse(String accessToken) {
+        OrcidTokenResponseDTO response = new OrcidTokenResponseDTO();
+        response.setAccessToken(accessToken);
+        return response;
+    }
+
+    private WorkBulk unmarshallWorkBulk(List<String> putCodes) throws Exception {
+        return unmarshall("workBulk-" + String.join("-", putCodes) + ".xml", WorkBulk.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    private <T> T unmarshall(String fileName, Class<T> clazz) throws Exception {
+        JAXBContext jaxbContext = JAXBContext.newInstance(clazz);
+        Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+        URL resource = getClass().getClassLoader().getResource(BASE_XML_DIR_PATH + fileName);
+        if (resource == null) {
+            throw new IllegalStateException("No resource found named " + BASE_XML_DIR_PATH + fileName);
+        }
+        return (T) unmarshaller.unmarshal(new File(resource.getFile()));
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java b/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java
index 78142c9258..4058974d41 100644
--- a/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/util/GoogleBitstreamComparatorTest.java
@@ -368,8 +368,8 @@ public class GoogleBitstreamComparatorTest extends AbstractUnitTest {
             "bitstream2 has a type with a priority higher than bitstream1 (size is ignored) and should come second",
             "bitstream2", toSort.get(1).getName());
         assertEquals(
-            "bitstream1 has a type with the lowest priority in this bundle eventhough it is the largest bitstream and" +
-                " should come last",
+            "bitstream1 has a type with the lowest priority in this bundle even though it is the largest bitstream" +
+                " and should come last",
             "bitstream1", toSort.get(2).getName());
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java b/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java
index ee6723480e..9baf0fe3e9 100644
--- a/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java
+++ b/dspace-api/src/test/java/org/dspace/app/util/GoogleMetadataTest.java
@@ -16,11 +16,15 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
+import java.time.Period;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import com.google.common.base.Splitter;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractUnitTest;
 import org.dspace.authorize.AuthorizeException;
@@ -41,10 +45,6 @@ import org.dspace.core.Constants;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
 import org.dspace.eperson.service.GroupService;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.MutablePeriod;
-import org.joda.time.format.PeriodFormat;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +54,7 @@ public class GoogleMetadataTest extends AbstractUnitTest {
     /**
      * log4j category
      */
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(GoogleMetadataTest.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Item instance for the tests
@@ -125,19 +125,17 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         Bitstream b = bitstreamService.create(
             context, new ByteArrayInputStream("Bitstream 1".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "Word");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("application/msword");
+        b.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/msword"));
         bundleService.addBitstream(context, bundle, b);
         Bitstream b2 = bitstreamService.create(
             context, new ByteArrayInputStream("Bitstream 2".getBytes(StandardCharsets.UTF_8)));
         b2.setName(context, "Pdf");
-        b2.setFormat(context, bitstreamFormatService.create(context));
-        b2.getFormat(context).setMIMEType("application/pdf");
+        b2.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b2);
         Bitstream b3 = bitstreamService.create(
             context, new ByteArrayInputStream("Bitstream 3".getBytes(StandardCharsets.UTF_8)));
         b3.setName(context, "Rtf");
-        b3.setFormat(context, bitstreamFormatService.create(context));
+        b3.setFormat(context, bitstreamFormatService.findByMIMEType(context, "text/richtext"));
         b3.getFormat(context).setMIMEType("text/richtext");
         bundleService.addBitstream(context, bundle, b3);
         context.restoreAuthSystemState();
@@ -160,20 +158,17 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         Bitstream b = bitstreamService.create(
             context, new ByteArrayInputStream("123456789".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "size9");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("application/pdf");
+        b.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b);
         Bitstream b2 = bitstreamService.create(
             context, new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
         b2.setName(context, "size1");
-        b2.setFormat(context, bitstreamFormatService.create(context));
-        b2.getFormat(context).setMIMEType("application/pdf");
+        b2.setFormat(context,  bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b2);
         Bitstream b3 = bitstreamService.create(
             context, new ByteArrayInputStream("12345".getBytes(StandardCharsets.UTF_8)));
         b3.setName(context, "size5");
-        b3.setFormat(context, bitstreamFormatService.create(context));
-        b3.getFormat(context).setMIMEType("text/richtext");
+        b3.setFormat(context,  bitstreamFormatService.findByMIMEType(context, "text/richtext"));
         bundleService.addBitstream(context, bundle, b3);
         context.restoreAuthSystemState();
         context.commit();
@@ -195,20 +190,17 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         Bitstream b = bitstreamService.create(
             context, new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "first");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("application/pdf");
+        b.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b);
         Bitstream b2 = bitstreamService.create(
             context, new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
         b2.setName(context, "second");
-        b2.setFormat(context, bitstreamFormatService.create(context));
-        b2.getFormat(context).setMIMEType("application/pdf");
+        b2.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b2);
         Bitstream b3 = bitstreamService.create(
             context, new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
         b3.setName(context, "third");
-        b3.setFormat(context, bitstreamFormatService.create(context));
-        b3.getFormat(context).setMIMEType("application/pdf");
+        b3.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b3);
         context.restoreAuthSystemState();
         context.commit();
@@ -230,20 +222,17 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         Bitstream b = bitstreamService.create(
             context, new ByteArrayInputStream("Larger file than primary".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "first");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("unknown");
+        b.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b);
         Bitstream b2 = bitstreamService.create(context, new ByteArrayInputStream(
             "Bitstream with more prioritized mimetype than primary".getBytes(StandardCharsets.UTF_8)));
         b2.setName(context, "second");
-        b2.setFormat(context, bitstreamFormatService.create(context));
-        b2.getFormat(context).setMIMEType("application/pdf");
+        b2.setFormat(context, bitstreamFormatService.findByMIMEType(context, "application/pdf"));
         bundleService.addBitstream(context, bundle, b2);
         Bitstream b3 = bitstreamService.create(
             context, new ByteArrayInputStream("1".getBytes(StandardCharsets.UTF_8)));
         b3.setName(context, "primary");
-        b3.setFormat(context, bitstreamFormatService.create(context));
-        b3.getFormat(context).setMIMEType("Primary");
+        b3.setFormat(context, bitstreamFormatService.findByMIMEType(context, "text/richtext"));
         bundleService.addBitstream(context, bundle, b3);
         bundle.setPrimaryBitstreamID(b3);
         context.restoreAuthSystemState();
@@ -267,20 +256,17 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         Bitstream b = bitstreamService.create(
             context, new ByteArrayInputStream("12".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "small");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("unknown type 1");
+        b.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b);
         Bitstream b2 = bitstreamService.create(
             context, new ByteArrayInputStream("12121212".getBytes(StandardCharsets.UTF_8)));
         b2.setName(context, "medium");
-        b2.setFormat(context, bitstreamFormatService.create(context));
-        b2.getFormat(context).setMIMEType("unknown type 2");
+        b2.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b2);
         Bitstream b3 = bitstreamService.create(
             context, new ByteArrayInputStream("12121212121212".getBytes(StandardCharsets.UTF_8)));
         b3.setName(context, "large");
-        b3.setFormat(context, bitstreamFormatService.create(context));
-        b3.getFormat(context).setMIMEType("unknown type 3");
+        b3.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b3);
         context.restoreAuthSystemState();
         context.commit();
@@ -319,6 +305,7 @@ public class GoogleMetadataTest extends AbstractUnitTest {
 
     /**
      * Test empty bitstreams
+     * @throws java.lang.Exception passed through.
      */
     @Test
     public void testGetPDFURLWithEmptyBitstreams() throws Exception {
@@ -327,18 +314,15 @@ public class GoogleMetadataTest extends AbstractUnitTest {
 
         Bitstream b = bitstreamService.create(context, new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "small");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("unknown type 1");
+        b.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b);
         Bitstream b2 = bitstreamService.create(context, new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)));
         b2.setName(context, "medium");
-        b2.setFormat(context, bitstreamFormatService.create(context));
-        b2.getFormat(context).setMIMEType("unknown type 2");
+        b2.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b2);
         Bitstream b3 = bitstreamService.create(context, new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8)));
         b3.setName(context, "large");
-        b3.setFormat(context, bitstreamFormatService.create(context));
-        b3.getFormat(context).setMIMEType("unknown type 3");
+        b3.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b3);
         context.restoreAuthSystemState();
         context.commit();
@@ -348,8 +332,9 @@ public class GoogleMetadataTest extends AbstractUnitTest {
     }
 
     /**
-     * Verify there is no mapping for {@link GoogleMetadata#PDF} if there are only embargoed (non-publically accessible
-     * bitstream) files
+     * Verify there is no mapping for {@link GoogleMetadata#PDF} if there are
+     * only embargoed (non-publicly accessible bitstream) files.
+     * @throws java.lang.Exception passed through.
      */
     @Test
     public void testGetPdfUrlOfEmbargoed() throws Exception {
@@ -359,12 +344,13 @@ public class GoogleMetadataTest extends AbstractUnitTest {
         Bitstream b = bitstreamService.create(
             context, new ByteArrayInputStream("Larger file than primary".getBytes(StandardCharsets.UTF_8)));
         b.setName(context, "first");
-        b.setFormat(context, bitstreamFormatService.create(context));
-        b.getFormat(context).setMIMEType("unknown");
+        b.setFormat(context, bitstreamFormatService.findUnknown(context));
         bundleService.addBitstream(context, bundle, b);
         // Set 3 month embargo on pdf
-        MutablePeriod period = PeriodFormat.getDefault().parseMutablePeriod("3 months");
-        Date embargoDate = DateTime.now(DateTimeZone.UTC).plus(period).toDate();
+        Period period = Period.ofMonths(3);
+        Date embargoDate = Date.from(ZonedDateTime.now(ZoneOffset.UTC)
+                .plus(period)
+                .toInstant());
         Group anonGroup = groupService.findByName(context, Group.ANONYMOUS);
         authorizeService.removeAllPolicies(context, b);
         resourcePolicyService.removeAllPolicies(context, b);
diff --git a/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigIT.java b/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigIT.java
index f171c45328..73d4434abf 100644
--- a/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigIT.java
+++ b/dspace-api/src/test/java/org/dspace/app/util/SubmissionConfigIT.java
@@ -26,22 +26,36 @@ import org.junit.Test;
 public class SubmissionConfigIT extends AbstractIntegrationTestWithDatabase {
 
     @Test
-    public void testSubmissionConfigMapByCollectionOrEntityType()
+    public void testSubmissionMapByCommunityHandleSubmissionConfig()
         throws SubmissionConfigReaderException {
 
         context.turnOffAuthorisationSystem();
-        // Sep up a structure with one top community and two collections
+        // Sep up a structure with one top community and two subcommunities with collections
         Community topcom = CommunityBuilder.createCommunity(context, "123456789/topcommunity-test")
             .withName("Parent Community")
             .build();
-        // col1 should use the item submission form directly mapped for this collection
-        Collection col1 = CollectionBuilder.createCollection(context, topcom, "123456789/collection-test")
+        Community subcom1 = CommunityBuilder.createSubCommunity(context, topcom, "123456789/subcommunity-test")
+            .withName("Subcommunity 1")
+            .build();
+        Community subcom2 = CommunityBuilder.createSubCommunity(context, topcom, "123456789/not-mapped3")
+            .withName("Subcommunity 2")
+            .build();
+        // col1 should use the form item submission form mapped for subcom1
+        Collection col1 = CollectionBuilder.createCollection(context, subcom1, "123456789/not-mapped1")
             .withName("Collection 1")
+            .build();
+        // col2 should use the item submission form mapped for the top community
+        Collection col2 = CollectionBuilder.createCollection(context, subcom2, "123456789/not-mapped2")
+            .withName("Collection 2")
+            .build();
+        // col3 should use the item submission form directly mapped for this collection
+        Collection col3 = CollectionBuilder.createCollection(context, subcom1, "123456789/collection-test")
+            .withName("Collection 3")
             .withEntityType("CustomEntityType")
             .build();
-        // col2 should use the item submission form mapped for the entity type CustomEntityType
-        Collection col2 = CollectionBuilder.createCollection(context, topcom, "123456789/not-mapped1")
-            .withName("Collection 2")
+        // col4 should use the item submission form mapped for the entity type CustomEntityType
+        Collection col4 = CollectionBuilder.createCollection(context, subcom1, "123456789/not-mapped4")
+            .withName("Collection 4")
             .withEntityType("CustomEntityType")
             .build();
         context.restoreAuthSystemState();
@@ -49,12 +63,20 @@ public class SubmissionConfigIT extends AbstractIntegrationTestWithDatabase {
         SubmissionConfigService submissionConfigService = SubmissionServiceFactory.getInstance()
             .getSubmissionConfigService();
 
-        // for col1, it should return the item submission form defined directly for the collection
+        // for col1, it should return the item submission form defined for their parent subcom1
         SubmissionConfig submissionConfig1 = submissionConfigService.getSubmissionConfigByCollection(col1);
-        assertEquals("collectiontest", submissionConfig1.getSubmissionName());
+        assertEquals("subcommunitytest", submissionConfig1.getSubmissionName());
 
-        // for col2, it should return the item submission form defined for the entitytype CustomEntityType
+        // for col2, it should return the item submission form defined for topcom
         SubmissionConfig submissionConfig2 = submissionConfigService.getSubmissionConfigByCollection(col2);
-        assertEquals("entitytypetest", submissionConfig2.getSubmissionName());
+        assertEquals("topcommunitytest", submissionConfig2.getSubmissionName());
+
+        // for col3, it should return the item submission form defined directly for the collection
+        SubmissionConfig submissionConfig3 = submissionConfigService.getSubmissionConfigByCollection(col3);
+        assertEquals("collectiontest", submissionConfig3.getSubmissionName());
+
+        // for col4, it should return the item submission form defined for the entitytype CustomEntityType
+        SubmissionConfig submissionConfig4 = submissionConfigService.getSubmissionConfigByCollection(col4);
+        assertEquals("entitytypetest", submissionConfig4.getSubmissionName());
     }
-}
\ No newline at end of file
+}
diff --git a/dspace-api/src/test/java/org/dspace/authority/AuthorityValueTest.java b/dspace-api/src/test/java/org/dspace/authority/AuthorityValueTest.java
new file mode 100644
index 0000000000..0857d07fde
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/authority/AuthorityValueTest.java
@@ -0,0 +1,52 @@
+/**
+ * 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.authority;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.util.Date;
+
+import org.junit.Test;
+
+/**
+ *
+ * @author mwood
+ */
+public class AuthorityValueTest {
+    /**
+     * Test of stringToDate method, of class AuthorityValue.
+     */
+    @Test
+    public void testStringToDate() {
+        Date expected;
+        Date actual;
+
+        // Test an invalid date.
+        actual = AuthorityValue.stringToDate("not a date");
+        assertNull("Unparsable date should return null", actual);
+
+        // Test a date-time without zone or offset.
+        expected = Date.from(LocalDateTime.of(1957, 01, 27, 01, 23, 45)
+                .atZone(ZoneId.systemDefault())
+                .toInstant());
+        actual = AuthorityValue.stringToDate("1957-01-27T01:23:45");
+        assertEquals("Local date-time should convert", expected, actual);
+
+        // Test a date-time with milliseconds and offset from UTC.
+        expected = Date.from(LocalDateTime.of(1957, 01, 27, 01, 23, 45, 678_000_000)
+                .atZone(ZoneOffset.of("-05"))
+                .toInstant());
+        actual = AuthorityValue.stringToDate("1957-01-27T01:23:45.678-05");
+        assertEquals("Zoned date-time with milliseconds should convert",
+                expected, actual);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
index f84d17fc7a..93c23564cb 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractBuilder.java
@@ -14,8 +14,14 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.alerts.service.SystemWideAlertService;
+import org.dspace.app.ldn.factory.NotifyServiceFactory;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
 import org.dspace.app.requestitem.factory.RequestItemServiceFactory;
 import org.dspace.app.requestitem.service.RequestItemService;
+import org.dspace.app.suggestion.SolrSuggestionStorageService;
 import org.dspace.app.util.SubmissionConfigReaderException;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
@@ -45,10 +51,13 @@ import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.eperson.service.RegistrationDataService;
 import org.dspace.eperson.service.SubscribeService;
+import org.dspace.identifier.factory.IdentifierServiceFactory;
+import org.dspace.identifier.service.DOIService;
 import org.dspace.orcid.factory.OrcidServiceFactory;
 import org.dspace.orcid.service.OrcidHistoryService;
 import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.orcid.service.OrcidTokenService;
+import org.dspace.qaevent.service.QAEventService;
 import org.dspace.scripts.factory.ScriptServiceFactory;
 import org.dspace.scripts.service.ProcessService;
 import org.dspace.services.factory.DSpaceServicesFactory;
@@ -56,6 +65,7 @@ import org.dspace.submit.factory.SubmissionServiceFactory;
 import org.dspace.submit.service.SubmissionConfigService;
 import org.dspace.supervision.factory.SupervisionOrderServiceFactory;
 import org.dspace.supervision.service.SupervisionOrderService;
+import org.dspace.utils.DSpace;
 import org.dspace.versioning.factory.VersionServiceFactory;
 import org.dspace.versioning.service.VersionHistoryService;
 import org.dspace.versioning.service.VersioningService;
@@ -106,6 +116,7 @@ public abstract class AbstractBuilder<T, S> {
     static ProcessService processService;
     static RequestItemService requestItemService;
     static VersioningService versioningService;
+    static DOIService doiService;
     static OrcidHistoryService orcidHistoryService;
     static OrcidQueueService orcidQueueService;
     static OrcidTokenService orcidTokenService;
@@ -113,7 +124,13 @@ public abstract class AbstractBuilder<T, S> {
     static SubmissionConfigService submissionConfigService;
     static SubscribeService subscribeService;
     static SupervisionOrderService supervisionOrderService;
+    static NotifyService notifyService;
+    static NotifyServiceInboundPatternService inboundPatternService;
+    static NotifyPatternToTriggerService notifyPatternToTriggerService;
 
+    static QAEventService qaEventService;
+    static SolrSuggestionStorageService solrSuggestionService;
+    static LDNMessageService ldnMessageService;
 
     protected Context context;
 
@@ -164,6 +181,7 @@ public abstract class AbstractBuilder<T, S> {
         requestItemService = RequestItemServiceFactory.getInstance().getRequestItemService();
         versioningService = DSpaceServicesFactory.getInstance().getServiceManager()
                                  .getServiceByName(VersioningService.class.getName(), VersioningService.class);
+        doiService = IdentifierServiceFactory.getInstance().getDOIService();
 
         // Temporarily disabled
         claimedTaskService = XmlWorkflowServiceFactory.getInstance().getClaimedTaskService();
@@ -182,6 +200,12 @@ public abstract class AbstractBuilder<T, S> {
         }
         subscribeService = ContentServiceFactory.getInstance().getSubscribeService();
         supervisionOrderService = SupervisionOrderServiceFactory.getInstance().getSupervisionOrderService();
+        notifyService = NotifyServiceFactory.getInstance().getNotifyService();
+        inboundPatternService = NotifyServiceFactory.getInstance().getNotifyServiceInboundPatternService();
+        notifyPatternToTriggerService = NotifyServiceFactory.getInstance().getNotifyPatternToTriggerService();
+        qaEventService = new DSpace().getSingletonService(QAEventService.class);
+        solrSuggestionService = new DSpace().getSingletonService(SolrSuggestionStorageService.class);
+        ldnMessageService = NotifyServiceFactory.getInstance().getLDNMessageService();
     }
 
 
@@ -214,11 +238,17 @@ public abstract class AbstractBuilder<T, S> {
         processService = null;
         requestItemService = null;
         versioningService = null;
+        doiService = null;
         orcidTokenService = null;
         systemWideAlertService = null;
         submissionConfigService = null;
         subscribeService = null;
         supervisionOrderService = null;
+        notifyService = null;
+        inboundPatternService = null;
+        notifyPatternToTriggerService = null;
+        qaEventService = null;
+        ldnMessageService = null;
 
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java b/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
index b20515017a..fa7306ad99 100644
--- a/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/AbstractDSpaceObjectBuilder.java
@@ -8,29 +8,28 @@
 package org.dspace.builder;
 
 import java.sql.SQLException;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.ZoneId;
 import java.util.Date;
 
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.content.DSpaceObject;
-import org.dspace.content.Item;
 import org.dspace.content.service.DSpaceObjectService;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.MutablePeriod;
-import org.joda.time.format.PeriodFormat;
-import org.joda.time.format.PeriodFormatter;
 
 /**
  * Abstract builder to construct DSpace Objects
  *
  * @author Tom Desair (tom dot desair at atmire dot com)
  * @author Raf Ponsaerts (raf dot ponsaerts at atmire dot com)
+ * @param <T> concrete type of DSpaceObject
  */
 public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
     extends AbstractBuilder<T, DSpaceObjectService> {
@@ -103,7 +102,7 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
                                                                                   final String qualifier,
                                                                                   final String value) {
         try {
-            getService().setMetadataSingleValue(context, dso, schema, element, qualifier, Item.ANY, value);
+            getService().setMetadataSingleValue(context, dso, schema, element, qualifier, null, value);
         } catch (Exception e) {
             return handleException(e);
         }
@@ -112,21 +111,27 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
     }
 
     /**
-     * Support method to grant the {@link Constants#READ} permission over an object only to the {@link Group#ANONYMOUS}
-     * after the specified embargoPeriod. Any other READ permissions will be removed
+     * Support method to grant the {@link Constants#READ} permission over an
+     * object only to the {@link Group#ANONYMOUS} after the specified
+     * embargoPeriod.  Any other READ permissions will be removed.
      *
+     * @param <B> type of this Builder.
      * @param embargoPeriod
-     *            the embargo period after which the READ permission will be active. It is parsed using the
-     *            {@link PeriodFormatter#parseMutablePeriod(String)} method of the joda library
-     * @param dso
-     *            the DSpaceObject on which grant the permission
-     * @return the builder properly configured to retain read permission on the object only for the specified group
+     *            the embargo period after which the READ permission will be
+     *            active.
+     * @param dso the DSpaceObject on which to grant the permission.
+     * @return the builder properly configured to retain read permission on the
+     *         object only for the specified group.
      */
-    protected <B extends AbstractDSpaceObjectBuilder<T>> B setEmbargo(String embargoPeriod, DSpaceObject dso) {
+    protected <B extends AbstractDSpaceObjectBuilder<T>> B setEmbargo(Period embargoPeriod, DSpaceObject dso) {
         // add policy just for anonymous
         try {
-            MutablePeriod period = PeriodFormat.getDefault().parseMutablePeriod(embargoPeriod);
-            Date embargoDate = DateTime.now(DateTimeZone.UTC).plus(period).toDate();
+            Instant embargoInstant = LocalDate.now()
+                    .plus(embargoPeriod)
+                    .atStartOfDay()
+                    .atZone(ZoneId.systemDefault())
+                    .toInstant();
+            Date embargoDate = Date.from(embargoInstant);
 
             return setOnlyReadPermission(dso, groupService.findByName(context, Group.ANONYMOUS), embargoDate);
         } catch (Exception e) {
@@ -135,14 +140,19 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
     }
 
     /**
-     * Support method to grant the {@link Constants#READ} permission over an object only to a specific group. Any other
-     * READ permissions will be removed
+     * Support method to grant the {@link Constants#READ} permission over an
+     * object only to a specific group.Any other READ permissions will be
+     * removed.
      *
+     * @param <B> type of this Builder.
      * @param dso
      *            the DSpaceObject on which grant the permission
      * @param group
      *            the EPersonGroup that will be granted of the permission
-     * @return the builder properly configured to retain read permission on the object only for the specified group
+     * @param startDate
+     *            the date on which access begins.
+     * @return the builder properly configured to retain read permission on the
+     *            object only for the specified group.
      */
     protected <B extends AbstractDSpaceObjectBuilder<T>> B setOnlyReadPermission(DSpaceObject dso, Group group,
                                                                                  Date startDate) {
@@ -161,15 +171,20 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
         }
         return (B) this;
     }
+
     /**
-     * Support method to grant the {@link Constants#ADMIN} permission over an object only to a specific eperson.
-     * If another ADMIN policy is in place for an eperson it will be replaced
+     * Support method to grant the {@link Constants#READ} permission over an
+     * object only to a specific EPerson.  Any other READ permissions will be
+     * removed.
      *
+     * @param <B> type of this Builder.
      * @param dso
      *            the DSpaceObject on which grant the permission
      * @param eperson
-     *            the eperson that will be granted of the permission
-     * @return the builder properly configured to build the object with the additional admin permission
+     *            the EPerson that will be granted of the permission
+     * @param startDate the date on which access begins.
+     * @return the builder properly configured to build the object with the
+     *            additional admin permission.
      */
     protected <B extends AbstractDSpaceObjectBuilder<T>> B setAdminPermission(DSpaceObject dso, EPerson eperson,
                                                                                  Date startDate) {
@@ -191,6 +206,7 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
     /**
      * Support method to grant {@link Constants#REMOVE} permission to a specific eperson
      *
+     * @param <B> type of this Builder.
      * @param dso
      *            the DSpaceObject on which grant the permission
      * @param eperson
@@ -220,6 +236,7 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
     /**
      * Support method to grant {@link Constants#ADD} permission to a specific eperson
      *
+     * @param <B> type of this Builder.
      * @param dso
      *            the DSpaceObject on which grant the permission
      * @param eperson
@@ -249,6 +266,7 @@ public abstract class AbstractDSpaceObjectBuilder<T extends DSpaceObject>
     /**
      * Support method to grant {@link Constants#WRITE} permission to a specific eperson
      *
+     * @param <B> type of this Builder.
      * @param dso
      *            the DSpaceObject on which grant the permission
      * @param eperson
diff --git a/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java b/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
index 3222fe9ed8..987a367282 100644
--- a/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/BitstreamBuilder.java
@@ -10,6 +10,7 @@ package org.dspace.builder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.time.Period;
 import java.util.List;
 
 import org.dspace.authorize.AuthorizeException;
@@ -182,17 +183,11 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
     }
 
     public BitstreamBuilder withFormat(String format) throws SQLException {
-
-        bitstreamService.addMetadata(context, bitstream, "dc", "format", null, null, format);
-
-        return this;
+        return withMetadata("dc", "format", null, null, format);
     }
 
     public BitstreamBuilder withProvenance(String provenance) throws SQLException {
-
-        bitstreamService.addMetadata(context, bitstream, "dc", "description", "provenance", null, provenance);
-
-        return this;
+        return withMetadata("dc", "description", "provenance", null, provenance);
     }
 
 
@@ -202,22 +197,24 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
     }
 
     public BitstreamBuilder withIIIFLabel(String label) throws SQLException {
-        bitstreamService.addMetadata(context, bitstream, "iiif", "label", null, null, label);
-        return this;
+        return withMetadata("iiif", "label", null, null, label);
     }
 
     public BitstreamBuilder withIIIFCanvasWidth(int i) throws SQLException {
-        bitstreamService.addMetadata(context, bitstream, "iiif", "image", "width", null, String.valueOf(i));
-        return this;
+        return withMetadata("iiif", "image", "width", null, String.valueOf(i));
     }
 
     public BitstreamBuilder withIIIFCanvasHeight(int i) throws SQLException {
-        bitstreamService.addMetadata(context, bitstream, "iiif", "image", "height", null, String.valueOf(i));
-        return this;
+        return withMetadata("iiif", "image", "height", null, String.valueOf(i));
     }
 
     public BitstreamBuilder withIIIFToC(String toc) throws SQLException {
-        bitstreamService.addMetadata(context, bitstream, "iiif", "toc", null, null, toc);
+        return withMetadata("iiif", "toc", null, null, toc);
+    }
+
+    public BitstreamBuilder withMetadata(String schema, String element, String qualifier, String lang, String value)
+        throws SQLException {
+        bitstreamService.addMetadata(context, bitstream, schema, element, qualifier, lang, value);
         return this;
     }
 
@@ -236,7 +233,7 @@ public class BitstreamBuilder extends AbstractDSpaceObjectBuilder<Bitstream> {
         return targetBundle;
     }
 
-    public BitstreamBuilder withEmbargoPeriod(String embargoPeriod) {
+    public BitstreamBuilder withEmbargoPeriod(Period embargoPeriod) {
         return setEmbargo(embargoPeriod, bitstream);
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/builder/DOIBuilder.java b/dspace-api/src/test/java/org/dspace/builder/DOIBuilder.java
new file mode 100644
index 0000000000..cbfcd798c3
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/DOIBuilder.java
@@ -0,0 +1,90 @@
+/**
+ * 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.builder;
+
+import java.sql.SQLException;
+
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.DSpaceObject;
+import org.dspace.core.Context;
+import org.dspace.identifier.DOI;
+import org.dspace.identifier.service.DOIService;
+
+/**
+ * Builder for {@link DOI} entities.
+ */
+public class DOIBuilder extends AbstractBuilder<DOI, DOIService> {
+
+    private DOI doi;
+
+    protected DOIBuilder(Context context) {
+        super(context);
+    }
+
+    public static DOIBuilder createDOI(final Context context) {
+        DOIBuilder builder = new DOIBuilder(context);
+        return builder.create(context);
+    }
+
+    private DOIBuilder create(final Context context) {
+        try {
+            this.doi = doiService.create(context);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        return this;
+    }
+
+    public DOIBuilder withDoi(final String doi) {
+        this.doi.setDoi(doi);
+        return this;
+    }
+
+    public DOIBuilder withDSpaceObject(final DSpaceObject dSpaceObject) {
+        this.doi.setDSpaceObject(dSpaceObject);
+        return this;
+    }
+
+    public DOIBuilder withStatus(final Integer status) {
+        this.doi.setStatus(status);
+        return this;
+    }
+
+    @Override
+    public DOI build() throws SQLException, AuthorizeException {
+        return this.doi;
+    }
+
+    @Override
+    public void delete(Context c, DOI doi) throws Exception {
+        try {
+            doiService.delete(c, doi);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        try (Context context = new Context()) {
+            context.setDispatcher("noindex");
+            context.turnOffAuthorisationSystem();
+            this.doi = context.reloadEntity(this.doi);
+            if (this.doi != null) {
+                delete(context, this.doi);
+                context.complete();
+            }
+        }
+    }
+
+    @Override
+    protected DOIService getService() {
+        return doiService;
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java b/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java
index b3447dd8bd..c16fb696b0 100644
--- a/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/GroupBuilder.java
@@ -12,6 +12,9 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.DSpaceObject;
 import org.dspace.content.service.DSpaceObjectService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
@@ -51,6 +54,33 @@ public class GroupBuilder extends AbstractDSpaceObjectBuilder<Group> {
         return builder.create(context);
     }
 
+    public static GroupBuilder createCollectionAdminGroup(final Context context, Collection collection) {
+        GroupBuilder builder = new GroupBuilder(context);
+        return builder.createAdminGroup(context, collection);
+    }
+
+    public static GroupBuilder createCollectionSubmitterGroup(final Context context, Collection collection) {
+        GroupBuilder builder = new GroupBuilder(context);
+        return builder.createSubmitterGroup(context, collection);
+    }
+
+    public static GroupBuilder createCollectionDefaultReadGroup(final Context context, Collection collection,
+                                                                String typeOfGroupString, int defaultRead) {
+        GroupBuilder builder = new GroupBuilder(context);
+        return builder.createDefaultReadGroup(context, collection, typeOfGroupString, defaultRead);
+    }
+
+    public static GroupBuilder createCollectionWorkflowRoleGroup(final Context context, Collection collection,
+                                                                String roleName) {
+        GroupBuilder builder = new GroupBuilder(context);
+        return builder.createWorkflowRoleGroup(context, collection, roleName);
+    }
+
+    public static GroupBuilder createCommunityAdminGroup(final Context context, Community community) {
+        GroupBuilder builder = new GroupBuilder(context);
+        return builder.createAdminGroup(context, community);
+    }
+
     private GroupBuilder create(final Context context) {
         this.context = context;
         try {
@@ -61,6 +91,54 @@ public class GroupBuilder extends AbstractDSpaceObjectBuilder<Group> {
         return this;
     }
 
+    private GroupBuilder createAdminGroup(final Context context, DSpaceObject container) {
+        this.context = context;
+        try {
+            if (container instanceof Collection) {
+                group = collectionService.createAdministrators(context, (Collection) container);
+            } else if (container instanceof Community) {
+                group = communityService.createAdministrators(context, (Community) container);
+            } else {
+                handleException(new IllegalArgumentException("DSpaceObject must be collection or community. " +
+                        "Type: " + container.getType()));
+            }
+        } catch (Exception e) {
+            return handleException(e);
+        }
+        return this;
+    }
+
+    private GroupBuilder createSubmitterGroup(final Context context, Collection collection) {
+        this.context = context;
+        try {
+            group = collectionService.createSubmitters(context, collection);
+        } catch (Exception e) {
+            return handleException(e);
+        }
+        return this;
+    }
+
+    private GroupBuilder createDefaultReadGroup(final Context context, Collection collection,
+                                                String typeOfGroupString, int defaultRead) {
+        this.context = context;
+        try {
+            group = collectionService.createDefaultReadGroup(context, collection, typeOfGroupString, defaultRead);
+        } catch (Exception e) {
+            return handleException(e);
+        }
+        return this;
+    }
+
+    private GroupBuilder createWorkflowRoleGroup(final Context context, Collection collection, String roleName) {
+        this.context = context;
+        try {
+            group = workflowService.createWorkflowRoleGroup(context, collection, roleName);
+        } catch (Exception e) {
+            return handleException(e);
+        }
+        return this;
+    }
+
     @Override
     protected DSpaceObjectService<Group> getService() {
         return groupService;
diff --git a/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
index 3e5ab0f38f..5e9545fcaf 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ItemBuilder.java
@@ -13,6 +13,7 @@ import static org.dspace.content.authority.Choices.CF_ACCEPTED;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.Period;
 import java.util.UUID;
 
 import org.dspace.authorize.AuthorizeException;
@@ -185,6 +186,10 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         return addMetadataValue(item, "iiif", "image", "height", String.valueOf(i));
     }
 
+    public ItemBuilder withDSpaceObjectOwner(String name, String authority) {
+        return addMetadataValue(item, "dspace", "object", "owner", null, name, authority, 600);
+    }
+
     public ItemBuilder withMetadata(final String schema, final String element, final String qualifier,
         final String value) {
         return addMetadataValue(item, schema, element, qualifier, value);
@@ -281,8 +286,8 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
     }
 
     /**
-     * Withdrawn the item under build. Please note that an user need to be loggedin the context to avoid NPE during the
-     * creation of the provenance metadata
+     * Withdraw the item under build. Please note that the Context must be
+     * logged in to avoid NPE during the creation of the provenance metadata.
      *
      * @return the ItemBuilder
      */
@@ -291,7 +296,13 @@ public class ItemBuilder extends AbstractDSpaceObjectBuilder<Item> {
         return this;
     }
 
-    public ItemBuilder withEmbargoPeriod(String embargoPeriod) {
+    /**
+     * Set an embargo to end after some time from "now".
+     *
+     * @param embargoPeriod embargo starting "now", for this long.
+     * @return the ItemBuilder.
+     */
+    public ItemBuilder withEmbargoPeriod(Period embargoPeriod) {
         return setEmbargo(embargoPeriod, item);
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/builder/LDNMessageBuilder.java b/dspace-api/src/test/java/org/dspace/builder/LDNMessageBuilder.java
new file mode 100644
index 0000000000..1ed3694573
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/LDNMessageBuilder.java
@@ -0,0 +1,127 @@
+/**
+ * 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.builder;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+
+/**
+ * Builder for {@link LDNMessageEntity} entities.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ *
+ */
+public class LDNMessageBuilder extends AbstractBuilder<LDNMessageEntity, LDNMessageService> {
+
+    /* Log4j logger*/
+    private static final Logger log = LogManager.getLogger();
+
+    private LDNMessageEntity ldnMessageEntity;
+
+    protected LDNMessageBuilder(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected LDNMessageService getService() {
+        return ldnMessageService;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        try (Context c = new Context()) {
+            c.setDispatcher("noindex");
+            c.turnOffAuthorisationSystem();
+            // Ensure object and any related objects are reloaded before checking to see what needs cleanup
+            ldnMessageEntity = c.reloadEntity(ldnMessageEntity);
+            if (ldnMessageEntity != null) {
+                delete(ldnMessageEntity);
+            }
+            c.complete();
+            indexingService.commit();
+        }
+    }
+
+    @Override
+    public void delete(Context c, LDNMessageEntity ldnMessageEntity) throws Exception {
+        if (ldnMessageEntity != null) {
+            getService().delete(c, ldnMessageEntity);
+        }
+    }
+
+    @Override
+    public LDNMessageEntity build() {
+        try {
+
+            ldnMessageService.update(context, ldnMessageEntity);
+            context.dispatchEvents();
+
+            indexingService.commit();
+        } catch (SearchServiceException | SQLException e) {
+            log.error(e);
+        }
+        return ldnMessageEntity;
+    }
+
+    public void delete(LDNMessageEntity ldnMessageEntity) throws Exception {
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            LDNMessageEntity nsEntity = c.reloadEntity(ldnMessageEntity);
+            if (nsEntity != null) {
+                getService().delete(c, nsEntity);
+            }
+            c.complete();
+        }
+
+        indexingService.commit();
+    }
+
+    public static LDNMessageBuilder createNotifyServiceBuilder(Context context, String id) {
+        LDNMessageBuilder ldnMessageServiceBuilder = new LDNMessageBuilder(context);
+        return ldnMessageServiceBuilder.create(context, id);
+    }
+
+    public static LDNMessageBuilder createNotifyServiceBuilder(Context context, Notification notification) {
+        LDNMessageBuilder ldnMessageServiceBuilder = new LDNMessageBuilder(context);
+        return ldnMessageServiceBuilder.create(context, notification);
+    }
+
+    private LDNMessageBuilder create(Context context, String id) {
+        try {
+
+            this.context = context;
+            this.ldnMessageEntity = ldnMessageService.create(context, id);
+
+        } catch (SQLException e) {
+            log.warn("Failed to create the NotifyService", e);
+        }
+
+        return this;
+    }
+
+    private LDNMessageBuilder create(Context context, Notification notification) {
+        try {
+
+            this.context = context;
+            this.ldnMessageEntity = ldnMessageService.create(context, notification, "127.0.0.1");
+
+        } catch (SQLException e) {
+            log.warn("Failed to create the NotifyService", e);
+        }
+
+        return this;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/builder/NotifyServiceBuilder.java b/dspace-api/src/test/java/org/dspace/builder/NotifyServiceBuilder.java
new file mode 100644
index 0000000000..44cf0be092
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/NotifyServiceBuilder.java
@@ -0,0 +1,165 @@
+/**
+ * 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.builder;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+
+/**
+ * Builder for {@link NotifyServiceEntity} entities.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ *
+ */
+public class NotifyServiceBuilder extends AbstractBuilder<NotifyServiceEntity, NotifyService> {
+
+    /* Log4j logger*/
+    private static final Logger log = LogManager.getLogger();
+
+    private NotifyServiceEntity notifyServiceEntity;
+
+    protected NotifyServiceBuilder(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected NotifyService getService() {
+        return notifyService;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        try (Context c = new Context()) {
+            c.setDispatcher("noindex");
+            c.turnOffAuthorisationSystem();
+            // Ensure object and any related objects are reloaded before checking to see what needs cleanup
+            notifyServiceEntity = c.reloadEntity(notifyServiceEntity);
+            if (notifyServiceEntity != null) {
+                delete(notifyServiceEntity);
+            }
+            c.complete();
+            indexingService.commit();
+        }
+    }
+
+    @Override
+    public void delete(Context c, NotifyServiceEntity notifyServiceEntity) throws Exception {
+        if (notifyServiceEntity != null) {
+            getService().delete(c, notifyServiceEntity);
+        }
+    }
+
+    @Override
+    public NotifyServiceEntity build() {
+        try {
+
+            notifyService.update(context, notifyServiceEntity);
+            context.dispatchEvents();
+
+            indexingService.commit();
+        } catch (SearchServiceException | SQLException e) {
+            log.error(e);
+        }
+        return notifyServiceEntity;
+    }
+
+    public void delete(NotifyServiceEntity notifyServiceEntity) throws Exception {
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            NotifyServiceEntity nsEntity = c.reloadEntity(notifyServiceEntity);
+            if (nsEntity != null) {
+                getService().delete(c, nsEntity);
+            }
+            c.complete();
+        }
+
+        indexingService.commit();
+    }
+
+    public static NotifyServiceBuilder createNotifyServiceBuilder(Context context, String name) {
+        NotifyServiceBuilder notifyServiceBuilder = new NotifyServiceBuilder(context);
+        return notifyServiceBuilder.create(context, name);
+    }
+
+    private NotifyServiceBuilder create(Context context, String name) {
+        try {
+
+            this.context = context;
+            this.notifyServiceEntity = notifyService.create(context, name);
+
+        } catch (SQLException e) {
+            log.warn("Failed to create the NotifyService", e);
+        }
+
+        return this;
+    }
+
+    public NotifyServiceBuilder withDescription(String description) {
+        notifyServiceEntity.setDescription(description);
+        return this;
+    }
+
+    public NotifyServiceBuilder withUrl(String url) {
+        notifyServiceEntity.setUrl(url);
+        return this;
+    }
+
+    public NotifyServiceBuilder withLdnUrl(String ldnUrl) {
+        notifyServiceEntity.setLdnUrl(ldnUrl);
+        return this;
+    }
+
+    public NotifyServiceBuilder withStatus(boolean enabled) {
+        notifyServiceEntity.setEnabled(enabled);
+        return this;
+    }
+
+    public NotifyServiceBuilder withScore(BigDecimal score) {
+        notifyServiceEntity.setScore(score);
+        return this;
+    }
+
+    public NotifyServiceBuilder isEnabled(boolean enabled) {
+        notifyServiceEntity.setEnabled(enabled);
+        return this;
+    }
+
+    public NotifyServiceBuilder withLowerIp(String lowerIp) {
+        notifyServiceEntity.setLowerIp(lowerIp);
+        return this;
+    }
+
+    public NotifyServiceBuilder withUpperIp(String upperIp) {
+        notifyServiceEntity.setUpperIp(upperIp);
+        return this;
+    }
+
+    /**
+     * Delete the Test NotifyServiceEntity referred to by the given ID
+     * @param id ID of NotifyServiceEntity to delete
+     * @throws SQLException if error occurs
+     */
+    public static void deleteNotifyService(Integer id) throws SQLException {
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            NotifyServiceEntity notifyServiceEntity = notifyService.find(c, id);
+            if (notifyServiceEntity != null) {
+                notifyService.delete(c, notifyServiceEntity);
+            }
+            c.complete();
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/builder/NotifyServiceInboundPatternBuilder.java b/dspace-api/src/test/java/org/dspace/builder/NotifyServiceInboundPatternBuilder.java
new file mode 100644
index 0000000000..5ae20b0001
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/NotifyServiceInboundPatternBuilder.java
@@ -0,0 +1,126 @@
+/**
+ * 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.builder;
+
+import java.sql.SQLException;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+
+/**
+ * Builder for {@link NotifyServiceInboundPattern} entities.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ *
+ */
+public class NotifyServiceInboundPatternBuilder
+    extends AbstractBuilder<NotifyServiceInboundPattern, NotifyServiceInboundPatternService> {
+
+    /* Log4j logger*/
+    private static final Logger log = LogManager.getLogger();
+
+    private NotifyServiceInboundPattern notifyServiceInboundPattern;
+
+    protected NotifyServiceInboundPatternBuilder(Context context) {
+        super(context);
+    }
+
+    @Override
+    protected NotifyServiceInboundPatternService getService() {
+        return inboundPatternService;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        try (Context c = new Context()) {
+            c.setDispatcher("noindex");
+            c.turnOffAuthorisationSystem();
+            // Ensure object and any related objects are reloaded before checking to see what needs cleanup
+            notifyServiceInboundPattern = c.reloadEntity(notifyServiceInboundPattern);
+            if (notifyServiceInboundPattern != null) {
+                delete(notifyServiceInboundPattern);
+            }
+            c.complete();
+            indexingService.commit();
+        }
+    }
+
+    @Override
+    public void delete(Context c, NotifyServiceInboundPattern notifyServiceInboundPattern) throws Exception {
+        if (notifyServiceInboundPattern != null) {
+            getService().delete(c, notifyServiceInboundPattern);
+        }
+    }
+
+    @Override
+    public NotifyServiceInboundPattern build() {
+        try {
+
+            inboundPatternService.update(context, notifyServiceInboundPattern);
+            context.dispatchEvents();
+
+            indexingService.commit();
+        } catch (SearchServiceException | SQLException e) {
+            log.error(e);
+        }
+        return notifyServiceInboundPattern;
+    }
+
+    public void delete(NotifyServiceInboundPattern notifyServiceInboundPattern) throws Exception {
+        try (Context c = new Context()) {
+            c.turnOffAuthorisationSystem();
+            NotifyServiceInboundPattern nsEntity = c.reloadEntity(notifyServiceInboundPattern);
+            if (nsEntity != null) {
+                getService().delete(c, nsEntity);
+            }
+            c.complete();
+        }
+
+        indexingService.commit();
+    }
+
+    public static NotifyServiceInboundPatternBuilder createNotifyServiceInboundPatternBuilder(
+        Context context, NotifyServiceEntity service) {
+        NotifyServiceInboundPatternBuilder notifyServiceBuilder = new NotifyServiceInboundPatternBuilder(context);
+        return notifyServiceBuilder.create(context, service);
+    }
+
+    private NotifyServiceInboundPatternBuilder create(Context context, NotifyServiceEntity service) {
+        try {
+
+            this.context = context;
+            this.notifyServiceInboundPattern = inboundPatternService.create(context, service);
+
+        } catch (SQLException e) {
+            log.warn("Failed to create the NotifyService", e);
+        }
+
+        return this;
+    }
+
+    public NotifyServiceInboundPatternBuilder isAutomatic(boolean automatic) {
+        notifyServiceInboundPattern.setAutomatic(automatic);
+        return this;
+    }
+
+    public NotifyServiceInboundPatternBuilder withPattern(String pattern) {
+        notifyServiceInboundPattern.setPattern(pattern);
+        return this;
+    }
+
+    public NotifyServiceInboundPatternBuilder withConstraint(String constraint) {
+        notifyServiceInboundPattern.setConstraint(constraint);
+        return this;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java b/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
index 0631e1b55a..fe8f7b8167 100644
--- a/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/ProcessBuilder.java
@@ -68,8 +68,8 @@ public class ProcessBuilder extends AbstractBuilder<Process, ProcessService> {
 
     public ProcessBuilder withStartAndEndTime(String startTime, String endTime) throws ParseException {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd/MM/yyyy");
-        process.setStartTime(simpleDateFormat.parse(startTime));
-        process.setFinishedTime(simpleDateFormat.parse(endTime));
+        process.setStartTime(startTime == null ? null : simpleDateFormat.parse(startTime));
+        process.setFinishedTime(endTime == null ? null : simpleDateFormat.parse(endTime));
         return this;
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/builder/QAEventBuilder.java b/dspace-api/src/test/java/org/dspace/builder/QAEventBuilder.java
new file mode 100644
index 0000000000..823080516d
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/QAEventBuilder.java
@@ -0,0 +1,141 @@
+/**
+ * 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.builder;
+
+import java.util.Date;
+
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.QAEventService;
+
+/**
+ * Builder to construct Quality Assurance Broker Event objects
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class QAEventBuilder extends AbstractBuilder<QAEvent, QAEventService> {
+
+    private Item item;
+    private QAEvent target;
+    private String source = QAEvent.OPENAIRE_SOURCE;
+    /**
+     * the title of the DSpace object
+     * */
+    private String title;
+    /**
+     * the name of the Quality Assurance Event Topic
+     * */
+    private String topic;
+    /**
+     * thr original QA Event imported
+     * */
+    private String message;
+    /**
+     * uuid of the targeted DSpace object
+     * */
+    private String relatedItem;
+    private double trust = 0.5;
+    private Date lastUpdate = new Date();
+
+    protected QAEventBuilder(Context context) {
+        super(context);
+    }
+
+    public static QAEventBuilder createTarget(final Context context, final Collection col, final String name) {
+        QAEventBuilder builder = new QAEventBuilder(context);
+        return builder.create(context, col, name);
+    }
+
+    public static QAEventBuilder createTarget(final Context context, final Item item) {
+        QAEventBuilder builder = new QAEventBuilder(context);
+        return builder.create(context, item);
+    }
+
+    private QAEventBuilder create(final Context context, final Collection col, final String name) {
+        this.context = context;
+
+        try {
+            ItemBuilder itemBuilder = ItemBuilder.createItem(context, col).withTitle(name);
+            item = itemBuilder.build();
+            this.title = name;
+            context.dispatchEvents();
+            indexingService.commit();
+        } catch (Exception e) {
+            return handleException(e);
+        }
+        return this;
+    }
+
+    private QAEventBuilder create(final Context context, final Item item) {
+        this.context = context;
+        this.item = item;
+        return this;
+    }
+
+    public QAEventBuilder withTopic(final String topic) {
+        this.topic = topic;
+        return this;
+    }
+    public QAEventBuilder withSource(final String source) {
+        this.source = source;
+        return this;
+    }
+    public QAEventBuilder withTitle(final String title) {
+        this.title = title;
+        return this;
+    }
+    public QAEventBuilder withMessage(final String message) {
+        this.message = message;
+        return this;
+    }
+    public QAEventBuilder withTrust(final double trust) {
+        this.trust = trust;
+        return this;
+    }
+    public QAEventBuilder withLastUpdate(final Date lastUpdate) {
+        this.lastUpdate = lastUpdate;
+        return this;
+    }
+
+    public QAEventBuilder withRelatedItem(String relatedItem) {
+        this.relatedItem = relatedItem;
+        return this;
+    }
+
+    @Override
+    public QAEvent build() {
+        target = new QAEvent(source, "oai:www.dspace.org:" + item.getHandle(), item.getID().toString(), title, topic,
+            trust, message, lastUpdate);
+        target.setRelated(relatedItem);
+        try {
+            qaEventService.store(context, target);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return target;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        qaEventService.deleteEventByEventId(target.getEventId());
+    }
+
+    @Override
+    protected QAEventService getService() {
+        return qaEventService;
+    }
+
+    @Override
+    public void delete(Context c, QAEvent dso) throws Exception {
+        qaEventService.deleteEventByEventId(target.getEventId());
+
+//        qaEventService.deleteTarget(dso);
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
index 66e6245ff6..8481b17e14 100644
--- a/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/RequestItemBuilder.java
@@ -10,8 +10,8 @@ package org.dspace.builder;
 
 import java.sql.SQLException;
 import java.util.Date;
-import javax.validation.constraints.NotNull;
 
+import jakarta.validation.constraints.NotNull;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.requestitem.RequestItem;
diff --git a/dspace-api/src/test/java/org/dspace/builder/SuggestionTargetBuilder.java b/dspace-api/src/test/java/org/dspace/builder/SuggestionTargetBuilder.java
new file mode 100644
index 0000000000..f9671bba60
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/builder/SuggestionTargetBuilder.java
@@ -0,0 +1,161 @@
+/**
+ * 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.builder;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.app.suggestion.MockSuggestionExternalDataSource;
+import org.dspace.app.suggestion.SolrSuggestionStorageService;
+import org.dspace.app.suggestion.Suggestion;
+import org.dspace.app.suggestion.SuggestionEvidence;
+import org.dspace.app.suggestion.SuggestionTarget;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.dto.MetadataValueDTO;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+
+/**
+ * Builder to construct Item objects
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionTargetBuilder extends AbstractBuilder<SuggestionTarget, SolrSuggestionStorageService> {
+    public final static String EVIDENCE_MOCK_NAME = "MockEvidence";
+    public final static String EVIDENCE_MOCK_NOTE = "Generated for testing purpose...";
+    private Item item;
+    private SuggestionTarget target;
+    private List<Suggestion> suggestions;
+    private String source;
+    private int total;
+
+    protected SuggestionTargetBuilder(Context context) {
+        super(context);
+    }
+
+    public static SuggestionTargetBuilder createTarget(final Context context, final Collection col, final String name) {
+        return createTarget(context, col, name, null);
+    }
+
+    public static SuggestionTargetBuilder createTarget(final Context context, final Collection col, final String name,
+            final EPerson eperson) {
+        SuggestionTargetBuilder builder = new SuggestionTargetBuilder(context);
+        return builder.create(context, col, name, eperson);
+    }
+
+    public static SuggestionTargetBuilder createTarget(final Context context, final Item item) {
+        SuggestionTargetBuilder builder = new SuggestionTargetBuilder(context);
+        return builder.create(context, item);
+    }
+
+    private SuggestionTargetBuilder create(final Context context, final Collection col, final String name) {
+        return create(context, col, name, null);
+    }
+
+    private SuggestionTargetBuilder create(final Context context, final Collection col, final String name,
+            final EPerson eperson) {
+        this.context = context;
+
+        try {
+            ItemBuilder itemBuilder = ItemBuilder.createItem(context, col).withTitle(name);
+            if (eperson != null) {
+                itemBuilder = itemBuilder.withDSpaceObjectOwner(eperson.getFullName(), eperson.getID().toString());
+            }
+            item = itemBuilder.build();
+            context.dispatchEvents();
+            indexingService.commit();
+        } catch (Exception e) {
+            return handleException(e);
+        }
+        return this;
+    }
+
+    private SuggestionTargetBuilder create(final Context context, final Item item) {
+        this.context = context;
+        this.item = item;
+        return this;
+    }
+
+    public SuggestionTargetBuilder withSuggestionCount(final String source, final int total) {
+        this.source = source;
+        this.total = total;
+        return this;
+    }
+
+    @Override
+    public SuggestionTarget build() {
+        target = new SuggestionTarget(item);
+        target.setTotal(total);
+        target.setSource(source);
+        suggestions = generateAllSuggestion();
+        try {
+            for (Suggestion s : suggestions) {
+                solrSuggestionService.addSuggestion(s, false, false);
+            }
+            solrSuggestionService.commit();
+        } catch (SolrServerException | IOException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+        return target;
+    }
+
+    @Override
+    public void cleanup() throws Exception {
+        solrSuggestionService.deleteTarget(target);
+    }
+
+    @Override
+    protected SolrSuggestionStorageService getService() {
+        return solrSuggestionService;
+    }
+
+    @Override
+    public void delete(Context c, SuggestionTarget dso) throws Exception {
+        solrSuggestionService.deleteTarget(dso);
+    }
+
+    private List<Suggestion> generateAllSuggestion() {
+        List<Suggestion> allSuggestions = new ArrayList<Suggestion>();
+        for (int idx = 0; idx < target.getTotal(); idx++) {
+            String idPartStr = String.valueOf(idx + 1);
+            Suggestion sug = new Suggestion(source, item, idPartStr);
+            sug.setDisplay("Suggestion " + source + " " + idPartStr);
+            MetadataValueDTO mTitle = new MetadataValueDTO();
+            mTitle.setSchema("dc");
+            mTitle.setElement("title");
+            mTitle.setValue("Title Suggestion " + idPartStr);
+
+            MetadataValueDTO mSource1 = new MetadataValueDTO();
+            mSource1.setSchema("dc");
+            mSource1.setElement("source");
+            mSource1.setValue("Source 1");
+
+            MetadataValueDTO mSource2 = new MetadataValueDTO();
+            mSource2.setSchema("dc");
+            mSource2.setElement("source");
+            mSource2.setValue("Source 2");
+
+            sug.getMetadata().add(mTitle);
+            sug.getMetadata().add(mSource1);
+            sug.getMetadata().add(mSource2);
+
+            sug.setExternalSourceUri(
+                    "http://localhost/api/integration/externalsources/" + MockSuggestionExternalDataSource.NAME
+                            + "/entryValues/" + idPartStr);
+            sug.getEvidences().add(new SuggestionEvidence(EVIDENCE_MOCK_NAME,
+                    idx % 2 == 0 ? 100 - idx : (double) idx / 2, EVIDENCE_MOCK_NOTE));
+            allSuggestions.add(sug);
+        }
+        return allSuggestions;
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java b/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java
index 9d786d4761..67d8894338 100644
--- a/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java
+++ b/dspace-api/src/test/java/org/dspace/builder/WorkspaceItemBuilder.java
@@ -10,7 +10,10 @@ package org.dspace.builder;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.util.UUID;
 
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyServiceEntity;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Collection;
@@ -41,14 +44,31 @@ public class WorkspaceItemBuilder extends AbstractBuilder<WorkspaceItem, Workspa
 
     public static WorkspaceItemBuilder createWorkspaceItem(final Context context, final Collection col) {
         WorkspaceItemBuilder builder = new WorkspaceItemBuilder(context);
-        return builder.create(context, col);
+        return builder.create(context, col, null);
     }
 
-    private WorkspaceItemBuilder create(final Context context, final Collection col) {
+    public static WorkspaceItemBuilder createWorkspaceItem(final Context context, final Collection col, UUID uuid) {
+        WorkspaceItemBuilder builder = new WorkspaceItemBuilder(context);
+        return builder.create(context, col, uuid);
+    }
+
+    /**
+     * Create with a specific UUID (e.g. restoring items with Packager import)
+     *
+     * @param context DSpace context
+     * @param col Parent collection
+     * @param uuid Item UUID
+     * @return WorkspaceItemBuilder
+     */
+    private WorkspaceItemBuilder create(final Context context, final Collection col, UUID uuid) {
         this.context = context;
 
         try {
-            workspaceItem = workspaceItemService.create(context, col, false);
+            if (uuid == null) {
+                workspaceItem = workspaceItemService.create(context, col, false);
+            } else {
+                workspaceItem = workspaceItemService.create(context, col, uuid, false, false);
+            }
             item = workspaceItem.getItem();
         } catch (Exception e) {
             return handleException(e);
@@ -114,10 +134,12 @@ public class WorkspaceItemBuilder extends AbstractBuilder<WorkspaceItem, Workspa
                 delete(c, workspaceItem);
             } else {
                 item = c.reloadEntity(item);
-                // check if the wsi has been pushed to the workflow
-                XmlWorkflowItem wfi = workflowItemService.findByItem(c, item);
-                if (wfi != null) {
-                    workflowItemService.delete(c, wfi);
+                if (item != null) {
+                    // check if the wsi has been pushed to the workflow
+                    XmlWorkflowItem wfi = workflowItemService.findByItem(c, item);
+                    if (wfi != null) {
+                        workflowItemService.delete(c, wfi);
+                    }
                 }
             }
             item = c.reloadEntity(item);
@@ -219,4 +241,20 @@ public class WorkspaceItemBuilder extends AbstractBuilder<WorkspaceItem, Workspa
         }
         return this;
     }
+
+    public WorkspaceItemBuilder withCOARNotifyService(NotifyServiceEntity notifyService, String pattern) {
+        Item item = workspaceItem.getItem();
+
+        try {
+            NotifyPatternToTrigger notifyPatternToTrigger = notifyPatternToTriggerService.create(context);
+            notifyPatternToTrigger.setItem(item);
+            notifyPatternToTrigger.setNotifyService(notifyService);
+            notifyPatternToTrigger.setPattern(pattern);
+            notifyPatternToTriggerService.update(context, notifyPatternToTrigger);
+        } catch (Exception e) {
+            handleException(e);
+        }
+        return this;
+    }
+
 }
diff --git a/dspace-api/src/test/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImplTest.java b/dspace-api/src/test/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImplTest.java
index 860df5e887..03b274a67a 100644
--- a/dspace-api/src/test/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/checker/dao/impl/ChecksumHistoryDAOImplTest.java
@@ -15,8 +15,8 @@ import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import javax.persistence.Query;
 
+import jakarta.persistence.Query;
 import org.dspace.AbstractUnitTest;
 import org.dspace.checker.ChecksumResultCode;
 import org.dspace.content.Bitstream;
@@ -122,7 +122,7 @@ public class ChecksumHistoryDAOImplTest
 
         // See if matching old row is gone.
         qry = dbc.getSession().createQuery(
-            "SELECT COUNT(*) FROM ChecksumHistory WHERE process_end_date = :date");
+            "SELECT COUNT(*) FROM ChecksumHistory WHERE processEndDate = :date");
         long count;
 
         qry.setParameter("date", matchDate);
diff --git a/dspace-api/src/test/java/org/dspace/content/BitstreamFormatTest.java b/dspace-api/src/test/java/org/dspace/content/BitstreamFormatTest.java
index ff99a820b5..1ddc8fb8ab 100644
--- a/dspace-api/src/test/java/org/dspace/content/BitstreamFormatTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/BitstreamFormatTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
- * This class tests BitstreamFormat. Due to it being tighly coupled with the
+ * This class tests BitstreamFormat. Due to it being tightly coupled with the
  * database, most of the methods use mock objects, which only proved a very
  * basic test level (ensure the method doesn't throw an exception). The real
  * testing of the class will be done in the Integration Tests.
@@ -222,6 +222,7 @@ public class BitstreamFormatTest extends AbstractUnitTest {
         assertThat("testCreate 3", found.getSupportLevel(), equalTo(-1));
         assertFalse("testCreate 4", found.isInternal());
         bitstreamFormatService.delete(context, found);
+        context.commit();
     }
 
     /**
@@ -229,7 +230,7 @@ public class BitstreamFormatTest extends AbstractUnitTest {
      */
     @Test(expected = AuthorizeException.class)
     public void testCreateNotAdmin() throws SQLException, AuthorizeException {
-        // Disalow full Admin perms
+        // Disallow full Admin perms
         when(authorizeServiceSpy.isAdmin(context)).thenReturn(false);
 
         bitstreamFormatService.create(context);
@@ -497,6 +498,7 @@ public class BitstreamFormatTest extends AbstractUnitTest {
         BitstreamFormat bitstreamFormat = bitstreamFormatService.create(context);
         int toDeleteIdentifier = bitstreamFormat.getID();
         bitstreamFormatService.delete(context, bitstreamFormat);
+        context.commit();
         BitstreamFormat b = bitstreamFormatService.find(context, toDeleteIdentifier);
         assertThat("testDeleteAdmin 0", b, nullValue());
     }
diff --git a/dspace-api/src/test/java/org/dspace/content/CollectionTest.java b/dspace-api/src/test/java/org/dspace/content/CollectionTest.java
index 13d037abf8..6e72904345 100644
--- a/dspace-api/src/test/java/org/dspace/content/CollectionTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/CollectionTest.java
@@ -435,7 +435,7 @@ public class CollectionTest extends AbstractDSpaceObjectTest {
 
     /**
      * Test of setWorkflowGroup method, of class Collection.
-     * The setWorkflowGroup ajust the policies for the basic Workflow. This test
+     * The setWorkflowGroup adjust the policies for the basic Workflow. This test
      * shall assure that now exception (e.g. ConcurrentModificationException is
      * thrown during these adjustments.
      */
@@ -1200,4 +1200,71 @@ public class CollectionTest extends AbstractDSpaceObjectTest {
                    equalTo(owningCommunity));
     }
 
+    /**
+     * Test of retrieveCollectionWithSubmitByEntityType method getting the closest
+     * collection of non-item type starting from an item
+     */
+    @Test
+    public void testRetrieveCollectionWithSubmitByEntityType() throws SQLException, AuthorizeException {
+        context.setDispatcher("default");
+        context.turnOffAuthorisationSystem();
+        Community com = communityService.create(null, context);
+        Group submitters = groupService.create(context);
+        Collection collection = collectionService.create(context, com);
+        collectionService.addMetadata(context, collection, "dspace", "entity", "type",
+            null, "Publication");
+        com.addCollection(collection);
+        WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, false);
+        Item item = installItemService.installItem(context, workspaceItem);
+        EPerson epersonA = ePersonService.create(context);
+        Collection collectionPerson = collectionService.create(context, com);
+        collectionService.addMetadata(context, collectionPerson, "dspace", "entity", "type",
+            null, "Person");
+        collectionPerson.setSubmitters(submitters);
+        groupService.addMember(context, submitters, epersonA);
+        context.setCurrentUser(epersonA);
+        context.commit();
+        context.restoreAuthSystemState();
+        Collection resultCollection = collectionService.retrieveCollectionWithSubmitByEntityType
+                (context, item, "Person");
+
+        assertThat("testRetrieveCollectionWithSubmitByEntityType 0", resultCollection, notNullValue());
+        assertThat("testRetrieveCollectionWithSubmitByEntityType 1", resultCollection, equalTo(collectionPerson));
+
+        context.setDispatcher("exclude-discovery");
+    }
+
+    /**
+     * Test of rretrieveCollectionWithSubmitByCommunityAndEntityType method getting the closest
+     * collection of non-community type starting from an community
+     */
+    @Test
+    public void testRetrieveCollectionWithSubmitByCommunityAndEntityType() throws SQLException, AuthorizeException {
+        context.setDispatcher("default");
+        context.turnOffAuthorisationSystem();
+        Community com = communityService.create(null, context);
+        Group submitters = groupService.create(context);
+        Collection collection = collectionService.create(context, com);
+        collectionService.addMetadata(context, collection, "dspace", "entity", "type",
+            null, "Publication");
+        com.addCollection(collection);
+        WorkspaceItem workspaceItem = workspaceItemService.create(context, collection, false);
+        Item item = installItemService.installItem(context, workspaceItem);
+        EPerson epersonA = ePersonService.create(context);
+        Collection collectionPerson = collectionService.create(context, com);
+        collectionService.addMetadata(context, collectionPerson, "dspace", "entity", "type",
+            null, "Person");
+        collectionPerson.setSubmitters(submitters);
+        groupService.addMember(context, submitters, epersonA);
+        context.setCurrentUser(epersonA);
+        context.commit();
+        context.restoreAuthSystemState();
+        Collection resultCollection = collectionService.retrieveCollectionWithSubmitByCommunityAndEntityType
+                (context, com, "Person");
+
+        assertThat("testRetrieveCollectionWithSubmitByEntityType 0", resultCollection, notNullValue());
+        assertThat("testRetrieveCollectionWithSubmitByEntityType 1", resultCollection, equalTo(collectionPerson));
+
+        context.setDispatcher("exclude-discovery");
+    }
 }
diff --git a/dspace-api/src/test/java/org/dspace/content/CommunityTest.java b/dspace-api/src/test/java/org/dspace/content/CommunityTest.java
index 939a7cc620..7c0d1dc934 100644
--- a/dspace-api/src/test/java/org/dspace/content/CommunityTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/CommunityTest.java
@@ -884,7 +884,7 @@ public class CommunityTest extends AbstractDSpaceObjectTest {
         context.turnOffAuthorisationSystem();
         Community parent = communityService.create(null, context);
 
-        // Create a hierachy of sub-Communities and Collections and Items.
+        // Create a hierarchy of sub-Communities and Collections and Items.
         Community child = communityService.createSubcommunity(context, parent);
         Community grandchild = communityService.createSubcommunity(context, child);
         Collection childCol = collectionService.create(context, child);
diff --git a/dspace-api/src/test/java/org/dspace/content/DCDateTest.java b/dspace-api/src/test/java/org/dspace/content/DCDateTest.java
index 9f534b5dcf..c3c84990ae 100644
--- a/dspace-api/src/test/java/org/dspace/content/DCDateTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/DCDateTest.java
@@ -281,6 +281,23 @@ public class DCDateTest {
         assertThat("testDCDateString 10", dc.getHourUTC(), equalTo(0));
         assertThat("testDCDateString 11", dc.getMinuteUTC(), equalTo(0));
         assertThat("testDCDateString 12", dc.getSecondUTC(), equalTo(1));
+
+        // test additional ISO format
+        dc = new DCDate("2010-04-14T00:00:01.000");
+        assertThat("testDCDateString 1", dc.getYear(), equalTo(2010));
+        assertThat("testDCDateString 2", dc.getMonth(), equalTo(04));
+        assertThat("testDCDateString 3", dc.getDay(), equalTo(13));
+        assertThat("testDCDateString 4", dc.getHour(), equalTo(16));
+        assertThat("testDCDateString 5", dc.getMinute(), equalTo(0));
+        assertThat("testDCDateIntBits 6", dc.getSecond(), equalTo(1));
+
+        assertThat("testDCDateString 7", dc.getYearUTC(), equalTo(2010));
+        assertThat("testDCDateString 8", dc.getMonthUTC(), equalTo(04));
+        assertThat("testDCDateString 9", dc.getDayUTC(), equalTo(14));
+        assertThat("testDCDateString 10", dc.getHourUTC(), equalTo(0));
+        assertThat("testDCDateString 11", dc.getMinuteUTC(), equalTo(0));
+        assertThat("testDCDateString 12", dc.getSecondUTC(), equalTo(1));
+
     }
 
 
@@ -381,6 +398,11 @@ public class DCDateTest {
         assertThat("testDisplayDate 7 ", dc.displayDate(false, false,
                                                         new Locale("en_GB")),
                    equalTo("14-Apr-2010"));
+
+        dc = new DCDate("2010-04-14T00:00:01.000");
+        assertThat("testDisplayDate 8 ", dc.displayDate(false, false,
+                        new Locale("en_GB")),
+                equalTo("14-Apr-2010"));
     }
 
     /**
diff --git a/dspace-api/src/test/java/org/dspace/content/DuplicateDetectionTest.java b/dspace-api/src/test/java/org/dspace/content/DuplicateDetectionTest.java
new file mode 100644
index 0000000000..3ee25afe88
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/content/DuplicateDetectionTest.java
@@ -0,0 +1,430 @@
+/**
+ * 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.content;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertNull;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Optional;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.WorkflowItemBuilder;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.DuplicateDetectionService;
+import org.dspace.content.virtual.PotentialDuplicate;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ *
+ * Integration tests for the duplicate detection service
+ *
+ * @author Kim Shepherd
+ */
+public class DuplicateDetectionTest extends AbstractIntegrationTestWithDatabase {
+    private DuplicateDetectionService duplicateDetectionService = ContentServiceFactory.getInstance()
+            .getDuplicateDetectionService();
+    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private Collection col;
+    private Collection workflowCol;
+    private Item item1;
+    private Item item2;
+    private Item item3;
+    private final String item1IssueDate = "2011-10-17";
+    private final String item1Subject = "ExtraEntry 1";
+    private final String item1Title = "Public item I";
+    private final String item1Author = "Smith, Donald";
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        // Temporarily enable duplicate detection and set comparison distance to 1
+        configurationService.setProperty("duplicate.enable", true);
+        configurationService.setProperty("duplicate.comparison.distance", 1);
+        configurationService.setProperty("duplicate.comparison.normalise.lowercase", true);
+        configurationService.setProperty("duplicate.comparison.normalise.whitespace", true);
+        configurationService.setProperty("duplicate.comparison.solr.field", "deduplication_keyword");
+        configurationService.setProperty("duplicate.comparison.metadata.field", new String[]{"dc.title"});
+        configurationService.setProperty("duplicate.preview.metadata.field",
+                new String[]{"dc.date.issued", "dc.subject"});
+
+        context.turnOffAuthorisationSystem();
+        context.setDispatcher("default");
+
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        col = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection").build();
+        workflowCol = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Workflow Collection")
+                .withWorkflowGroup("reviewer", admin)
+                .build();
+
+        // Ingest three example items with slightly different titles
+        // item2 is 1 edit distance from item1 and item3
+        // item1 and item3 are 2 edit distance from each other
+        item1 = ItemBuilder.createItem(context, col)
+                .withTitle(item1Title) // Public item I
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubject(item1Subject)
+                .build();
+        item2 = ItemBuilder.createItem(context, col)
+                .withTitle("Public item II")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Smith, Donald X.")
+                .withSubject("ExtraEntry 2")
+                .build();
+        item3 = ItemBuilder.createItem(context, col)
+                .withTitle("Public item III")
+                .withIssueDate("2013-10-17")
+                .withAuthor("Smith, Donald Y.")
+                .withSubject("ExtraEntry 3")
+                .build();
+
+
+    }
+
+    /**
+     * Test instantiation of simple potential duplicate object
+     */
+    @Test
+    public void testPotentialDuplicateInstantatation() {
+        PotentialDuplicate potentialDuplicate = new PotentialDuplicate();
+        // The constructor should instantiate a new list for metadata
+        assertEquals("Metadata value list size should be 0",
+                0, potentialDuplicate.getMetadataValueList().size());
+        // Other properties should not be set
+        assertNull("Title should be null", potentialDuplicate.getTitle());
+        //StringUtils.getLevenshteinDistance()
+    }
+
+    /**
+     * Test instantiation of simple potential duplicate object given an item as a constructor argument
+     */
+    @Test
+    public void testPotentialDuplicateInstantiationWithItem() {
+        PotentialDuplicate potentialDuplicate = new PotentialDuplicate(item1);
+        // We should have title, uuid, owning collection name set and metadata value list instantiated to empty
+        assertEquals("UUID should match item1 uuid", item1.getID(), potentialDuplicate.getUuid());
+        assertEquals("Title should match item1 title", item1Title, potentialDuplicate.getTitle());
+        assertEquals("Owning collection should match item1 owning collection",
+                item1.getOwningCollection().getName(), potentialDuplicate.getOwningCollectionName());
+        assertEquals("Metadata value list size should be 0",
+                0, potentialDuplicate.getMetadataValueList().size());
+    }
+
+    /**
+     * Test that a search for getPotentialDuplicates returns the expected results, populated with the expected
+     * preview values and metadata. This is the core method used by the duplicate item link repository and
+     * detect duplicates submission step.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchDuplicates() throws Exception {
+
+        // Get potential duplicates of item 1:
+        // Expected: Public item II should appear as it has the configured levenshtein distance of 1
+        List<PotentialDuplicate> potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item1);
+
+        // Make sure result list is size 1
+        int size = 1;
+        assertEquals("Potential duplicates of item1 should have size " + size,
+                size, potentialDuplicates.size());
+
+        // The only member should be Public item II (one distance from public item I)
+        assertEquals("Item II should be be the detected duplicate",
+                item2.getID(), potentialDuplicates.get(0).getUuid());
+
+        // Get potential duplicates of item2:
+        // Expected: BOTH other items should appear as they are both 1 distance away from "Public item II"
+        potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item2);
+
+        // Sort by title
+        potentialDuplicates.sort(Comparator.comparing(PotentialDuplicate::getTitle));
+
+        // Make sure result list is size 1
+        size = 2;
+        assertEquals("Potential duplicates of item2 should have size " + size,
+                size, potentialDuplicates.size());
+
+        // The result list should contain both item1 and item3 in the expected order
+        assertEquals("item1 should be the first detected duplicate",
+                item1.getID(), potentialDuplicates.get(0).getUuid());
+        assertEquals("item3 should be be the second detected duplicate",
+                item3.getID(), potentialDuplicates.get(1).getUuid());
+
+        // Check metadata is populated as per configuration, using item1 (first in results)
+        // Check for date
+        Optional<String> foundDate = potentialDuplicates.get(0).getMetadataValueList().stream()
+                .filter(metadataValue -> metadataValue.getMetadataField().toString('.')
+                        .equals("dc.date.issued"))
+                .map(MetadataValue::getValue).findFirst();
+        assertThat("There should be an issue date found", foundDate.isPresent());
+        assertEquals("item1 issue date should match the duplicate obj metadata issue date",
+                item1IssueDate, foundDate.get());
+        // Check for subject
+        Optional<String> foundSubject = potentialDuplicates.get(0).getMetadataValueList().stream()
+                .filter(metadataValue -> metadataValue.getMetadataField().toString('.').equals("dc.subject"))
+                .map(MetadataValue::getValue).findFirst();
+        assertThat("There should be a subject found", foundSubject.isPresent());
+        assertEquals("item1 subject should match the duplicate obj metadata subject",
+                item1Subject, foundSubject.get());
+
+        // Check for author, which was NOT configured to be copied
+        Optional<String> foundAuthor = potentialDuplicates.get(0).getMetadataValueList().stream()
+                .filter(metadataValue -> metadataValue.getMetadataField().toString('.')
+                        .equals("dc.contributor.author"))
+                .map(MetadataValue::getValue).findFirst();
+        assertThat("There should NOT be an author found", foundAuthor.isEmpty());
+
+    }
+
+    /**
+     * Test that a search for getPotentialDuplicates properly escapes Solr reserved characters
+     * e.g. +  -  &&  | |  !  ( )  { }  [ ]  ^  "  ~  *  ?  :  \
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchDuplicatesWithReservedSolrCharacters() throws Exception {
+
+
+
+        Item item4 = ItemBuilder.createItem(context, col)
+                .withTitle("Testing: An Important Development Step")
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubject(item1Subject)
+                .build();
+        Item item5 = ItemBuilder.createItem(context, col)
+                .withTitle("Testing an important development step")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Smith, Donald X.")
+                .withSubject("ExtraEntry 2")
+                .build();
+
+        // Get potential duplicates of item 4 and make sure no exceptions are thrown
+        List<PotentialDuplicate> potentialDuplicates = new ArrayList<>();
+        try {
+            potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item4);
+        } catch (SearchServiceException e) {
+            fail("Duplicate search with special characters should NOT result in search exception (" +
+                    e.getMessage() + ")");
+        }
+
+        // Make sure result list is size 1
+        int size = 1;
+        assertEquals("Potential duplicates of item4 (special characters) should have size " + size,
+                size, potentialDuplicates.size());
+
+        // The only member should be item 5
+        assertEquals("Item 5 should be be the detected duplicate",
+                item5.getID(), potentialDuplicates.get(0).getUuid());
+
+    }
+
+    //configurationService.setProperty("duplicate.comparison.metadata.field", new String[]{"dc.title"});
+
+    /**
+     * Test that a search for a very long title which also contains reserved characters
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchDuplicatesWithVeryLongTitle() throws Exception {
+
+        Item item6 = ItemBuilder.createItem(context, col)
+                .withTitle("Testing: This title is over 200 characters long and should behave just the same as a " +
+                        "shorter title, with or without reserved characters. This integration test will prove that " +
+                        "long titles are detected as potential duplicates.")
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubject(item1Subject)
+                .build();
+        // This item is the same as above, just missing a comma from the title.
+        Item item7 = ItemBuilder.createItem(context, col)
+                .withTitle("Testing: This title is over 200 characters long and should behave just the same as a " +
+                        "shorter title with or without reserved characters. This integration test will prove that " +
+                        "long titles are detected as potential duplicates.")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Smith, Donald X.")
+                .withSubject("ExtraEntry 2")
+                .build();
+
+        // Get potential duplicates of item 4 and make sure no exceptions are thrown
+        List<PotentialDuplicate> potentialDuplicates = new ArrayList<>();
+        try {
+            potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item6);
+        } catch (SearchServiceException e) {
+            fail("Duplicate search with special characters (long title) should NOT result in search exception (" +
+                    e.getMessage() + ")");
+        }
+
+        // Make sure result list is size 1
+        int size = 1;
+        assertEquals("Potential duplicates of item6 (long title) should have size " + size,
+                size, potentialDuplicates.size());
+
+        // The only member should be item 5
+        assertEquals("Item 7's long title should match Item 6 as a potential duplicate",
+                item7.getID(), potentialDuplicates.get(0).getUuid());
+
+    }
+
+    /**
+     * Test that a search for a very long title which also contains reserved characters
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchDuplicatesExactMatch() throws Exception {
+
+        // Set distance to 0 manually
+        configurationService.setProperty("duplicate.comparison.distance", 0);
+
+        Item item8 = ItemBuilder.createItem(context, col)
+                .withTitle("This integration test will prove that the edit distance of 0 results in an exact match")
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubject(item1Subject)
+                .build();
+        // This item is the same as above
+        Item item9 = ItemBuilder.createItem(context, col)
+                .withTitle("This integration test will prove that the edit distance of 0 results in an exact match")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Smith, Donald X.")
+                .withSubject("ExtraEntry")
+                .build();
+        // This item has one character different, greater than the edit distance
+        Item item10 = ItemBuilder.createItem(context, col)
+                .withTitle("This integration test will prove that the edit distance of 0 results in an exact match.")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Smith, Donald X.")
+                .withSubject("ExtraEntry")
+                .build();
+
+        // Get potential duplicates of item 4 and make sure no exceptions are thrown
+        List<PotentialDuplicate> potentialDuplicates = new ArrayList<>();
+        try {
+            potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item8);
+        } catch (SearchServiceException e) {
+            fail("Duplicate search with special characters (long title) should NOT result in search exception (" +
+                    e.getMessage() + ")");
+        }
+
+        // Make sure result list is size 1 - we do NOT expect item 10 to appear
+        int size = 1;
+        assertEquals("ONLY one exact match should be found (item 9) " + size,
+                size, potentialDuplicates.size());
+
+        // The only member should be item 9
+        assertEquals("Item 9 should match Item 8 as a potential duplicate",
+                item9.getID(), potentialDuplicates.get(0).getUuid());
+
+    }
+
+    @Test
+    public void testSearchDuplicatesInWorkflow() throws Exception {
+        // Get potential duplicates of item 1:
+        // Expected: Public item II should appear as it has the configured levenshtein distance of 1
+        context.turnOffAuthorisationSystem();
+        //context.setDispatcher("default");
+        XmlWorkflowItem workflowItem1 = WorkflowItemBuilder.createWorkflowItem(context, workflowCol)
+                .withTitle("Unique title")
+                .withSubmitter(eperson)
+                .build();
+        XmlWorkflowItem workflowItem2 = WorkflowItemBuilder.createWorkflowItem(context, workflowCol)
+                .withTitle("Unique title")
+                .withSubmitter(eperson)
+                .build();
+
+        //indexingService.commit();
+        context.restoreAuthSystemState();
+        context.setCurrentUser(admin);
+        List<PotentialDuplicate> potentialDuplicates =
+                duplicateDetectionService.getPotentialDuplicates(context, workflowItem1.getItem());
+
+        // Make sure result list is size 1
+        int size = 1;
+        assertEquals("Potential duplicates of item1 should have size " + size,
+                size, potentialDuplicates.size());
+
+        // The only member should be workflow item 2
+        assertEquals("Workflow item 2 should be be the detected duplicate",
+                workflowItem2.getItem().getID(), potentialDuplicates.get(0).getUuid());
+    }
+
+    /**
+     * Test that a search for getPotentialDuplicates with multiple fields configured as comparison value
+     * gives the expected results
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSearchDuplicatesWithMultipleFields() throws Exception {
+        // Set configure to use both title and author fields
+        configurationService.setProperty("duplicate.comparison.metadata.field",
+                new String[]{"dc.title", "dc.contributor.author"});
+
+        Item item10 = ItemBuilder.createItem(context, col)
+                .withTitle("Compare both title and author")
+                .withIssueDate(item1IssueDate)
+                .withAuthor("Surname, F.")
+                .withSubject(item1Subject)
+                .build();
+        Item item11 = ItemBuilder.createItem(context, col)
+                .withTitle("Compare both title and author")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Surname, F.")
+                .withSubject("ExtraEntry 2")
+                .build();
+
+        Item item12 = ItemBuilder.createItem(context, col)
+                .withTitle("Compare both title and author")
+                .withIssueDate("2012-10-17")
+                .withAuthor("Lastname, First.")
+                .withSubject("ExtraEntry 2")
+                .build();
+
+        // Get potential duplicates of item 10 and make sure no exceptions are thrown
+        List<PotentialDuplicate> potentialDuplicates = new ArrayList<>();
+        try {
+            potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item10);
+        } catch (SearchServiceException e) {
+            fail("Duplicate search with title and author (" +
+                    e.getMessage() + ")");
+        }
+
+        // Make sure result list is size 1
+        int size = 1;
+        assertEquals("Potential duplicates of item10 (title + author) should have size " + size,
+                size, potentialDuplicates.size());
+
+        // The only member should be item 11 since item 12 has a different author (but the same title
+        assertEquals("Item 11 should be be the detected duplicate",
+                item11.getID(), potentialDuplicates.get(0).getUuid());
+
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/content/EntityServiceImplTest.java b/dspace-api/src/test/java/org/dspace/content/EntityServiceImplTest.java
index 305ebff697..11fbbb9f91 100644
--- a/dspace-api/src/test/java/org/dspace/content/EntityServiceImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/EntityServiceImplTest.java
@@ -145,6 +145,7 @@ public class EntityServiceImplTest  {
         // Declare objects utilized for this test
         Item item = mock(Item.class);
         Entity entity = mock(Entity.class);
+        EntityType entityType = mock(EntityType.class);
         RelationshipType relationshipType = mock(RelationshipType.class);
         relationshipType.setLeftType(leftType);
         relationshipType.setLeftType(rightType);
@@ -156,7 +157,8 @@ public class EntityServiceImplTest  {
         // Mock the state of objects utilized in getAllRelationshipTypes()
         // to meet the success criteria of the invocation
         when(entity.getItem()).thenReturn(item);
-        when(relationshipTypeService.findByEntityType(context, entityService.getType(context, entity), -1, -1))
+        when(entityService.getType(context, entity)).thenReturn(entityType);
+        when(relationshipTypeService.findByEntityType(context, entityType, -1, -1))
                 .thenReturn(relationshipTypeList);
 
         // The relation(s) reported from our mocked Entity should match our relationshipList
@@ -181,10 +183,9 @@ public class EntityServiceImplTest  {
 
         // Mock the state of objects utilized in getLeftRelationshipTypes()
         // to meet the success criteria of the invocation
-        when(itemService.getMetadata(item, "dspace", "entity", "type", Item.ANY, false)).thenReturn(metsList);
         when(entity.getItem()).thenReturn(item);
         when(entityService.getType(context, entity)).thenReturn(entityType);
-        when(relationshipTypeService.findByEntityType(context, entityService.getType(context, entity), true, -1, -1))
+        when(relationshipTypeService.findByEntityType(context, entityType, true, -1, -1))
                 .thenReturn(relationshipTypeList);
 
         // The left relationshipType(s) reported from our mocked Entity should match our relationshipList
@@ -209,10 +210,9 @@ public class EntityServiceImplTest  {
 
         // Mock the state of objects utilized in getRightRelationshipTypes()
         // to meet the success criteria of the invocation
-        when(itemService.getMetadata(item, "dspace", "entity", "type", Item.ANY, false)).thenReturn(metsList);
         when(entity.getItem()).thenReturn(item);
         when(entityService.getType(context, entity)).thenReturn(entityType);
-        when(relationshipTypeService.findByEntityType(context, entityService.getType(context, entity), false, -1, -1))
+        when(relationshipTypeService.findByEntityType(context, entityType, false, -1, -1))
                 .thenReturn(relationshipTypeList);
 
         // The right relationshipType(s) reported from our mocked Entity should match our relationshipList
diff --git a/dspace-api/src/test/java/org/dspace/content/EntityTypeServiceImplTest.java b/dspace-api/src/test/java/org/dspace/content/EntityTypeServiceImplTest.java
index c54f0fc955..1137219103 100644
--- a/dspace-api/src/test/java/org/dspace/content/EntityTypeServiceImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/EntityTypeServiceImplTest.java
@@ -122,7 +122,7 @@ public class EntityTypeServiceImplTest   {
     }
 
     /**
-     * Helper method that reutrns new EntityType
+     * Helper method that returns new EntityType
      * @return new EntityType
      */
     public EntityType makeEntityType() {
diff --git a/dspace-api/src/test/java/org/dspace/content/ITCommunityCollection.java b/dspace-api/src/test/java/org/dspace/content/ITCommunityCollection.java
index 03d0391ab8..668944fc97 100644
--- a/dspace-api/src/test/java/org/dspace/content/ITCommunityCollection.java
+++ b/dspace-api/src/test/java/org/dspace/content/ITCommunityCollection.java
@@ -200,7 +200,7 @@ public class ITCommunityCollection extends AbstractIntegrationTest {
         groupService.addMember(context, adminGroup, commAdmin);
         groupService.update(context, adminGroup);
 
-        // Create a hierachy of sub-Communities and Collections and Items.
+        // Create a hierarchy of sub-Communities and Collections and Items.
         Community child = communityService.createSubcommunity(context, parentCom);
         Community child2 = communityService.createSubcommunity(context, parentCom);
         Community child3 = communityService.createSubcommunity(context, parentCom);
diff --git a/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java b/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java
index 54ff9ce026..dc78008f3e 100644
--- a/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/ItemComparatorTest.java
@@ -135,43 +135,43 @@ public class ItemComparatorTest extends AbstractUnitTest {
         int result;
         ItemComparator ic;
 
-        //one of the tiems has no value
+        //one of the items has no value
         ic = new ItemComparator("test", "one", Item.ANY, true);
         result = ic.compare(one, two);
         assertTrue("testCompare 0", result == 0);
 
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
         result = ic.compare(one, two);
         assertTrue("testCompare 1", result >= 1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
         result = ic.compare(one, two);
         assertTrue("testCompare 2", result <= -1);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         //value in both items
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "2");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "2");
         result = ic.compare(one, two);
         assertTrue("testCompare 3", result <= -1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
         result = ic.compare(one, two);
         assertTrue("testCompare 4", result == 0);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
         result = ic.compare(one, two);
         assertTrue("testCompare 5", result >= 1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
@@ -179,60 +179,60 @@ public class ItemComparatorTest extends AbstractUnitTest {
 
         //multiple values (min, max)
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "0");
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "3");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "0");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "3");
         result = ic.compare(one, two);
         assertTrue("testCompare 3", result <= -1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "0");
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "-1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "0");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "-1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
         result = ic.compare(one, two);
         assertTrue("testCompare 4", result == 0);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, true);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "-1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "-1");
         result = ic.compare(one, two);
         assertTrue("testCompare 5", result >= 1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, false);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "3");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "3");
         result = ic.compare(one, two);
         assertTrue("testCompare 3", result <= -1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, false);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "5");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "5");
         result = ic.compare(one, two);
         assertTrue("testCompare 4", result == 0);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
         itemService.clearMetadata(context, two, "dc", "test", "one", Item.ANY);
 
         ic = new ItemComparator("test", "one", Item.ANY, false);
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "2");
-        itemService.addMetadata(context, one, "dc", "test", "one", Item.ANY, "3");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "1");
-        itemService.addMetadata(context, two, "dc", "test", "one", Item.ANY, "4");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "2");
+        itemService.addMetadata(context, one, "dc", "test", "one", null, "3");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "1");
+        itemService.addMetadata(context, two, "dc", "test", "one", null, "4");
         result = ic.compare(one, two);
         assertTrue("testCompare 5", result >= 1);
         itemService.clearMetadata(context, one, "dc", "test", "one", Item.ANY);
diff --git a/dspace-api/src/test/java/org/dspace/content/ItemTest.java b/dspace-api/src/test/java/org/dspace/content/ItemTest.java
index aaa28769dc..00dbf2994d 100644
--- a/dspace-api/src/test/java/org/dspace/content/ItemTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/ItemTest.java
@@ -518,11 +518,11 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         String[] values = {"value0", "value1"};
         itemService.addMetadata(context, it, schema, element, qualifier, lang, Arrays.asList(values));
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testAddMetadata_5args_1 0", dc, notNullValue());
         assertTrue("testAddMetadata_5args_1 1", dc.size() == 2);
         assertThat("testAddMetadata_5args_1 2", dc.get(0).getMetadataField().getMetadataSchema().getName(),
@@ -544,7 +544,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         String[] values = {};
         itemService.addMetadata(context, it, schema, element, qualifier, lang, Arrays.asList(values));
         fail("IllegalArgumentException expected");
@@ -563,13 +563,13 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "language";
         String qualifier = "iso";
-        String lang = Item.ANY;
+        String lang = null;
         List<String> values = Arrays.asList("en_US", "en");
         List<String> authorities = Arrays.asList("accepted", "uncertain");
         List<Integer> confidences = Arrays.asList(0, 0);
         itemService.addMetadata(context, it, schema, element, qualifier, lang, values, authorities, confidences);
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testAddMetadata_7args_1 0", dc, notNullValue());
         assertTrue("testAddMetadata_7args_1 1", dc.size() == 2);
         assertThat("testAddMetadata_7args_1 2", dc.get(0).getMetadataField().getMetadataSchema().getName(),
@@ -600,13 +600,13 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         List<String> values = Arrays.asList("value0", "value1");
         List<String> authorities = Arrays.asList("auth0", "auth2");
         List<Integer> confidences = Arrays.asList(0, 0);
         itemService.addMetadata(context, it, schema, element, qualifier, lang, values, authorities, confidences);
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testAddMetadata_7args_1 0", dc, notNullValue());
         assertTrue("testAddMetadata_7args_1 1", dc.size() == 2);
         assertThat("testAddMetadata_7args_1 2", dc.get(0).getMetadataField().getMetadataSchema().getName(),
@@ -632,7 +632,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         List<String> values = new ArrayList();
         List<String> authorities = new ArrayList();
         List<Integer> confidences = new ArrayList();
@@ -645,7 +645,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         // Create two fake virtual metadata ("virtual::[relationship-id]") values
         List<String> values = new ArrayList<>(Arrays.asList("uuid-1", "uuid-2"));
         List<String> authorities = new ArrayList<>(Arrays.asList(Constants.VIRTUAL_AUTHORITY_PREFIX + "relationship-1",
@@ -674,7 +674,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         assertEquals(1, valuesAdded.size());
 
         // Get metadata and ensure new value is the ONLY ONE for this metadata field
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertNotNull(dc);
         assertEquals(1, dc.size());
         assertEquals(schema, dc.get(0).getMetadataField().getMetadataSchema().getName());
@@ -693,11 +693,11 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         String value = "value0";
         itemService.addMetadata(context, it, schema, element, qualifier, lang, value);
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testAddMetadata_5args_2 0", dc, notNullValue());
         assertTrue("testAddMetadata_5args_2 1", dc.size() == 1);
         assertThat("testAddMetadata_5args_2 2", dc.get(0).getMetadataField().getMetadataSchema().getName(),
@@ -719,13 +719,13 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "language";
         String qualifier = "iso";
-        String lang = Item.ANY;
+        String lang = null;
         String values = "en";
         String authorities = "accepted";
         int confidences = 0;
         itemService.addMetadata(context, it, schema, element, qualifier, lang, values, authorities, confidences);
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testAddMetadata_7args_2 0", dc, notNullValue());
         assertTrue("testAddMetadata_7args_2 1", dc.size() == 1);
         assertThat("testAddMetadata_7args_2 2", dc.get(0).getMetadataField().getMetadataSchema().getName(),
@@ -748,13 +748,13 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "editor";
-        String lang = Item.ANY;
+        String lang = null;
         String values = "value0";
         String authorities = "auth0";
         int confidences = 0;
         itemService.addMetadata(context, it, schema, element, qualifier, lang, values, authorities, confidences);
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testAddMetadata_7args_2 0", dc, notNullValue());
         assertTrue("testAddMetadata_7args_2 1", dc.size() == 1);
         assertThat("testAddMetadata_7args_2 2", dc.get(0).getMetadataField().getMetadataSchema().getName(),
@@ -772,7 +772,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         // Create a single fake virtual metadata ("virtual::[relationship-id]") value
         String value = "uuid-1";
         String authority = Constants.VIRTUAL_AUTHORITY_PREFIX + "relationship-1";
@@ -786,7 +786,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         assertNull(valuesAdded);
 
         // Verify this metadata field does NOT exist on the item
-        List<MetadataValue> mv = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> mv = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertNotNull(mv);
         assertTrue(mv.isEmpty());
 
@@ -797,7 +797,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         assertNull(valuesAdded);
 
         // Verify this metadata field does NOT exist on the item
-        mv = itemService.getMetadata(it, schema, element, qualifier, lang);
+        mv = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertNotNull(mv);
         assertTrue(mv.isEmpty());
     }
@@ -811,13 +811,13 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         String schema = "dc";
         String element = "contributor";
         String qualifier = "author";
-        String lang = Item.ANY;
+        String lang = null;
         String values = "value0";
         itemService.addMetadata(context, it, schema, element, qualifier, lang, values);
 
-        itemService.clearMetadata(context, it, schema, element, qualifier, lang);
+        itemService.clearMetadata(context, it, schema, element, qualifier, Item.ANY);
 
-        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, lang);
+        List<MetadataValue> dc = itemService.getMetadata(it, schema, element, qualifier, Item.ANY);
         assertThat("testClearMetadata 0", dc, notNullValue());
         assertTrue("testClearMetadata 1", dc.size() == 0);
     }
@@ -859,11 +859,11 @@ public class ItemTest extends AbstractDSpaceObjectTest {
         context.turnOffAuthorisationSystem();
         Collection collection = collectionService.create(context, owningCommunity);
         collectionService.setMetadataSingleValue(context, collection, MetadataSchemaEnum.DC.getName(),
-                                                 "title", null, Item.ANY, "collection B");
+                                                 "title", null, null, "collection B");
         it.addCollection(collection);
         collection = collectionService.create(context, owningCommunity);
         collectionService.setMetadataSingleValue(context, collection, MetadataSchemaEnum.DC.getName(),
-                                                 "title", null, Item.ANY, "collection A");
+                                                 "title", null, null, "collection A");
         it.addCollection(collection);
         context.restoreAuthSystemState();
         assertThat("testGetCollections 0", it.getCollections(), notNullValue());
@@ -1772,7 +1772,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
 
         // add new metadata to item
         context.turnOffAuthorisationSystem();
-        itemService.addMetadata(context, it, schema, element, qualifier, Item.ANY, value);
+        itemService.addMetadata(context, it, schema, element, qualifier, null, value);
         itemService.update(context, it);
         context.restoreAuthSystemState();
 
@@ -1837,7 +1837,7 @@ public class ItemTest extends AbstractDSpaceObjectTest {
 
         // add new metadata (with authority) to item
         context.turnOffAuthorisationSystem();
-        itemService.addMetadata(context, it, schema, element, qualifier, Item.ANY, value, authority, confidence);
+        itemService.addMetadata(context, it, schema, element, qualifier, null, value, authority, confidence);
         itemService.update(context, it);
         context.restoreAuthSystemState();
 
diff --git a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
index 3e36f77c68..b33063a1fa 100644
--- a/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/RelationshipServiceImplPlaceTest.java
@@ -429,7 +429,7 @@ public class RelationshipServiceImplPlaceTest extends AbstractUnitTest {
 
         context.turnOffAuthorisationSystem();
 
-        // Create a relationship with this item with a spcific place
+        // Create a relationship with this item with a specific place
         Relationship relationship = relationshipService.create(context, item, authorItem, isAuthorOfPublication, 1, -1);
 
         context.restoreAuthSystemState();
diff --git a/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsIT.java b/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsIT.java
index 44653300e0..3acc4ca146 100644
--- a/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/VersioningWithRelationshipsIT.java
@@ -49,6 +49,7 @@ import org.dspace.builder.EntityTypeBuilder;
 import org.dspace.builder.ItemBuilder;
 import org.dspace.builder.RelationshipBuilder;
 import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.builder.VersionBuilder;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.InstallItemService;
 import org.dspace.content.service.ItemService;
@@ -62,8 +63,6 @@ import org.dspace.discovery.SolrSearchCore;
 import org.dspace.kernel.ServiceManager;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.versioning.Version;
-import org.dspace.versioning.factory.VersionServiceFactory;
-import org.dspace.versioning.service.VersioningService;
 import org.hamcrest.Matcher;
 import org.junit.Assert;
 import org.junit.Before;
@@ -74,8 +73,6 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
 
     private final RelationshipService relationshipService =
         ContentServiceFactory.getInstance().getRelationshipService();
-    private final VersioningService versioningService =
-        VersionServiceFactory.getInstance().getVersionService();
     private final WorkspaceItemService workspaceItemService =
         ContentServiceFactory.getInstance().getWorkspaceItemService();
     private final InstallItemService installItemService =
@@ -84,7 +81,6 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         ContentServiceFactory.getInstance().getItemService();
     private final SolrSearchCore solrSearchCore =
         DSpaceServicesFactory.getInstance().getServiceManager().getServicesByType(SolrSearchCore.class).get(0);
-
     protected Community community;
     protected Collection collection;
     protected EntityType publicationEntityType;
@@ -291,7 +287,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create a new version of the publication //
         /////////////////////////////////////////////
 
-        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Version newVersion = VersionBuilder.createVersion(context, originalPublication, "test").build();
         Item newPublication = newVersion.getItem();
         assertNotSame(originalPublication, newPublication);
 
@@ -567,7 +563,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create a new version of the publication //
         /////////////////////////////////////////////
 
-        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Version newVersion = VersionBuilder.createVersion(context, originalPublication, "test").build();
         Item newPublication = newVersion.getItem();
         assertNotSame(originalPublication, newPublication);
 
@@ -927,7 +923,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create a new version of the person //
         ////////////////////////////////////////
 
-        Version newVersion = versioningService.createNewVersion(context, originalPerson);
+        Version newVersion = VersionBuilder.createVersion(context, originalPerson, "test").build();
         Item newPerson = newVersion.getItem();
         assertNotSame(originalPerson, newPerson);
 
@@ -1300,7 +1296,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version of publication //
         ///////////////////////////////////////
 
-        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Version newVersion = VersionBuilder.createVersion(context, originalPublication, "test").build();
         Item newPublication = newVersion.getItem();
         assertNotSame(originalPublication, newPublication);
 
@@ -1463,7 +1459,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create a new version of the publication //
         /////////////////////////////////////////////
 
-        Version newVersion = versioningService.createNewVersion(context, originalPublication);
+        Version newVersion = VersionBuilder.createVersion(context, originalPublication, "test").build();
         Item newPublication = newVersion.getItem();
         assertNotSame(originalPublication, newPublication);
 
@@ -1782,7 +1778,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version - volume 1.2 //
         /////////////////////////////////////
 
-        Item v1_2 = versioningService.createNewVersion(context, v1_1).getItem();
+        Item v1_2 = VersionBuilder.createVersion(context, v1_1, "test").build().getItem();
         installItemService.installItem(context, workspaceItemService.findByItem(context, v1_2));
         context.commit();
 
@@ -1790,7 +1786,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version - issue 3.2 //
         ////////////////////////////////////
 
-        Item i3_2 = versioningService.createNewVersion(context, i3_1).getItem();
+        Item i3_2 = VersionBuilder.createVersion(context, i3_1, "test").build().getItem();
         installItemService.installItem(context, workspaceItemService.findByItem(context, i3_2));
         context.commit();
 
@@ -2316,7 +2312,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
                 // create new version - person 3.2 //
                 /////////////////////////////////////
 
-                Item pe3_2 = versioningService.createNewVersion(context, pe3_1).getItem();
+                Item pe3_2 = VersionBuilder.createVersion(context, pe3_1, "test").build().getItem();
                 installItemService.installItem(context, workspaceItemService.findByItem(context, pe3_2));
                 context.commit();
 
@@ -2324,7 +2320,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
                 // create new version - project 3.2 //
                 //////////////////////////////////////
 
-                Item pr3_2 = versioningService.createNewVersion(context, pr3_1).getItem();
+                Item pr3_2 = VersionBuilder.createVersion(context, pr3_1, "test").build().getItem();
                 installItemService.installItem(context, workspaceItemService.findByItem(context, pr3_2));
                 context.commit();
 
@@ -3056,7 +3052,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version - volume 1.2 //
         /////////////////////////////////////
 
-        Item v1_2 = versioningService.createNewVersion(context, v1_1).getItem();
+        Item v1_2 = VersionBuilder.createVersion(context, v1_1, "test").build().getItem();
         installItemService.installItem(context, workspaceItemService.findByItem(context, v1_2));
         context.commit();
 
@@ -3064,7 +3060,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version - issue 3.2 //
         ////////////////////////////////////
 
-        Item i3_2 = versioningService.createNewVersion(context, i3_1).getItem();
+        Item i3_2 = VersionBuilder.createVersion(context, i3_1, "test").build().getItem();
         installItemService.installItem(context, workspaceItemService.findByItem(context, i3_2));
         context.commit();
 
@@ -3509,7 +3505,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create a new version of publication 1 and archive //
         ///////////////////////////////////////////////////////
 
-        Item publication1V2 = versioningService.createNewVersion(context, publication1V1).getItem();
+        Item publication1V2 = VersionBuilder.createVersion(context, publication1V1, "test").build().getItem();
         installItemService.installItem(context, workspaceItemService.findByItem(context, publication1V2));
         context.dispatchEvents();
 
@@ -3517,7 +3513,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version of person 1 //
         ////////////////////////////////////
 
-        Item person1V2 = versioningService.createNewVersion(context, person1V1).getItem();
+        Item person1V2 = VersionBuilder.createVersion(context, person1V1, "test").build().getItem();
         // update "Smith, Donald" to "Smith, D."
         itemService.replaceMetadata(
             context, person1V2, "person", "givenName", null, null, "D.",
@@ -3853,7 +3849,7 @@ public class VersioningWithRelationshipsIT extends AbstractIntegrationTestWithDa
         // create new version of person 2 //
         ////////////////////////////////////
 
-        Item person2V2 = versioningService.createNewVersion(context, person2V1).getItem();
+        Item person2V2 = VersionBuilder.createVersion(context, person2V1, "test").build().getItem();
         Relationship rel1 = getRelationship(publication1V2, isAuthorOfPublication, person2V2);
         assertNotNull(rel1);
         rel1.setRightwardValue("Doe, Jane Jr");
diff --git a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplIT.java b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplIT.java
index 2d08223b2e..8e48c70884 100644
--- a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipDAOImplIT.java
@@ -72,7 +72,7 @@ public class RelationshipDAOImplIT extends AbstractIntegrationTest {
     protected EntityTypeService entityTypeService = ContentServiceFactory.getInstance().getEntityTypeService();
 
     /**
-     * Initalize DSpace objects used for testing for each test
+     * Initialize DSpace objects used for testing for each test
      */
     @Before
     @Override
@@ -87,8 +87,8 @@ public class RelationshipDAOImplIT extends AbstractIntegrationTest {
             WorkspaceItem workspaceItemTwo = workspaceItemService.create(context, collection, false);
             itemOne = installItemService.installItem(context, workspaceItem);
             itemTwo = installItemService.installItem(context, workspaceItemTwo);
-            itemService.addMetadata(context, itemOne, "dspace", "entity", "type", Item.ANY, "Publication");
-            itemService.addMetadata(context, itemTwo, "dspace", "entity", "type", Item.ANY, "Person");
+            itemService.addMetadata(context, itemOne, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, itemTwo, "dspace", "entity", "type", null, "Person");
             itemService.update(context, itemOne);
             itemService.update(context, itemTwo);
             entityTypeOne = entityTypeService.create(context, "Person");
@@ -106,7 +106,7 @@ public class RelationshipDAOImplIT extends AbstractIntegrationTest {
     }
 
     /**
-     * Delete all initalized DSpace objects after each test
+     * Delete all initialized DSpace objects after each test
      */
     @After
     @Override
diff --git a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplIT.java b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplIT.java
index ff7d03b49f..315fabba9e 100644
--- a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplIT.java
@@ -68,7 +68,7 @@ public class RelationshipTypeDAOImplIT extends AbstractIntegrationTest {
     protected EntityTypeService entityTypeService = ContentServiceFactory.getInstance().getEntityTypeService();
 
     /**
-     * Initalize DSpace objects used for testing for each test
+     * Initialize DSpace objects used for testing for each test
      */
     @Before
     @Override
@@ -82,8 +82,8 @@ public class RelationshipTypeDAOImplIT extends AbstractIntegrationTest {
             WorkspaceItem workspaceItemTwo = workspaceItemService.create(context, collection, false);
             itemOne = installItemService.installItem(context, workspaceItem);
             itemTwo = installItemService.installItem(context, workspaceItemTwo);
-            itemService.addMetadata(context, itemOne, "dspace", "entity", "type", Item.ANY, "Publication");
-            itemService.addMetadata(context, itemTwo, "dspace", "entity", "type", Item.ANY, "Person");
+            itemService.addMetadata(context, itemOne, "dspace", "entity", "type", null, "Publication");
+            itemService.addMetadata(context, itemTwo, "dspace", "entity", "type", null, "Person");
             itemService.update(context, itemOne);
             itemService.update(context, itemTwo);
             entityTypeOne = entityTypeService.create(context, "Person");
@@ -101,7 +101,7 @@ public class RelationshipTypeDAOImplIT extends AbstractIntegrationTest {
     }
 
     /**
-     * Delete all initalized DSpace objects after each test
+     * Delete all initialized DSpace objects after each test
      */
     @After
     @Override
diff --git a/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java b/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
index c5a73ed539..b9cbc36f71 100644
--- a/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
+++ b/dspace-api/src/test/java/org/dspace/content/packager/ITDSpaceAIP.java
@@ -146,7 +146,7 @@ public class ITDSpaceAIP extends AbstractIntegrationTest {
             InstallItemService installItemService = ContentServiceFactory.getInstance().getInstallItemService();
 
             log.info("setUpClass() - CREATE TEST HIERARCHY");
-            // Create a hierachy of sub-Communities and Collections and Items,
+            // Create a hierarchy of sub-Communities and Collections and Items,
             // which looks like this:
             //  "Top Community"
             //      - "Child Community"
diff --git a/dspace-api/src/test/java/org/dspace/content/packager/PackageUtilsTest.java b/dspace-api/src/test/java/org/dspace/content/packager/PackageUtilsTest.java
index ae68600124..06020be513 100644
--- a/dspace-api/src/test/java/org/dspace/content/packager/PackageUtilsTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/packager/PackageUtilsTest.java
@@ -79,7 +79,7 @@ public class PackageUtilsTest extends AbstractUnitTest {
             CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
 
             log.info("setUpClass() - CREATE TEST HIERARCHY");
-            // Create a hierachy of sub-Communities and Collections
+            // Create a hierarchy of sub-Communities and Collections
             // which looks like this:
             //  "Top Community"
             //      - "Child Community"
diff --git a/dspace-api/src/test/java/org/dspace/content/service/ItemServiceIT.java b/dspace-api/src/test/java/org/dspace/content/service/ItemServiceIT.java
index 2ff7dd21da..eee445b333 100644
--- a/dspace-api/src/test/java/org/dspace/content/service/ItemServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/content/service/ItemServiceIT.java
@@ -11,7 +11,9 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayInputStream;
@@ -19,6 +21,9 @@ import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
@@ -44,11 +49,15 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.EntityType;
 import org.dspace.content.Item;
+import org.dspace.content.MetadataField;
+import org.dspace.content.MetadataSchema;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.Relationship;
 import org.dspace.content.RelationshipType;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.contentreport.QueryOperator;
+import org.dspace.contentreport.QueryPredicate;
 import org.dspace.core.Constants;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
@@ -71,6 +80,9 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
     protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
     protected InstallItemService installItemService = ContentServiceFactory.getInstance().getInstallItemService();
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
+    protected MetadataSchemaService metadataSchemaService =
+            ContentServiceFactory.getInstance().getMetadataSchemaService();
+    protected MetadataFieldService metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
     protected MetadataValueService metadataValueService = ContentServiceFactory.getInstance().getMetadataValueService();
     protected VersioningService versioningService = VersionServiceFactory.getInstance().getVersionService();
     protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
@@ -78,6 +90,8 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
 
     Community community;
     Collection collection1;
+    MetadataSchema schemaDC;
+    MetadataField fieldAuthor;
 
     Item item;
 
@@ -99,6 +113,9 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
         try {
             context.turnOffAuthorisationSystem();
 
+            schemaDC = metadataSchemaService.find(context, "dc");
+            fieldAuthor = metadataFieldService.findByElement(context, schemaDC, "contributor", "author");
+
             community = CommunityBuilder.createCommunity(context)
                 .build();
 
@@ -142,7 +159,7 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
 
         // check the correct order using default method `getMetadata`
         List<MetadataValue> defaultMetadata =
-            this.itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+            itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
 
         assertThat(defaultMetadata,hasSize(3));
 
@@ -158,7 +175,7 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
 
         // check the correct order using the method `getMetadata` without virtual fields
         List<MetadataValue> nonVirtualMetadatas =
-            this.itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY, false);
+            itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY, false);
 
         // if we don't reload the item the place order is not applied correctly
         // item = context.reloadEntity(item);
@@ -180,19 +197,19 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
         item = context.reloadEntity(item);
 
         // now just add one metadata to be the last
-        this.itemService.addMetadata(
-            context, item, dcSchema, contributorElement, authorQualifier, Item.ANY, "test, latest", null, 0
+        itemService.addMetadata(
+            context, item, dcSchema, contributorElement, authorQualifier, null, "test, latest", null, 0
         );
         // now just remove first metadata
-        this.itemService.removeMetadataValues(context, item, List.of(placeZero));
+        itemService.removeMetadataValues(context, item, List.of(placeZero));
         // now just add one metadata to place 0
-        this.itemService.addAndShiftRightMetadata(
+        itemService.addAndShiftRightMetadata(
             context, item, dcSchema, contributorElement, authorQualifier, Item.ANY, "test, new", null, 0, 0
         );
 
         // check the metadata using method `getMetadata`
         defaultMetadata =
-            this.itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+            itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
 
         // check correct places
         assertThat(defaultMetadata,hasSize(4));
@@ -212,7 +229,7 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
 
         // check metadata using nonVirtualMethod
         nonVirtualMetadatas =
-            this.itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY, false);
+            itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY, false);
 
         // check correct places
         assertThat(nonVirtualMetadatas,hasSize(4));
@@ -244,7 +261,7 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
 
         // check after commit
         defaultMetadata =
-            this.itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
+            itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY);
 
         // check correct places
         assertThat(defaultMetadata,hasSize(4));
@@ -264,7 +281,7 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
 
         // check metadata using nonVirtualMethod
         nonVirtualMetadatas =
-            this.itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY, false);
+            itemService.getMetadata(item, dcSchema, contributorElement, authorQualifier, Item.ANY, false);
 
         // check correct places
         assertThat(nonVirtualMetadatas,hasSize(4));
@@ -912,4 +929,65 @@ public class ItemServiceIT extends AbstractIntegrationTestWithDatabase {
         assertThat(metadataValue.getAuthority(), equalTo(authority));
         assertThat(metadataValue.getPlace(), equalTo(place));
     }
+
+    @Test
+    public void testFindByMetadataQuery() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        // Here we add an author to the item
+        MetadataValue mv = itemService.addMetadata(context, item, dcSchema, contributorElement,
+                authorQualifier, null, "test, one");
+        context.commit();
+
+        item = context.reloadEntity(item);
+
+        assertNotNull(mv);
+        MetadataField mf = mv.getMetadataField();
+        assertEquals(fieldAuthor, mf);
+        MetadataSchema ms = mf.getMetadataSchema();
+        assertNotNull(ms);
+        assertEquals(dcSchema, ms.getName());
+
+        // We check whether the author metadata was properly added.
+        List<MetadataValue> mvs = item.getMetadata();
+        MetadataValue mvAuthor1 = mvs.stream()
+                .filter(mv1 -> Objects.equals(mv1.getMetadataField().getElement(), "contributor"))
+                .filter(mv1 -> Objects.equals(mv1.getMetadataField().getQualifier(), "author"))
+                .findFirst()
+                .orElse(null);
+        assertNotNull(mvAuthor1);
+        assertEquals("test, one", mvAuthor1.getValue());
+
+        assertMetadataValue(
+            authorQualifier, contributorElement, dcSchema, "test, one", null, 0, mvAuthor1
+        );
+
+        assertEquals(collection1, item.getOwningCollection());
+
+        List<UUID> collectionUuids = List.of(collection1.getID());
+
+        // First test: we should not find anything.
+        QueryPredicate predicate = QueryPredicate.of(fieldAuthor, QueryOperator.MATCHES, ".*whatever.*");
+        List<Item> items = itemService.findByMetadataQuery(context, List.of(predicate), collectionUuids, 0, -1);
+        assertTrue(items.isEmpty());
+
+        // Second test: we search against the metadata value specified above.
+        predicate = QueryPredicate.of(fieldAuthor, QueryOperator.EQUALS, "test, one");
+        items = itemService.findByMetadataQuery(context, List.of(predicate), collectionUuids, 0, -1);
+        assertEquals(1, items.size());
+
+        Item item = items.get(0);
+        assertNotNull(item);
+        List<MetadataValue> allMetadata = item.getMetadata();
+        Optional<MetadataValue> mvAuthor = allMetadata.stream()
+                .filter(md -> Objects.equals(dcSchema, md.getMetadataField().getMetadataSchema().getName()))
+                .filter(md -> Objects.equals(contributorElement, md.getMetadataField().getElement()))
+                .filter(md -> Objects.equals(authorQualifier, md.getMetadataField().getQualifier()))
+                .findFirst();
+        assertTrue(mvAuthor.isPresent());
+        assertEquals("test, one", mvAuthor.get().getValue());
+
+        context.restoreAuthSystemState();
+    }
+
 }
diff --git a/dspace-api/src/test/java/org/dspace/content/virtual/ConcatenateTest.java b/dspace-api/src/test/java/org/dspace/content/virtual/ConcatenateTest.java
index 52457a23d7..f39f2d8fd9 100644
--- a/dspace-api/src/test/java/org/dspace/content/virtual/ConcatenateTest.java
+++ b/dspace-api/src/test/java/org/dspace/content/virtual/ConcatenateTest.java
@@ -61,11 +61,11 @@ public class ConcatenateTest {
     @Test
     public void testGetSeperator() {
         // Setup objects utilized in unit test
-        String seperator = ",";
+        String separator = ",";
         concatenate.setSeparator(",");
 
-        // The reported seperator should match our defined seperator
-        assertEquals("TestGetSeperator 0", seperator, concatenate.getSeparator());
+        // The reported separator should match our defined separator
+        assertEquals("TestGetSeperator 0", separator, concatenate.getSeparator());
     }
 
     @Test
@@ -73,7 +73,7 @@ public class ConcatenateTest {
         // Setup objects utilized in unit test
         concatenate.setSeparator(",");
 
-        // The reported seperator should match our defined seperator
+        // The reported separator should match our defined separator
         assertEquals("TestSetSeperator 0", ",", concatenate.getSeparator());
     }
 
@@ -82,7 +82,7 @@ public class ConcatenateTest {
         // Setup objects utilized in unit test
         concatenate.setUseForPlace(true);
 
-        // The reported seperator should match our defined seperator
+        // The reported separator should match our defined separator
         assertEquals("TestSetUseForPlace 0", true, concatenate.getUseForPlace());
 
     }
diff --git a/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java b/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java
index 2a07799dee..8038a71533 100644
--- a/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java
+++ b/dspace-api/src/test/java/org/dspace/ctask/general/CreateMissingIdentifiersIT.java
@@ -10,6 +10,8 @@ package org.dspace.ctask.general;
 import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.CollectionBuilder;
@@ -19,7 +21,10 @@ import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.core.factory.CoreServiceFactory;
 import org.dspace.curate.Curator;
+import org.dspace.identifier.IdentifierProvider;
+import org.dspace.identifier.IdentifierServiceImpl;
 import org.dspace.identifier.VersionedHandleIdentifierProviderWithCanonicalHandles;
+import org.dspace.kernel.ServiceManager;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.junit.After;
@@ -32,10 +37,23 @@ import org.junit.Test;
  */
 public class CreateMissingIdentifiersIT
         extends AbstractIntegrationTestWithDatabase {
+    private ServiceManager serviceManager;
+    private IdentifierServiceImpl identifierService;
     private static final String P_TASK_DEF
             = "plugin.named.org.dspace.curate.CurationTask";
     private static final String TASK_NAME = "test";
 
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+
+        serviceManager = DSpaceServicesFactory.getInstance().getServiceManager();
+        identifierService = serviceManager.getServicesByType(IdentifierServiceImpl.class).get(0);
+        // Clean out providers to avoid any being used for creation of community and collection
+        identifierService.setProviders(new ArrayList<>());
+    }
+
     @Test
     public void testPerform()
             throws IOException {
@@ -67,11 +85,7 @@ public class CreateMissingIdentifiersIT
         /*
          * Now install an incompatible provider to make the task fail.
          */
-        DSpaceServicesFactory.getInstance()
-                .getServiceManager()
-                .registerServiceClass(
-                        VersionedHandleIdentifierProviderWithCanonicalHandles.class.getCanonicalName(),
-                        VersionedHandleIdentifierProviderWithCanonicalHandles.class);
+        registerProvider(VersionedHandleIdentifierProviderWithCanonicalHandles.class);
 
         curator.curate(context, item);
         System.out.format("With incompatible provider, result is '%s'.\n",
@@ -86,4 +100,14 @@ public class CreateMissingIdentifiersIT
         super.destroy();
         DSpaceServicesFactory.getInstance().getServiceManager().getApplicationContext().refresh();
     }
+
+    private void registerProvider(Class type) {
+        // Register our new provider
+        serviceManager.registerServiceClass(type.getName(), type);
+        IdentifierProvider identifierProvider =
+                (IdentifierProvider) serviceManager.getServiceByName(type.getName(), type);
+
+        // Overwrite the identifier-service's providers with the new one to ensure only this provider is used
+        identifierService.setProviders(List.of(identifierProvider));
+    }
 }
diff --git a/dspace-api/src/test/java/org/dspace/curate/CuratorReportTest.java b/dspace-api/src/test/java/org/dspace/curate/CuratorReportTest.java
index 489161bf8d..0f57e18731 100644
--- a/dspace-api/src/test/java/org/dspace/curate/CuratorReportTest.java
+++ b/dspace-api/src/test/java/org/dspace/curate/CuratorReportTest.java
@@ -14,6 +14,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractUnitTest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Community;
@@ -27,8 +29,6 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Drive the Curator and check results.
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
  */
 public class CuratorReportTest
         extends AbstractUnitTest {
-    Logger LOG = LoggerFactory.getLogger(CuratorReportTest.class);
+    Logger LOG = LogManager.getLogger();
 
     public CuratorReportTest() {
     }
diff --git a/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java b/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
index 55be531418..6bc79cad55 100644
--- a/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
+++ b/dspace-api/src/test/java/org/dspace/discovery/DiscoveryIT.java
@@ -19,8 +19,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.app.launcher.ScriptLauncher;
 import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
diff --git a/dspace-api/src/test/java/org/dspace/discovery/FullTextContentStreamsTest.java b/dspace-api/src/test/java/org/dspace/discovery/FullTextContentStreamsTest.java
index f2a759fa09..ff4174d048 100644
--- a/dspace-api/src/test/java/org/dspace/discovery/FullTextContentStreamsTest.java
+++ b/dspace-api/src/test/java/org/dspace/discovery/FullTextContentStreamsTest.java
@@ -193,7 +193,7 @@ public class FullTextContentStreamsTest {
                    content.contains("This is text 1"));
         assertFalse("The data should NOT contain data of the second bitstream that is corrupt",
                     content.contains("This is text 2"));
-        assertTrue("The data should contain data of the third bistream that is not corrupt",
+        assertTrue("The data should contain data of the third bitstream that is not corrupt",
                    content.contains("This is text 3"));
         assertTrue("The data should contain data on the exception that occurred",
                    content.contains("java.io.IOException"));
diff --git a/dspace-api/src/test/java/org/dspace/eperson/EPersonInWorkflowIT.java b/dspace-api/src/test/java/org/dspace/eperson/EPersonInWorkflowIT.java
index 0aa549e8c8..a9cc213ad9 100644
--- a/dspace-api/src/test/java/org/dspace/eperson/EPersonInWorkflowIT.java
+++ b/dspace-api/src/test/java/org/dspace/eperson/EPersonInWorkflowIT.java
@@ -15,8 +15,8 @@ import static org.junit.Assert.fail;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.AbstractIntegrationTestWithDatabase;
@@ -347,7 +347,7 @@ public class EPersonInWorkflowIT extends AbstractIntegrationTestWithDatabase {
          * being no other members in step 3
          * - approve it by user B
          * - delete user B
-         * - verify the delete suceeds
+         * - verify the delete succeeds
          * - verify that the item is archived
          */
         context.turnOffAuthorisationSystem();
@@ -543,7 +543,7 @@ public class EPersonInWorkflowIT extends AbstractIntegrationTestWithDatabase {
      * task if they are the only member. This test also verifies the user can be removed from a step with no tasks
      * even if they are the only member. This test also verifies that after the task has been passed and the user has
      *  been removed from the workflow, the EPerson can be removed. This test also verifies that an item is correctly
-     *  arhived if the last step has no members left.
+     *  archived if the last step has no members left.
      *
      * @throws Exception
      */
diff --git a/dspace-api/src/test/java/org/dspace/eperson/EPersonTest.java b/dspace-api/src/test/java/org/dspace/eperson/EPersonTest.java
index 3780afcf63..4439e39e70 100644
--- a/dspace-api/src/test/java/org/dspace/eperson/EPersonTest.java
+++ b/dspace-api/src/test/java/org/dspace/eperson/EPersonTest.java
@@ -21,8 +21,8 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
-import javax.mail.MessagingException;
 
+import jakarta.mail.MessagingException;
 import org.apache.commons.codec.DecoderException;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/dspace-api/src/test/java/org/dspace/external/MockOpenAIRERestConnector.java b/dspace-api/src/test/java/org/dspace/external/MockOpenaireRestConnector.java
similarity index 82%
rename from dspace-api/src/test/java/org/dspace/external/MockOpenAIRERestConnector.java
rename to dspace-api/src/test/java/org/dspace/external/MockOpenaireRestConnector.java
index bac80e196c..9e1362e231 100644
--- a/dspace-api/src/test/java/org/dspace/external/MockOpenAIRERestConnector.java
+++ b/dspace-api/src/test/java/org/dspace/external/MockOpenaireRestConnector.java
@@ -8,21 +8,20 @@
 package org.dspace.external;
 
 import java.io.InputStream;
-import javax.xml.bind.JAXBException;
 
 import eu.openaire.jaxb.helper.OpenAIREHandler;
 import eu.openaire.jaxb.model.Response;
 
 /**
- * Mock the OpenAIRE rest connector for unit testing<br>
+ * Mock the Openaire rest connector for unit testing<br>
  * will be resolved against static test xml files
  * 
  * @author pgraca
  *
  */
-public class MockOpenAIRERestConnector extends OpenAIRERestConnector {
+public class MockOpenaireRestConnector extends OpenaireRestConnector {
 
-    public MockOpenAIRERestConnector(String url) {
+    public MockOpenaireRestConnector(String url) {
         super(url);
     }
 
@@ -30,7 +29,7 @@ public class MockOpenAIRERestConnector extends OpenAIRERestConnector {
     public Response searchProjectByKeywords(int page, int size, String... keywords) {
         try {
             return OpenAIREHandler.unmarshal(this.getClass().getResourceAsStream("openaire-projects.xml"));
-        } catch (JAXBException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
@@ -40,7 +39,7 @@ public class MockOpenAIRERestConnector extends OpenAIRERestConnector {
     public Response searchProjectByIDAndFunder(String projectID, String projectFunder, int page, int size) {
         try {
             return OpenAIREHandler.unmarshal(this.getClass().getResourceAsStream("openaire-project.xml"));
-        } catch (JAXBException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
@@ -50,7 +49,7 @@ public class MockOpenAIRERestConnector extends OpenAIRERestConnector {
     public Response search(String path, int page, int size) {
         try {
             return OpenAIREHandler.unmarshal(this.getClass().getResourceAsStream("openaire-no-projects.xml"));
-        } catch (JAXBException e) {
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
diff --git a/dspace-api/src/test/java/org/dspace/external/provider/impl/OpenAIREFundingDataProviderTest.java b/dspace-api/src/test/java/org/dspace/external/provider/impl/OpenaireFundingDataProviderTest.java
similarity index 59%
rename from dspace-api/src/test/java/org/dspace/external/provider/impl/OpenAIREFundingDataProviderTest.java
rename to dspace-api/src/test/java/org/dspace/external/provider/impl/OpenaireFundingDataProviderTest.java
index 5e96f06ac8..d14dc99035 100644
--- a/dspace-api/src/test/java/org/dspace/external/provider/impl/OpenAIREFundingDataProviderTest.java
+++ b/dspace-api/src/test/java/org/dspace/external/provider/impl/OpenaireFundingDataProviderTest.java
@@ -23,15 +23,15 @@ import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Unit tests for OpenAIREFundingDataProvider
+ * Unit tests for OpenaireFundingDataProvider
  * 
  * @author pgraca
  *
  */
-public class OpenAIREFundingDataProviderTest extends AbstractDSpaceTest {
+public class OpenaireFundingDataProviderTest extends AbstractDSpaceTest {
 
     ExternalDataService externalDataService;
-    ExternalDataProvider openAIREFundingDataProvider;
+    ExternalDataProvider openaireFundingDataProvider;
 
     /**
      * This method will be run before every test as per @Before. It will initialize
@@ -44,38 +44,38 @@ public class OpenAIREFundingDataProviderTest extends AbstractDSpaceTest {
     public void init() {
         // Set up External Service Factory and set data providers
         externalDataService = ExternalServiceFactory.getInstance().getExternalDataService();
-        openAIREFundingDataProvider = externalDataService.getExternalDataProvider("openAIREFunding");
+        openaireFundingDataProvider = externalDataService.getExternalDataProvider("openaireFunding");
     }
 
     @Test
     public void testNumberOfResultsWSingleKeyword() {
-        assertNotNull("openAIREFundingDataProvider is not null", openAIREFundingDataProvider);
-        assertEquals("openAIREFunding.numberOfResults.query:mock", 77,
-                openAIREFundingDataProvider.getNumberOfResults("mock"));
+        assertNotNull("openaireFundingDataProvider is not null", openaireFundingDataProvider);
+        assertEquals("openaireFunding.numberOfResults.query:mock", 77,
+                openaireFundingDataProvider.getNumberOfResults("mock"));
     }
 
     @Test
     public void testNumberOfResultsWKeywords() {
-        assertNotNull("openAIREFundingDataProvider is not null", openAIREFundingDataProvider);
-        assertEquals("openAIREFunding.numberOfResults.query:mock+test", 77,
-                openAIREFundingDataProvider.getNumberOfResults("mock+test"));
+        assertNotNull("openaireFundingDataProvider is not null", openaireFundingDataProvider);
+        assertEquals("openaireFunding.numberOfResults.query:mock+test", 77,
+                openaireFundingDataProvider.getNumberOfResults("mock+test"));
     }
 
     @Test
     public void testQueryResultsWSingleKeyword() {
-        assertNotNull("openAIREFundingDataProvider is not null", openAIREFundingDataProvider);
-        List<ExternalDataObject> results = openAIREFundingDataProvider.searchExternalDataObjects("mock", 0, 10);
-        assertEquals("openAIREFunding.searchExternalDataObjects.size", 10, results.size());
+        assertNotNull("openaireFundingDataProvider is not null", openaireFundingDataProvider);
+        List<ExternalDataObject> results = openaireFundingDataProvider.searchExternalDataObjects("mock", 0, 10);
+        assertEquals("openaireFunding.searchExternalDataObjects.size", 10, results.size());
     }
 
     @Test
     public void testQueryResultsWKeywords() {
         String value = "Mushroom Robo-Pic - Development of an autonomous robotic mushroom picking system";
 
-        assertNotNull("openAIREFundingDataProvider is not null", openAIREFundingDataProvider);
-        List<ExternalDataObject> results = openAIREFundingDataProvider.searchExternalDataObjects("mock+test", 0, 10);
-        assertEquals("openAIREFunding.searchExternalDataObjects.size", 10, results.size());
-        assertTrue("openAIREFunding.searchExternalDataObjects.first.value", value.equals(results.get(0).getValue()));
+        assertNotNull("openaireFundingDataProvider is not null", openaireFundingDataProvider);
+        List<ExternalDataObject> results = openaireFundingDataProvider.searchExternalDataObjects("mock+test", 0, 10);
+        assertEquals("openaireFunding.searchExternalDataObjects.size", 10, results.size());
+        assertTrue("openaireFunding.searchExternalDataObjects.first.value", value.equals(results.get(0).getValue()));
     }
 
     @Test
@@ -84,22 +84,22 @@ public class OpenAIREFundingDataProviderTest extends AbstractDSpaceTest {
         String value = "Portuguese Wild Mushrooms: Chemical characterization and functional study"
                 + " of antiproliferative and proapoptotic properties in cancer cell lines";
 
-        assertNotNull("openAIREFundingDataProvider is not null", openAIREFundingDataProvider);
+        assertNotNull("openaireFundingDataProvider is not null", openaireFundingDataProvider);
 
-        Optional<ExternalDataObject> result = openAIREFundingDataProvider.getExternalDataObject(id);
+        Optional<ExternalDataObject> result = openaireFundingDataProvider.getExternalDataObject(id);
 
-        assertTrue("openAIREFunding.getExternalDataObject.exists", result.isPresent());
-        assertTrue("openAIREFunding.getExternalDataObject.value", value.equals(result.get().getValue()));
+        assertTrue("openaireFunding.getExternalDataObject.exists", result.isPresent());
+        assertTrue("openaireFunding.getExternalDataObject.value", value.equals(result.get().getValue()));
     }
 
     @Test
     public void testGetDataObjectWInvalidId() {
         String id = "WRONGID";
 
-        assertNotNull("openAIREFundingDataProvider is not null", openAIREFundingDataProvider);
+        assertNotNull("openaireFundingDataProvider is not null", openaireFundingDataProvider);
 
-        Optional<ExternalDataObject> result = openAIREFundingDataProvider.getExternalDataObject(id);
+        Optional<ExternalDataObject> result = openaireFundingDataProvider.getExternalDataObject(id);
 
-        assertTrue("openAIREFunding.getExternalDataObject.notExists:WRONGID", result.isEmpty());
+        assertTrue("openaireFunding.getExternalDataObject.notExists:WRONGID", result.isEmpty());
     }
 }
diff --git a/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java b/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java
index dae14115b8..671fe94679 100644
--- a/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java
+++ b/dspace-api/src/test/java/org/dspace/external/provider/impl/OrcidPublicationDataProviderIT.java
@@ -27,9 +27,9 @@ import java.net.URL;
 import java.util.List;
 import java.util.Optional;
 import java.util.function.Predicate;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Unmarshaller;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.Unmarshaller;
 import org.apache.commons.codec.binary.StringUtils;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.CollectionBuilder;
diff --git a/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java b/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
index 09387acd3e..734713b92c 100644
--- a/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
+++ b/dspace-api/src/test/java/org/dspace/identifier/DOIIdentifierProviderTest.java
@@ -566,7 +566,7 @@ public class DOIIdentifierProviderTest
 
     /**
      * Test minting a DOI with a filter that always returns true and therefore allows the DOI to be minted
-     * (this should have hte same results as base testMint_DOI, but here we use an explicit filter rather than null)
+     * (this should have the same results as base testMint_DOI, but here we use an explicit filter rather than null)
      */
     @Test
     public void testMint_DOI_withMatchingFilter()
@@ -617,7 +617,7 @@ public class DOIIdentifierProviderTest
         DOI doiRow = doiService.findByDoi(context, doi.substring(DOI.SCHEME.length()));
         assumeNotNull(doiRow);
 
-        assertTrue("Reservation of DOI did not set the corret DOI status.",
+        assertTrue("Reservation of DOI did not set the correct DOI status.",
                    DOIIdentifierProvider.TO_BE_RESERVED.equals(doiRow.getStatus()));
     }
 
@@ -633,7 +633,7 @@ public class DOIIdentifierProviderTest
         DOI doiRow = doiService.findByDoi(context, doi.substring(DOI.SCHEME.length()));
         assumeNotNull(doiRow);
 
-        assertTrue("Registration of DOI did not set the corret DOI status.",
+        assertTrue("Registration of DOI did not set the correct DOI status.",
                    DOIIdentifierProvider.TO_BE_REGISTERED.equals(doiRow.getStatus()));
     }
 
@@ -649,7 +649,7 @@ public class DOIIdentifierProviderTest
         DOI doiRow = doiService.findByDoi(context, doi.substring(DOI.SCHEME.length()));
         assumeNotNull(doiRow);
 
-        assertTrue("Registration of DOI did not set the corret DOI status.",
+        assertTrue("Registration of DOI did not set the correct DOI status.",
                    DOIIdentifierProvider.TO_BE_REGISTERED.equals(doiRow.getStatus()));
     }
 
@@ -672,7 +672,7 @@ public class DOIIdentifierProviderTest
         DOI doiRow = doiService.findByDoi(context, doi.substring(DOI.SCHEME.length()));
         assertNotNull("Created DOI was not stored in database.", doiRow);
 
-        assertTrue("Registration of DOI did not set the corret DOI status.",
+        assertTrue("Registration of DOI did not set the correct DOI status.",
                    DOIIdentifierProvider.TO_BE_REGISTERED.equals(doiRow.getStatus()));
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/identifier/VersionedHandleIdentifierProviderIT.java b/dspace-api/src/test/java/org/dspace/identifier/VersionedHandleIdentifierProviderIT.java
index 7e549f6cae..57acf1f1c4 100644
--- a/dspace-api/src/test/java/org/dspace/identifier/VersionedHandleIdentifierProviderIT.java
+++ b/dspace-api/src/test/java/org/dspace/identifier/VersionedHandleIdentifierProviderIT.java
@@ -24,6 +24,7 @@ import org.dspace.content.Collection;
 import org.dspace.content.Item;
 import org.dspace.kernel.ServiceManager;
 import org.dspace.services.factory.DSpaceServicesFactory;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -57,13 +58,30 @@ public class VersionedHandleIdentifierProviderIT extends AbstractIntegrationTest
                 .build();
     }
 
+    @After
+    @Override
+    public void destroy() throws Exception {
+        super.destroy();
+        // After this test has finished running, refresh application context and
+        // set the expected 'default' versioned handle provider back to ensure other tests don't fail
+        DSpaceServicesFactory.getInstance().getServiceManager().getApplicationContext().refresh();
+    }
+
     private void registerProvider(Class type) {
         // Register our new provider
-        serviceManager.registerServiceClass(type.getName(), type);
         IdentifierProvider identifierProvider =
-                (IdentifierProvider) serviceManager.getServiceByName(type.getName(), type);
+                (IdentifierProvider) DSpaceServicesFactory.getInstance().getServiceManager()
+                        .getServiceByName(type.getName(), type);
+        if (identifierProvider == null) {
+            DSpaceServicesFactory.getInstance().getServiceManager().registerServiceClass(type.getName(), type);
+            identifierProvider = (IdentifierProvider) DSpaceServicesFactory.getInstance().getServiceManager()
+                    .getServiceByName(type.getName(), type);
+        }
 
         // Overwrite the identifier-service's providers with the new one to ensure only this provider is used
+        identifierService = DSpaceServicesFactory.getInstance().getServiceManager()
+                .getServicesByType(IdentifierServiceImpl.class).get(0);
+        identifierService.setProviders(new ArrayList<>());
         identifierService.setProviders(List.of(identifierProvider));
     }
 
diff --git a/dspace-api/src/test/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessorTest.java b/dspace-api/src/test/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessorTest.java
new file mode 100644
index 0000000000..323856cd0a
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/importer/external/crossref/CrossRefDateMetadataProcessorTest.java
@@ -0,0 +1,38 @@
+/**
+ * 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.importer.external.crossref;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collection;
+
+import org.junit.Test;
+
+/**
+ *
+ * @author mwood
+ */
+public class CrossRefDateMetadataProcessorTest {
+    /**
+     * Test of processMetadata method, of class CrossRefDateMetadataProcessor.
+     */
+    @Test
+    public void testProcessMetadata() {
+        CrossRefDateMetadataProcessor unit = new CrossRefDateMetadataProcessor();
+        unit.setPathToArray("/dates");
+        Collection metadata = unit.processMetadata("{\"dates\": ["
+                + "[1957, 1, 27],"
+                + "[1957, 1],"
+                + "[1957]"
+                + "]}");
+        String[] metadataValues = (String[]) metadata.toArray(new String[3]);
+        assertEquals("[yyyy, MM, dd] should parse", "1957-01-27", metadataValues[0]);
+        assertEquals("[yyyy, MM] should parse", "1957-01", metadataValues[1]);
+        assertEquals("[yyyy] should parse", "1957", metadataValues[2]);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/matcher/NotifyServiceEntityMatcher.java b/dspace-api/src/test/java/org/dspace/matcher/NotifyServiceEntityMatcher.java
new file mode 100644
index 0000000000..7b20a1c8be
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/matcher/NotifyServiceEntityMatcher.java
@@ -0,0 +1,57 @@
+/**
+ * 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.matcher;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Implementation of {@link Matcher} to match a NotifyServiceEntity by all its
+ * attributes.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ *
+ */
+public class NotifyServiceEntityMatcher extends TypeSafeMatcher<NotifyServiceEntity> {
+
+    private final NotifyServiceEntity expectedEntity;
+
+    private NotifyServiceEntityMatcher(NotifyServiceEntity expectedEntity) {
+        this.expectedEntity = expectedEntity;
+    }
+
+    public static NotifyServiceEntityMatcher matchesNotifyServiceEntity(NotifyServiceEntity expectedEntity) {
+        return new NotifyServiceEntityMatcher(expectedEntity);
+    }
+
+    @Override
+    protected boolean matchesSafely(NotifyServiceEntity actualEntity) {
+        return actualEntity.getName().equals(expectedEntity.getName()) &&
+            actualEntity.getDescription().equals(expectedEntity.getDescription()) &&
+            actualEntity.getUrl().equals(expectedEntity.getUrl()) &&
+            actualEntity.getLdnUrl().equals(expectedEntity.getLdnUrl()) &&
+            actualEntity.getInboundPatterns() == expectedEntity.getInboundPatterns() &&
+            actualEntity.isEnabled() == expectedEntity.isEnabled() &&
+            actualEntity.getScore() == expectedEntity.getScore();
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("a Notify Service Entity with the following attributes:")
+                   .appendText(", name ").appendValue(expectedEntity.getName())
+                   .appendText(", description ").appendValue(expectedEntity.getDescription())
+                   .appendText(", URL ").appendValue(expectedEntity.getUrl())
+                   .appendText(", LDN URL ").appendValue(expectedEntity.getLdnUrl())
+                   .appendText(", inbound patterns ").appendValue(expectedEntity.getInboundPatterns())
+                   .appendText(", enabled ").appendValue(expectedEntity.isEnabled())
+                   .appendText(", score ").appendValue(expectedEntity.getScore());
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/matcher/QAEventMatcher.java b/dspace-api/src/test/java/org/dspace/matcher/QAEventMatcher.java
new file mode 100644
index 0000000000..61affd0ec8
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/matcher/QAEventMatcher.java
@@ -0,0 +1,117 @@
+/**
+ * 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.matcher;
+
+import static org.dspace.content.QAEvent.OPENAIRE_SOURCE;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Implementation of {@link org.hamcrest.Matcher} to match a QAEvent by all its
+ * attributes.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class QAEventMatcher extends TypeSafeMatcher<QAEvent> {
+
+    private Matcher<String> eventIdMatcher;
+
+    private Matcher<String> originalIdMatcher;
+
+    private Matcher<String> relatedMatcher;
+
+    private Matcher<String> sourceMatcher;
+
+    private Matcher<String> statusMatcher;
+
+    private Matcher<String> targetMatcher;
+
+    private Matcher<String> titleMatcher;
+
+    private Matcher<String> messageMatcher;
+
+    private Matcher<String> topicMatcher;
+
+    private Matcher<Double> trustMatcher;
+
+    private QAEventMatcher(Matcher<String> eventIdMatcher, Matcher<String> originalIdMatcher,
+        Matcher<String> relatedMatcher, Matcher<String> sourceMatcher, Matcher<String> statusMatcher,
+        Matcher<String> targetMatcher, Matcher<String> titleMatcher, Matcher<String> messageMatcher,
+        Matcher<String> topicMatcher, Matcher<Double> trustMatcher) {
+        this.eventIdMatcher = eventIdMatcher;
+        this.originalIdMatcher = originalIdMatcher;
+        this.relatedMatcher = relatedMatcher;
+        this.sourceMatcher = sourceMatcher;
+        this.statusMatcher = statusMatcher;
+        this.targetMatcher = targetMatcher;
+        this.titleMatcher = titleMatcher;
+        this.messageMatcher = messageMatcher;
+        this.topicMatcher = topicMatcher;
+        this.trustMatcher = trustMatcher;
+    }
+
+    /**
+     * Creates an instance of {@link QAEventMatcher} that matches an OPENAIRE
+     * QAEvent with PENDING status, with an event id, without a related item and
+     * with the given attributes.
+     * 
+     * @param  originalId the original id to match
+     * @param  target     the target to match
+     * @param  title      the title to match
+     * @param  message    the message to match
+     * @param  topic      the topic to match
+     * @param  trust      the trust to match
+     * @return            the matcher instance
+     */
+    public static QAEventMatcher pendingOpenaireEventWith(String originalId, Item target,
+        String title, String message, String topic, Double trust) {
+
+        return new QAEventMatcher(notNullValue(String.class), is(originalId), nullValue(String.class),
+            is(OPENAIRE_SOURCE), is("PENDING"), is(target.getID().toString()), is(title), is(message), is(topic),
+            is(trust));
+
+    }
+
+    @Override
+    public boolean matchesSafely(QAEvent event) {
+        return eventIdMatcher.matches(event.getEventId())
+            && originalIdMatcher.matches(event.getOriginalId())
+            && relatedMatcher.matches(event.getRelated())
+            && sourceMatcher.matches(event.getSource())
+            && statusMatcher.matches(event.getStatus())
+            && targetMatcher.matches(event.getTarget())
+            && titleMatcher.matches(event.getTitle())
+            && messageMatcher.matches(event.getMessage())
+            && topicMatcher.matches(event.getTopic())
+            && trustMatcher.matches(event.getTrust());
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("a QA event with the following attributes:")
+            .appendText(" event id ").appendDescriptionOf(eventIdMatcher)
+            .appendText(", original id ").appendDescriptionOf(originalIdMatcher)
+            .appendText(", related ").appendDescriptionOf(relatedMatcher)
+            .appendText(", source ").appendDescriptionOf(sourceMatcher)
+            .appendText(", status ").appendDescriptionOf(statusMatcher)
+            .appendText(", target ").appendDescriptionOf(targetMatcher)
+            .appendText(", title ").appendDescriptionOf(titleMatcher)
+            .appendText(", message ").appendDescriptionOf(messageMatcher)
+            .appendText(", topic ").appendDescriptionOf(topicMatcher)
+            .appendText(" and trust ").appendDescriptionOf(trustMatcher);
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/matcher/QASourceMatcher.java b/dspace-api/src/test/java/org/dspace/matcher/QASourceMatcher.java
new file mode 100644
index 0000000000..fe3b7130b5
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/matcher/QASourceMatcher.java
@@ -0,0 +1,58 @@
+/**
+ * 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.matcher;
+
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.qaevent.QASource;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Implementation of {@link org.hamcrest.Matcher} to match a QASource by all its
+ * attributes.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class QASourceMatcher extends TypeSafeMatcher<QASource> {
+
+    private Matcher<String> nameMatcher;
+
+    private Matcher<Long> totalEventsMatcher;
+
+    private QASourceMatcher(Matcher<String> nameMatcher, Matcher<Long> totalEventsMatcher) {
+        this.nameMatcher = nameMatcher;
+        this.totalEventsMatcher = totalEventsMatcher;
+    }
+
+    /**
+     * Creates an instance of {@link QASourceMatcher} that matches a QATopic with
+     * the given name and total events count.
+     * @param  name        the name to match
+     * @param  totalEvents the total events count to match
+     * @return             the matcher instance
+     */
+    public static QASourceMatcher with(String name, long totalEvents) {
+        return new QASourceMatcher(is(name), is(totalEvents));
+    }
+
+    @Override
+    public boolean matchesSafely(QASource event) {
+        return nameMatcher.matches(event.getName()) && totalEventsMatcher.matches(event.getTotalEvents());
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("a QA source with the following attributes:")
+            .appendText(" name ").appendDescriptionOf(nameMatcher)
+            .appendText(" and total events ").appendDescriptionOf(totalEventsMatcher);
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/matcher/QATopicMatcher.java b/dspace-api/src/test/java/org/dspace/matcher/QATopicMatcher.java
new file mode 100644
index 0000000000..dd93972814
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/matcher/QATopicMatcher.java
@@ -0,0 +1,58 @@
+/**
+ * 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.matcher;
+
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.qaevent.QATopic;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.hamcrest.TypeSafeMatcher;
+
+/**
+ * Implementation of {@link org.hamcrest.Matcher} to match a QATopic by all its
+ * attributes.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class QATopicMatcher extends TypeSafeMatcher<QATopic> {
+
+    private Matcher<String> keyMatcher;
+
+    private Matcher<Long> totalEventsMatcher;
+
+    private QATopicMatcher(Matcher<String> keyMatcher, Matcher<Long> totalEventsMatcher) {
+        this.keyMatcher = keyMatcher;
+        this.totalEventsMatcher = totalEventsMatcher;
+    }
+
+    /**
+     * Creates an instance of {@link QATopicMatcher} that matches a QATopic with the
+     * given key and total events count.
+     * @param  key         the key to match
+     * @param  totalEvents the total events count to match
+     * @return             the matcher instance
+     */
+    public static QATopicMatcher with(String key, long totalEvents) {
+        return new QATopicMatcher(is(key), is(totalEvents));
+    }
+
+    @Override
+    public boolean matchesSafely(QATopic event) {
+        return keyMatcher.matches(event.getKey()) && totalEventsMatcher.matches(event.getTotalEvents());
+    }
+
+    @Override
+    public void describeTo(Description description) {
+        description.appendText("a QA topic with the following attributes:")
+            .appendText(" key ").appendDescriptionOf(keyMatcher)
+            .appendText(" and total events ").appendDescriptionOf(totalEventsMatcher);
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
index 17bc6ee531..912efcfcf3 100644
--- a/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/orcid/service/OrcidEntityFactoryServiceIT.java
@@ -274,13 +274,13 @@ public class OrcidEntityFactoryServiceIT extends AbstractIntegrationTestWithData
 
     private Predicate<Contributor> contributor(String name, ContributorRole role, SequenceType sequence) {
         return contributor -> contributor.getCreditName().getContent().equals(name)
-            && role.equals(contributor.getContributorAttributes().getContributorRole())
+            && role.value().equals(contributor.getContributorAttributes().getContributorRole())
             && contributor.getContributorAttributes().getContributorSequence() == sequence;
     }
 
     private Predicate<FundingContributor> fundingContributor(String name, FundingContributorRole role) {
         return contributor -> contributor.getCreditName().getContent().equals(name)
-            && role.equals(contributor.getContributorAttributes().getContributorRole());
+            && role.value().equals(contributor.getContributorAttributes().getContributorRole());
     }
 
     private Predicate<? super FuzzyDate> date(String year, String month, String days) {
diff --git a/dspace-api/src/test/java/org/dspace/qaevent/MockQAEventService.java b/dspace-api/src/test/java/org/dspace/qaevent/MockQAEventService.java
new file mode 100644
index 0000000000..3d460015f7
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/qaevent/MockQAEventService.java
@@ -0,0 +1,46 @@
+/**
+ * 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.qaevent;
+
+import java.io.IOException;
+
+import org.apache.solr.client.solrj.SolrServerException;
+import org.dspace.qaevent.service.impl.QAEventServiceImpl;
+import org.dspace.solr.MockSolrServer;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.stereotype.Service;
+
+/**
+ * Mock SOLR service for the qaevents Core.
+ */
+@Service
+public class MockQAEventService extends QAEventServiceImpl implements InitializingBean, DisposableBean {
+    private MockSolrServer mockSolrServer;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        mockSolrServer = new MockSolrServer("qaevent");
+        solr = mockSolrServer.getSolrServer();
+    }
+
+    /** Clear all records from the search core. */
+    public void reset() {
+        mockSolrServer.reset();
+        try {
+            mockSolrServer.getSolrServer().commit();
+        } catch (SolrServerException | IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    public void destroy() throws Exception {
+        mockSolrServer.destroy();
+    }
+}
\ No newline at end of file
diff --git a/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java b/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java
new file mode 100644
index 0000000000..b63c85eeb6
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/qaevent/script/OpenaireEventsImportIT.java
@@ -0,0 +1,545 @@
+/**
+ * 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.qaevent.script;
+
+import static java.util.List.of;
+import static org.dspace.content.QAEvent.COAR_NOTIFY_SOURCE;
+import static org.dspace.content.QAEvent.OPENAIRE_SOURCE;
+import static org.dspace.matcher.QAEventMatcher.pendingOpenaireEventWith;
+import static org.dspace.qaevent.service.impl.QAEventServiceImpl.QAEVENTS_SOURCES;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.util.List;
+
+import eu.dnetlib.broker.BrokerClient;
+import org.apache.commons.io.IOUtils;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.app.launcher.ScriptLauncher;
+import org.dspace.app.scripts.handler.impl.TestDSpaceRunnableHandler;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.matcher.QASourceMatcher;
+import org.dspace.matcher.QATopicMatcher;
+import org.dspace.qaevent.QANotifyPatterns;
+import org.dspace.qaevent.QATopic;
+import org.dspace.qaevent.service.OpenaireClientFactory;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.impl.OpenaireClientFactoryImpl;
+import org.dspace.services.ConfigurationService;
+import org.dspace.utils.DSpace;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Integration tests for {@link OpenaireEventsImport}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OpenaireEventsImportIT extends AbstractIntegrationTestWithDatabase {
+
+    private static final String ORDER_FIELD = "topic";
+    private static final String BASE_JSON_DIR_PATH = "org/dspace/app/openaire-events/";
+
+    private QAEventService qaEventService = new DSpace().getSingletonService(QAEventService.class);
+
+    private Collection collection;
+
+    private BrokerClient brokerClient = OpenaireClientFactory.getInstance().getBrokerClient();
+
+    private BrokerClient mockBrokerClient = mock(BrokerClient.class);
+
+    private ConfigurationService configurationService = new DSpace().getConfigurationService();
+
+    @Before
+    public void setup() {
+
+        context.turnOffAuthorisationSystem();
+        // we want all the test in this class to be run using the administrator user as OpenAIRE events are only visible
+        // to administrators.
+        // Please note that test related to forbidden and unauthorized access to qaevent are included in
+        // the QAEventRestRepositoryIT here we are only testing that the import script is creating the expected events
+        context.setCurrentUser(admin);
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        collection = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection")
+            .build();
+
+        context.restoreAuthSystemState();
+        configurationService.setProperty(QAEVENTS_SOURCES, new String[] { QAEvent.OPENAIRE_SOURCE });
+        ((OpenaireClientFactoryImpl) OpenaireClientFactory.getInstance()).setBrokerClient(mockBrokerClient);
+    }
+
+    @After
+    public void after() {
+        ((OpenaireClientFactoryImpl) OpenaireClientFactory.getInstance()).setBrokerClient(brokerClient);
+    }
+
+    @Test
+    public void testWithoutParameters() throws Exception {
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+        assertThat(handler.getInfoMessages(), empty());
+
+        Exception exception = handler.getException();
+        assertThat(exception, instanceOf(IllegalArgumentException.class));
+        assertThat(exception.getMessage(), is("One parameter between the location of the file and the email "
+            + "must be entered to proceed with the import."));
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testWithBothFileAndEmailParameters() throws Exception {
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-f", getFileLocation("events.json"),
+            "-e", "test@user.com" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+        assertThat(handler.getInfoMessages(), empty());
+
+        Exception exception = handler.getException();
+        assertThat(exception, instanceOf(IllegalArgumentException.class));
+        assertThat(exception.getMessage(), is("Only one parameter between the location of the file and the email "
+            + "must be entered to proceed with the import."));
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testManyEventsImportFromFile() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item firstItem = createItem("Test item", "123456789/99998");
+        Item secondItem = createItem("Test item 2", "123456789/99999");
+
+        context.restoreAuthSystemState();
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-f", getFileLocation("events.json") };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(), empty());
+        assertThat(handler.getInfoMessages(), contains(
+            "Trying to read the QA events from the provided file",
+            "Found 5 events in the given file"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20),
+            hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 5L))
+        );
+
+        List<QATopic> topicList = qaEventService.findAllTopicsBySource(context, OPENAIRE_SOURCE, 0, 20,
+            ORDER_FIELD, false);
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PID, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1L)));
+
+        String projectMessage = "{\"projects[0].acronym\":\"PAThs\",\"projects[0].code\":\"687567\","
+            + "\"projects[0].funder\":\"EC\",\"projects[0].fundingProgram\":\"H2020\","
+            + "\"projects[0].jurisdiction\":\"EU\","
+            + "\"projects[0].openaireId\":\"40|corda__h2020::6e32f5eb912688f2424c68b851483ea4\","
+            + "\"projects[0].title\":\"Tracking Papyrus and Parchment Paths\"}";
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+            QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 0, 20, ORDER_FIELD, true),
+                contains(
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/99998", firstItem,
+                "Egypt, crossroad of translations and literary interweavings", projectMessage,
+                QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 1.00d)));
+
+        String abstractMessage = "{\"abstracts[0]\":\"Missing Abstract\"}";
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+            QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 0, 20, ORDER_FIELD, true),
+                contains(
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/99999",
+                secondItem, "Test Publication",
+                abstractMessage, QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1.00d)));
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testManyEventsImportFromFileWithUnknownHandle() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item item = createItem("Test item", "123456789/99999");
+
+        context.restoreAuthSystemState();
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-f", getFileLocation("events.json") };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(),
+                contains("An error occurs storing the event with id 406fb9c5656c7f11cac8995abb746887: "
+                        + "Skipped event 406fb9c5656c7f11cac8995abb746887 related to the oai record "
+                        + "oai:www.openstarts.units.it:123456789/99998 as the record was not found",
+                        "An error occurs storing the event with id eafd747feee49cca7603d30ba4e768dc: "
+                        + "Skipped event eafd747feee49cca7603d30ba4e768dc related to the oai record "
+                        + "oai:www.openstarts.units.it:123456789/99998 as the record was not found"));
+        assertThat(handler.getInfoMessages(), contains(
+            "Trying to read the QA events from the provided file",
+            "Found 5 events in the given file"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20), hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 3L)));
+
+        List<QATopic> topicList = qaEventService.findAllTopicsBySource(context, OPENAIRE_SOURCE, 0, 20,
+            ORDER_FIELD, false);
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PID, 1L)));
+
+        String abstractMessage = "{\"abstracts[0]\":\"Missing Abstract\"}";
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+                QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 0, 20,
+                ORDER_FIELD, false), contains(
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/99999", item, "Test Publication",
+                abstractMessage, QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1.00d)));
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testManyEventsImportFromFileWithUnknownTopic() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        createItem("Test item", "123456789/99999");
+        Item secondItem = createItem("Test item 2", "123456789/999991");
+
+        context.restoreAuthSystemState();
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-f", getFileLocation("unknown-topic-events.json") };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(),
+            contains("An error occurs storing the event with id 8307aa56769deba961faed7162d91aab:"
+                   + " Skipped event 8307aa56769deba961faed7162d91aab related to the oai record"
+                   + " oai:www.openstarts.units.it:123456789/99998 as the record was not found"));
+        assertThat(handler.getInfoMessages(), contains(
+            "Trying to read the QA events from the provided file",
+            "Found 2 events in the given file"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20), hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 1L)));
+
+        assertThat(qaEventService.findAllTopicsBySource(context, OPENAIRE_SOURCE, 0, 20, ORDER_FIELD, false),
+                contains(QATopicMatcher.with(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1L)));
+
+        String abstractMessage = "{\"abstracts[0]\":\"Missing Abstract\"}";
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+            QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 0, 20, ORDER_FIELD, false), contains(
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/999991", secondItem, "Test Publication 2",
+                abstractMessage, org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1.00d)));
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testImportFromFileWithoutEvents() throws Exception {
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-f", getFileLocation("empty-file.json") };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(),
+            contains(containsString("A not recoverable error occurs during OPENAIRE events import")));
+        assertThat(handler.getWarningMessages(),empty());
+        assertThat(handler.getInfoMessages(), contains("Trying to read the QA events from the provided file"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20), hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 0L)));
+
+        assertThat(qaEventService.findAllTopics(context, 0, 20, ORDER_FIELD, false), empty());
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testImportFromOpenaireBroker() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        Item firstItem = createItem("Test item", "123456789/99998");
+        Item secondItem = createItem("Test item 2", "123456789/99999");
+        Item thirdItem = createItem("Test item 3", "123456789/999991");
+
+        context.restoreAuthSystemState();
+
+        URL openaireURL = new URL("http://api.openaire.eu/broker");
+
+        when(mockBrokerClient.listSubscriptions(openaireURL, "user@test.com")).thenReturn(of("sub1", "sub2", "sub3"));
+
+        doAnswer(i -> writeToOutputStream(i.getArgument(2, OutputStream.class), "events.json"))
+            .when(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub1"), any());
+
+        doAnswer(i -> writeToOutputStream(i.getArgument(2, OutputStream.class), "empty-events-list.json"))
+            .when(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub2"), any());
+
+        doAnswer(i -> writeToOutputStream(i.getArgument(2, OutputStream.class), "unknown-topic-events.json"))
+            .when(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub3"), any());
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-e", "user@test.com" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), empty());
+        assertThat(handler.getWarningMessages(),
+            contains("Event for topic ENRICH/MORE/UNKNOWN is not allowed in the qaevents.cfg"));
+        assertThat(handler.getInfoMessages(), contains(
+            "Trying to read the QA events from the OPENAIRE broker",
+            "Found 3 subscriptions related to the given email",
+            "Found 5 events from the subscription sub1",
+            "Found 0 events from the subscription sub2",
+            "Found 2 events from the subscription sub3"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20), hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 6L)));
+
+        List<QATopic> topicList = qaEventService.findAllTopicsBySource(context, OPENAIRE_SOURCE,0,20,ORDER_FIELD,false);
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PID, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 2L)));
+
+        String projectMessage = "{\"projects[0].acronym\":\"PAThs\",\"projects[0].code\":\"687567\","
+            + "\"projects[0].funder\":\"EC\",\"projects[0].fundingProgram\":\"H2020\","
+            + "\"projects[0].jurisdiction\":\"EU\","
+            + "\"projects[0].openaireId\":\"40|corda__h2020::6e32f5eb912688f2424c68b851483ea4\","
+            + "\"projects[0].title\":\"Tracking Papyrus and Parchment Paths\"}";
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+                QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 0 , 20,
+                ORDER_FIELD, false), contains(
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/99998", firstItem,
+                "Egypt, crossroad of translations and literary interweavings", projectMessage,
+                QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 1.00d)));
+
+        String abstractMessage = "{\"abstracts[0]\":\"Missing Abstract\"}";
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+                QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 0, 20,
+                ORDER_FIELD, false), containsInAnyOrder(
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/99999", secondItem, "Test Publication",
+                abstractMessage, QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1.00d),
+            pendingOpenaireEventWith("oai:www.openstarts.units.it:123456789/999991", thirdItem, "Test Publication 2",
+                abstractMessage, QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1.00d)));
+
+        verify(mockBrokerClient).listSubscriptions(openaireURL, "user@test.com");
+        verify(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub1"), any());
+        verify(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub2"), any());
+        verify(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub3"), any());
+
+        verifyNoMoreInteractions(mockBrokerClient);
+    }
+
+    @Test
+    public void testImportFromOpenaireBrokerWithErrorDuringListSubscription() throws Exception {
+
+        URL openaireURL = new URL("http://api.openaire.eu/broker");
+
+        when(mockBrokerClient.listSubscriptions(openaireURL, "user@test.com"))
+            .thenThrow(new RuntimeException("Connection refused"));
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-e", "user@test.com" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(),
+            contains("A not recoverable error occurs during OPENAIRE events import: Connection refused"));
+        assertThat(handler.getWarningMessages(), empty());
+        assertThat(handler.getInfoMessages(), contains("Trying to read the QA events from the OPENAIRE broker"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20), hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 0L)));
+
+        assertThat(qaEventService.findAllTopics(context, 0, 20, ORDER_FIELD, false), empty());
+
+        verify(mockBrokerClient).listSubscriptions(openaireURL, "user@test.com");
+
+        verifyNoMoreInteractions(mockBrokerClient);
+
+    }
+
+    @Test
+    public void testImportFromOpenaireBrokerWithErrorDuringEventsDownload() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        createItem("Test item", "123456789/99998");
+        createItem("Test item 2", "123456789/99999");
+        createItem("Test item 3", "123456789/999991");
+
+        context.restoreAuthSystemState();
+
+        URL openaireURL = new URL("http://api.openaire.eu/broker");
+
+        when(mockBrokerClient.listSubscriptions(openaireURL, "user@test.com")).thenReturn(of("sub1", "sub2", "sub3"));
+
+        doAnswer(i -> writeToOutputStream(i.getArgument(2, OutputStream.class), "events.json"))
+            .when(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub1"), any());
+
+        doThrow(new RuntimeException("Invalid subscription id"))
+            .when(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub2"), any());
+
+        doAnswer(i -> writeToOutputStream(i.getArgument(2, OutputStream.class), "unknown-topic-events.json"))
+            .when(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub3"), any());
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-e", "user@test.com" };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(handler.getErrorMessages(), contains("An error occurs downloading the events "
+            + "related to the subscription sub2: Invalid subscription id"));
+        assertThat(handler.getWarningMessages(),
+            contains("Event for topic ENRICH/MORE/UNKNOWN is not allowed in the qaevents.cfg"));
+        assertThat(handler.getInfoMessages(), contains(
+            "Trying to read the QA events from the OPENAIRE broker",
+            "Found 3 subscriptions related to the given email",
+            "Found 5 events from the subscription sub1",
+            "Found 0 events from the subscription sub2",
+            "Found 2 events from the subscription sub3"));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20), hasItem(QASourceMatcher.with(OPENAIRE_SOURCE, 6L)));
+
+        List<QATopic> topicList = qaEventService.findAllTopicsBySource(context, OPENAIRE_SOURCE, 0, 20,
+            ORDER_FIELD, false);
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_PID, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT, 1L)));
+        assertThat(topicList, hasItem(QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 2L)));
+
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+                   QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT, 0, 20, ORDER_FIELD, false), hasSize(1));
+        assertThat(qaEventService.findEventsByTopic(context, OPENAIRE_SOURCE,
+                   QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 0, 20, ORDER_FIELD, false), hasSize(2));
+
+        verify(mockBrokerClient).listSubscriptions(openaireURL, "user@test.com");
+        verify(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub1"), any());
+        verify(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub2"), any());
+        verify(mockBrokerClient).downloadEvents(eq(openaireURL), eq("sub3"), any());
+
+        verifyNoMoreInteractions(mockBrokerClient);
+    }
+
+    /**
+     * Improper test for ENRICH/MORE/REVIEW qa. It has the COAR_NOTIFY source
+     * which must be tested via LDNMessage at DNInboxControllerIT
+    */
+    @Test
+    @Ignore
+    public void testImportFromFileEventMoreReview() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        Item firstItem = createItem("Test item", "123456789/99998");
+        Item secondItem = createItem("Test item 2", "123456789/99999");
+
+        context.restoreAuthSystemState();
+
+        TestDSpaceRunnableHandler handler = new TestDSpaceRunnableHandler();
+
+        String[] args = new String[] { "import-openaire-events", "-f", getFileLocation("event-more-review.json") };
+        ScriptLauncher.handleScript(args, ScriptLauncher.getConfig(kernelImpl), handler, kernelImpl);
+
+        assertThat(qaEventService.findAllTopicsBySource(context, COAR_NOTIFY_SOURCE, 0, 20,
+            ORDER_FIELD, false), contains(
+            QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW, 1L)));
+
+        assertThat(qaEventService.findAllSources(context, 0, 20),
+            hasItem(QASourceMatcher.with(COAR_NOTIFY_SOURCE, 1L)));
+
+        verifyNoInteractions(mockBrokerClient);
+    }
+
+    private Item createItem(String title, String handle) {
+        return ItemBuilder.createItem(context, collection)
+            .withTitle(title)
+            .withHandle(handle)
+            .build();
+    }
+
+    private Void writeToOutputStream(OutputStream outputStream, String fileName) {
+        try {
+            byte[] fileContent = getFileContent(fileName);
+            IOUtils.write(fileContent, outputStream);
+            return null;
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private byte[] getFileContent(String fileName) throws Exception {
+        String fileLocation = getFileLocation(fileName);
+        try (FileInputStream fis = new FileInputStream(new File(fileLocation))) {
+            return IOUtils.toByteArray(fis);
+        }
+    }
+
+    private String getFileLocation(String fileName) throws Exception {
+        URL resource = getClass().getClassLoader().getResource(BASE_JSON_DIR_PATH + fileName);
+        if (resource == null) {
+            throw new IllegalStateException("No resource found named " + BASE_JSON_DIR_PATH + fileName);
+        }
+        return new File(resource.getFile()).getAbsolutePath();
+    }
+}
+
diff --git a/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java b/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
index aed0c088c3..094275743b 100644
--- a/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
+++ b/dspace-api/src/test/java/org/dspace/solr/MockSolrServer.java
@@ -47,10 +47,12 @@ public class MockSolrServer {
     private static final Logger log = LogManager.getLogger();
 
     /** Shared embedded Solr connections, by name. */
-    private static final ConcurrentMap<String, SolrClient> loadedCores = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, SolrClient> loadedCores
+            = new ConcurrentHashMap<>();
 
     /** Reference counts for each core. */
-    private static final ConcurrentMap<String, AtomicLong> usersPerCore = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, AtomicLong> usersPerCore
+            = new ConcurrentHashMap<>();
 
     /** Container for embedded Solr cores. */
     private static CoreContainer container = null;
@@ -81,7 +83,7 @@ public class MockSolrServer {
     /**
      * Ensure that this instance's core is loaded.  Create it if necessary.
      */
-    protected void initSolrServer() {
+    private void initSolrServer() {
         solrServer = loadedCores.get(coreName);
         if (solrServer == null) {
             solrServer = initSolrServerForCore(coreName);
@@ -103,7 +105,13 @@ public class MockSolrServer {
         if (server == null) {
             initSolrContainer();
 
-            server = new EmbeddedSolrServer(container, coreName);
+            server = new EmbeddedSolrServer(container, coreName) {
+                // This ugliness should be fixed in Solr 8.9.
+                // https://issues.apache.org/jira/browse/SOLR-15085
+                @Override public void close() { // Copied from Solr's own tests
+                    // Do not close shared core container!
+                }
+            };
 
             //Start with an empty index
             try {
@@ -123,6 +131,11 @@ public class MockSolrServer {
      * Remove all records.
      */
     public void reset() {
+        if (null == solrServer) {
+            log.warn("reset called with no server connection");
+            return;
+        }
+
         try {
             solrServer.deleteByQuery("*:*");
         } catch (SolrServerException | IOException ex) {
@@ -160,7 +173,8 @@ public class MockSolrServer {
     private static synchronized void initSolrContainer() {
         if (container == null) {
             Path solrDir = Paths.get(AbstractDSpaceIntegrationTest.getDspaceDir(), "solr");
-            log.info("Initializing SOLR CoreContainer with directory {}", solrDir.toAbsolutePath().toString());
+            log.info("Initializing SOLR CoreContainer with directory {}",
+                    solrDir.toAbsolutePath().toString());
             container = new CoreContainer(solrDir, new Properties());
             container.load();
             log.info("SOLR CoreContainer initialized");
diff --git a/dspace-api/src/test/java/org/dspace/statistics/EmbeddedSolrClientFactory.java b/dspace-api/src/test/java/org/dspace/statistics/EmbeddedSolrClientFactory.java
new file mode 100644
index 0000000000..073734e875
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/statistics/EmbeddedSolrClientFactory.java
@@ -0,0 +1,85 @@
+/**
+ * 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.statistics;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Path;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.solr.client.solrj.SolrClient;
+import org.dspace.solr.MockSolrServer;
+
+/**
+ * Factory of EmbeddedSolrClient instances.
+ * Wrapper for {@link org.dspace.solr.MockSolrServer}.  Possibly useful for
+ * testing.
+ *
+ * <p>
+ * To use this:
+ * <ol>
+ *   <li>{@code SolrClientFactory scf = new EmbeddedSolrClientFactory();}</li>
+ *   <li>{@code SolrClient mycore = scf.getClient("mycore");}</li>
+ *   <li>{@code mycore.this(); mycore.that();}</li>
+ *   <li>{@code mycore.destroy();}</li>
+ * </ol>
+ *
+ * @author mwood
+ */
+public class EmbeddedSolrClientFactory
+        implements SolrClientFactory {
+    private static final Logger log = LogManager.getLogger();
+
+    /** Name of this connection's core. */
+    private String coreName;
+
+    /** This instance's connection. */
+    private SolrClient solrClient = null;
+
+    private MockSolrServer mockSolrServer;
+
+    @Override
+    public SolrClient getClient(String coreUrl) {
+        try {
+            coreName = Path.of(new URL(coreUrl).getPath())
+                    .getFileName()
+                    .toString();
+        } catch (MalformedURLException ex) {
+            log.warn("Unable to extract core name from URI '{}':  {}",
+                    coreUrl, ex.getMessage());
+        }
+
+        try {
+            mockSolrServer = new MockSolrServer(coreName);
+            solrClient = mockSolrServer.getSolrServer();
+        } catch (Exception ex) {
+            log.warn("Failed to instantiate a MockSolrServer", ex);
+            solrClient = null;
+        }
+        return solrClient;
+    }
+
+    /**
+     * Remove all records.
+     */
+    public void reset() {
+        mockSolrServer.reset();
+    }
+
+    /**
+     * Decrease the reference count for connection to the current core.
+     * If now zero, shut down the connection and discard it.  If no connections
+     * remain, destroy the container.
+     *
+     * @throws Exception passed through.
+     */
+    public void destroy() throws Exception {
+        mockSolrServer.destroy();
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/statistics/SolrLoggerServiceImplIT.java b/dspace-api/src/test/java/org/dspace/statistics/SolrLoggerServiceImplIT.java
new file mode 100644
index 0000000000..82f8680aea
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/statistics/SolrLoggerServiceImplIT.java
@@ -0,0 +1,308 @@
+/**
+ * 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.statistics;
+
+import static org.dspace.statistics.SolrLoggerServiceImpl.DATE_FORMAT_8601;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Date;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrInputDocument;
+import org.dspace.AbstractIntegrationTestWithDatabase;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.content.Community;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.core.Constants;
+import org.dspace.core.factory.CoreServiceFactory;
+import org.dspace.services.ConfigurationService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * Test some methods of SolrLoggerServiceImpl.
+ *
+ * @author mwood
+ */
+public class SolrLoggerServiceImplIT
+        extends AbstractIntegrationTestWithDatabase {
+    private static final ConfigurationService cfg
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
+
+    // Bot IP list should contain no RFC 1918 private addresses.
+    private static final String NOT_BOT_IP = "192.168.1.1";
+    private static final String BOT_IP = "192.168.2.1";
+
+    private static final String NOT_BOT_DNS = "angel.com";
+    private static final String BOT_DNS = "demon.com";
+
+    private static final String NOT_BOT_AGENT = "Firefox";
+    private static final String BOT_AGENT = "Punchbot";
+
+    private static final String F_AGENT = "userAgent";
+    private static final String F_DNS = "dns";
+    private static final String F_EPERSON = "epersonid";
+    private static final String F_ID = "id";
+    private static final String F_IP = "ip";
+    private static final String F_IS_BOT = "isBot";
+    private static final String F_STATISTICS_TYPE = "statistics_type";
+    private static final String F_TIME = "time";
+    private static final String F_TYPE = "type";
+
+    private static final String Q_ALL = "*:*";
+
+    private static final String COMMUNITY_NAME = "Top";
+
+    private static Path testAddressesPath;
+    private static Path testAgentsPath;
+
+    @BeforeClass
+    public static void setUpClass()
+            throws IOException {
+        Path spidersPath = Paths.get(cfg.getProperty("dspace.dir"), "config", "spiders");
+        Writer writer;
+
+        // Ensure the presence of a known "bot" address.
+        testAddressesPath = Files.createTempFile(spidersPath, "test-ips-", ".txt");
+        writer = Files.newBufferedWriter(testAddressesPath, StandardCharsets.UTF_8,
+                StandardOpenOption.WRITE);
+        writer.append(BOT_IP)
+                .append('\n')
+                .close();
+
+        // Ensure the presence of a known "bot" agent.
+        testAgentsPath = Files.createTempFile(spidersPath.resolve("agents"), "test-agents-", ".txt");
+        writer = Files.newBufferedWriter(testAgentsPath, StandardCharsets.UTF_8,
+                StandardOpenOption.WRITE);
+        writer.append('^')
+                .append(BOT_AGENT)
+                .append('\n')
+                .close();
+    }
+
+    @AfterClass
+    public static void tearDownClass()
+            throws IOException {
+        Files.deleteIfExists(testAddressesPath);
+        Files.deleteIfExists(testAgentsPath);
+    }
+
+    @Before
+    public void setUpTest() {
+    }
+
+    @After
+    public void tearDownTest() {
+    }
+
+    /**
+     * Test of markRobots method, of class SolrLoggerServiceImpl.
+     *
+     * @throws SolrServerException passed through.
+     * @throws IOException passed through.
+     */
+    @Test
+    public void testMarkRobots()
+            throws SolrServerException, IOException, Exception {
+        System.out.println("markRobots");
+
+        EmbeddedSolrClientFactory clientFactory = new EmbeddedSolrClientFactory();
+        ContentServiceFactory csf = ContentServiceFactory.getInstance();
+        DSpace dspace = new DSpace();
+
+        SolrLoggerServiceImpl instance = new SolrLoggerServiceImpl();
+        instance.bitstreamService = csf.getBitstreamService();
+        instance.contentServiceFactory = csf;
+        instance.configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+        instance.clientInfoService = CoreServiceFactory.getInstance().getClientInfoService();
+        instance.geoIpService = dspace.getSingletonService(GeoIpService.class);
+        instance.solrStatisticsCore = dspace.getSingletonService(SolrStatisticsCore.class);
+        instance.afterPropertiesSet();
+
+        // Create objects to view.
+        context.turnOffAuthorisationSystem();
+        Community topCommunity = CommunityBuilder.createCommunity(context)
+                .withName(COMMUNITY_NAME)
+                .build();
+        context.restoreAuthSystemState();
+
+        // Set up some documents.
+        SolrClient client = clientFactory.getClient(cfg.getProperty("solr-statistics.server"));
+        SolrInputDocument doc = new SolrInputDocument();
+        doc.setField(F_STATISTICS_TYPE, SolrLoggerServiceImpl.StatisticsType.VIEW);
+        doc.setField(F_TYPE, String.valueOf(Constants.COMMUNITY));
+        doc.setField(F_ID, topCommunity.getID().toString());
+        doc.setField(F_EPERSON, eperson.getID().toString());
+
+        doc.setField(F_IP, NOT_BOT_IP);
+        doc.setField(F_DNS, NOT_BOT_DNS);
+        doc.setField(F_AGENT, NOT_BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        client.add(doc);
+
+        doc.setField(F_IP, BOT_IP);
+        doc.setField(F_DNS, BOT_DNS);
+        doc.setField(F_AGENT, NOT_BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        client.add(doc);
+
+        doc.setField(F_IP, NOT_BOT_IP);
+        doc.setField(F_DNS, NOT_BOT_DNS);
+        doc.setField(F_AGENT, BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        client.add(doc);
+
+        doc.setField(F_IP, BOT_IP);
+        doc.setField(F_DNS, BOT_DNS);
+        doc.setField(F_AGENT, BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        client.add(doc);
+
+        client.commit(true, true);
+
+        // Scan the core for robot entries and mark them.
+        cfg.setProperty("solr-statistics.query.filter.isBot", "false");
+        instance.markRobots();
+
+        // Check that documents are marked correctly.
+        SolrQuery readbackQuery = new SolrQuery()
+                .setRows(10)
+                .setQuery(Q_ALL);
+        QueryResponse response = client.query(readbackQuery);
+        long nDocs = 0;
+        long nGood = 0;
+        for (SolrDocument document : response.getResults()) {
+            String ip = (String) document.getFieldValue(F_IP);
+            String agent = (String) document.getFieldValue(F_AGENT);
+            Object isBotRaw = document.getFieldValue(F_IS_BOT);
+            boolean isBot = (null == isBotRaw) ? false : (Boolean) isBotRaw;
+
+            if (NOT_BOT_IP.equals(ip) && NOT_BOT_AGENT.equals(agent)) {
+                assertFalse(String.format("IP %s plus Agent %s is marked as bot --", ip, agent),
+                        isBot);
+            } else {
+                assertTrue(String.format("IP %s or Agent %s is not marked as bot --", ip, agent),
+                        isBot);
+            }
+
+            nDocs++;
+            if (!isBot) {
+                nGood++;
+            }
+        }
+        assertEquals("Wrong number of documents", 4, nDocs);
+        assertEquals("Wrong number of non-bot views", 1, nGood);
+    }
+
+    /**
+     * Test of deleteRobots method, of class SolrLoggerServiceImpl.
+     * @throws SolrServerException passed through.
+     * @throws IOException passed through.
+     */
+    @Test
+    public void testDeleteRobots()
+            throws SolrServerException, IOException, Exception {
+        System.out.println("deleteRobots");
+
+        EmbeddedSolrClientFactory clientFactory = new EmbeddedSolrClientFactory();
+        ContentServiceFactory csf = ContentServiceFactory.getInstance();
+        DSpace dspace = new DSpace();
+
+        SolrLoggerServiceImpl instance = new SolrLoggerServiceImpl();
+        instance.bitstreamService = csf.getBitstreamService();
+        instance.contentServiceFactory = csf;
+        instance.configurationService = cfg;
+        instance.clientInfoService = CoreServiceFactory.getInstance().getClientInfoService();
+        instance.geoIpService = dspace.getSingletonService(GeoIpService.class);
+        instance.solrStatisticsCore = dspace.getSingletonService(SolrStatisticsCore.class);
+        instance.afterPropertiesSet();
+
+        // Create objects to view.
+        context.turnOffAuthorisationSystem();
+        Community topCommunity = CommunityBuilder.createCommunity(context)
+                .withName(COMMUNITY_NAME)
+                .build();
+        context.restoreAuthSystemState();
+
+        // Set up some documents.
+        SolrClient client = clientFactory.getClient(cfg.getProperty("solr-statistics.server"));
+        SolrInputDocument doc = new SolrInputDocument();
+        doc.setField(F_STATISTICS_TYPE, SolrLoggerServiceImpl.StatisticsType.VIEW);
+        doc.setField(F_TYPE, String.valueOf(Constants.COMMUNITY));
+        doc.setField(F_ID, topCommunity.getID().toString());
+        doc.setField(F_EPERSON, eperson.getID().toString());
+
+        doc.setField(F_IP, NOT_BOT_IP);
+        doc.setField(F_DNS, NOT_BOT_DNS);
+        doc.setField(F_AGENT, NOT_BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        doc.setField(F_IS_BOT, Boolean.FALSE.toString());
+        client.add(doc);
+
+        doc.setField(F_IP, BOT_IP);
+        doc.setField(F_DNS, BOT_DNS);
+        doc.setField(F_AGENT, NOT_BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        doc.setField(F_IS_BOT, Boolean.TRUE.toString());
+        client.add(doc);
+
+        doc.setField(F_IP, NOT_BOT_IP);
+        doc.setField(F_DNS, NOT_BOT_DNS);
+        doc.setField(F_AGENT, BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        doc.setField(F_IS_BOT, Boolean.TRUE.toString());
+        client.add(doc);
+
+        doc.setField(F_IP, BOT_IP);
+        doc.setField(F_DNS, BOT_DNS);
+        doc.setField(F_AGENT, BOT_AGENT);
+        doc.setField(F_TIME, DateFormatUtils.format(new Date(), DATE_FORMAT_8601));
+        doc.setField(F_IS_BOT, Boolean.TRUE.toString());
+        client.add(doc);
+
+        client.commit(true, true);
+
+        // Scan the core for marked robot entries and delete them.
+        instance.deleteRobots();
+
+        // Check that the correct documents (and only those) are gone.
+        QueryResponse response = instance.query(Q_ALL, null, null,
+                Integer.MAX_VALUE, -1,
+                null, null, null, null, null, true, 0);
+        long nDocs = 0;
+        for (SolrDocument document : response.getResults()) {
+            nDocs++;
+
+            Object isBotRaw = document.getFieldValue(F_IS_BOT);
+            boolean isBot = (null == isBotRaw) ? false : (Boolean) isBotRaw;
+
+            assertEquals("Marked document was not removed --",
+                    false, isBot);
+        }
+        assertEquals("Wrong number of documents remaining --", 1, nDocs);
+    }
+}
diff --git a/dspace-api/src/test/java/org/dspace/statistics/export/ITIrusExportUsageEventListener.java b/dspace-api/src/test/java/org/dspace/statistics/export/ITIrusExportUsageEventListener.java
index e28e8284a2..0c861a0d29 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/export/ITIrusExportUsageEventListener.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/export/ITIrusExportUsageEventListener.java
@@ -21,8 +21,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-api/src/test/java/org/dspace/statistics/export/ITRetryFailedOpenUrlTracker.java b/dspace-api/src/test/java/org/dspace/statistics/export/ITRetryFailedOpenUrlTracker.java
index 7a9d031a0a..054b612d63 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/export/ITRetryFailedOpenUrlTracker.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/export/ITRetryFailedOpenUrlTracker.java
@@ -100,7 +100,7 @@ public class ITRetryFailedOpenUrlTracker extends AbstractIntegrationTest {
     }
 
     /**
-     * Test to check that all logged failed urls are reprocessed succesfully and removed from the db
+     * Test to check that all logged failed urls are reprocessed successfully and removed from the db
      *
      * @throws Exception
      */
diff --git a/dspace-api/src/test/java/org/dspace/statistics/export/processor/BitstreamEventProcessorIT.java b/dspace-api/src/test/java/org/dspace/statistics/export/processor/BitstreamEventProcessorIT.java
index a690b1a1c6..605264e4ba 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/export/processor/BitstreamEventProcessorIT.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/export/processor/BitstreamEventProcessorIT.java
@@ -10,13 +10,14 @@ package org.dspace.statistics.export.processor;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.CharEncoding;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.BitstreamBuilder;
@@ -63,6 +64,7 @@ public class BitstreamEventProcessorIT extends AbstractIntegrationTestWithDataba
      */
     public void testAddObectSpecificData() throws Exception {
         HttpServletRequest request = mock(HttpServletRequest.class);
+        when(request.getRemoteAddr()).thenReturn("127.0.0.1");
 
         context.turnOffAuthorisationSystem();
         Community community = CommunityBuilder.createCommunity(context).build();
diff --git a/dspace-api/src/test/java/org/dspace/statistics/export/processor/ExportEventProcessorIT.java b/dspace-api/src/test/java/org/dspace/statistics/export/processor/ExportEventProcessorIT.java
index e42003e4fc..fb53d0c83c 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/export/processor/ExportEventProcessorIT.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/export/processor/ExportEventProcessorIT.java
@@ -18,8 +18,8 @@ import static org.mockito.Mockito.when;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.CharEncoding;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.CollectionBuilder;
diff --git a/dspace-api/src/test/java/org/dspace/statistics/util/DummyHttpServletRequest.java b/dspace-api/src/test/java/org/dspace/statistics/util/DummyHttpServletRequest.java
index 61325c652c..0059ce4f3f 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/util/DummyHttpServletRequest.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/util/DummyHttpServletRequest.java
@@ -19,21 +19,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import javax.servlet.AsyncContext;
-import javax.servlet.DispatcherType;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpUpgradeHandler;
-import javax.servlet.http.Part;
 
+import jakarta.servlet.AsyncContext;
+import jakarta.servlet.DispatcherType;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpUpgradeHandler;
+import jakarta.servlet.http.Part;
 import org.apache.commons.collections.CollectionUtils;
 import org.dspace.core.Utils;
 
@@ -64,7 +65,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#changeSessionId
+     * @see jakarta.servlet.http.HttpServletRequest#changeSessionId
      */
     @Override
     public String changeSessionId() {
@@ -73,7 +74,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getAuthType()
+     * @see jakarta.servlet.http.HttpServletRequest#getAuthType()
      */
     @Override
     public String getAuthType() {
@@ -82,7 +83,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getContextPath()
+     * @see jakarta.servlet.http.HttpServletRequest#getContextPath()
      */
     @Override
     public String getContextPath() {
@@ -91,7 +92,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getCookies()
+     * @see jakarta.servlet.http.HttpServletRequest#getCookies()
      */
     @Override
     public Cookie[] getCookies() {
@@ -100,7 +101,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getDateHeader(java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#getDateHeader(java.lang.String)
      */
     @Override
     public long getDateHeader(String arg0) {
@@ -118,7 +119,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
         values.add(headerValue);
     }
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getDispatcherType()
+     * @see jakarta.servlet.http.HttpServletRequest#getDispatcherType()
      */
     @Override
     public DispatcherType getDispatcherType() {
@@ -127,7 +128,31 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#getRequestId()
+     */
+    @Override
+    public String getRequestId() {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see jakarta.servlet.http.HttpServletRequest#getProtocolRequestId()
+     */
+    @Override
+    public String getProtocolRequestId() {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see jakarta.servlet.http.HttpServletRequest#getServletConnection()
+     */
+    @Override
+    public ServletConnection getServletConnection() {
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see jakarta.servlet.http.HttpServletRequest#getHeader(java.lang.String)
      */
     @Override
     public String getHeader(String key) {
@@ -139,7 +164,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getHeaderNames()
+     * @see jakarta.servlet.http.HttpServletRequest#getHeaderNames()
      */
     @Override
     public Enumeration getHeaderNames() {
@@ -147,7 +172,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#getHeaders(java.lang.String)
      */
     @Override
     public Enumeration getHeaders(String arg0) {
@@ -155,7 +180,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getIntHeader(java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#getIntHeader(java.lang.String)
      */
     @Override
     public int getIntHeader(String arg0) {
@@ -163,7 +188,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getMethod()
+     * @see jakarta.servlet.http.HttpServletRequest#getMethod()
      */
     @Override
     public String getMethod() {
@@ -172,7 +197,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getPathInfo()
+     * @see jakarta.servlet.http.HttpServletRequest#getPathInfo()
      */
     @Override
     public String getPathInfo() {
@@ -181,7 +206,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getPathTranslated()
+     * @see jakarta.servlet.http.HttpServletRequest#getPathTranslated()
      */
     @Override
     public String getPathTranslated() {
@@ -190,7 +215,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getQueryString()
+     * @see jakarta.servlet.http.HttpServletRequest#getQueryString()
      */
     @Override
     public String getQueryString() {
@@ -199,7 +224,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getRemoteUser()
+     * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser()
      */
     @Override
     public String getRemoteUser() {
@@ -208,7 +233,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getRequestURI()
+     * @see jakarta.servlet.http.HttpServletRequest#getRequestURI()
      */
     @Override
     public String getRequestURI() {
@@ -217,7 +242,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getRequestURL()
+     * @see jakarta.servlet.http.HttpServletRequest#getRequestURL()
      */
     @Override
     public StringBuffer getRequestURL() {
@@ -226,7 +251,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId()
+     * @see jakarta.servlet.http.HttpServletRequest#getRequestedSessionId()
      */
     @Override
     public String getRequestedSessionId() {
@@ -235,7 +260,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getServletPath()
+     * @see jakarta.servlet.http.HttpServletRequest#getServletPath()
      */
     @Override
     public String getServletPath() {
@@ -244,7 +269,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getSession()
+     * @see jakarta.servlet.http.HttpServletRequest#getSession()
      */
     @Override
     public HttpSession getSession() {
@@ -253,7 +278,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getSession(boolean)
+     * @see jakarta.servlet.http.HttpServletRequest#getSession(boolean)
      */
     @Override
     public HttpSession getSession(boolean arg0) {
@@ -262,7 +287,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getUserPrincipal()
+     * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal()
      */
     @Override
     public Principal getUserPrincipal() {
@@ -271,7 +296,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie()
+     * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie()
      */
     @Override
     public boolean isRequestedSessionIdFromCookie() {
@@ -280,7 +305,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL()
+     * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL()
      */
     @Override
     public boolean isRequestedSessionIdFromURL() {
@@ -289,17 +314,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl()
-     */
-    @Override
-    @Deprecated
-    public boolean isRequestedSessionIdFromUrl() {
-        // TODO Auto-generated method stub
-        return false;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#authenticate(javax.servlet.http.HttpServletResponse)
+     * @see jakarta.servlet.http.HttpServletRequest#authenticate(jakarta.servlet.http.HttpServletResponse)
      */
     @Override
     public boolean authenticate(HttpServletResponse httpServletResponse) {
@@ -307,7 +322,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#login(java.lang.String,java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#login(java.lang.String,java.lang.String)
      */
     @Override
     public void login(String s, String s1) {
@@ -315,7 +330,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#logout()
+     * @see jakarta.servlet.http.HttpServletRequest#logout()
      */
     @Override
     public void logout() {
@@ -323,7 +338,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getPart(java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#getPart(java.lang.String)
      */
     @Override
     public Part getPart(String arg0) {
@@ -332,7 +347,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#getParts()
+     * @see jakarta.servlet.http.HttpServletRequest#getParts()
      */
     @Override
     public Collection<Part> getParts() {
@@ -340,7 +355,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#upgrade(java.lang.Class<T>)
+     * @see jakarta.servlet.http.HttpServletRequest#upgrade(java.lang.Class<T>)
      */
     @Override
     public <T extends HttpUpgradeHandler> T upgrade(Class<T> aClass) throws IOException, ServletException {
@@ -348,7 +363,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
+     * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdValid()
      */
     @Override
     public boolean isRequestedSessionIdValid() {
@@ -357,7 +372,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.http.HttpServletRequest#isUserInRole(java.lang.String)
+     * @see jakarta.servlet.http.HttpServletRequest#isUserInRole(java.lang.String)
      */
     @Override
     public boolean isUserInRole(String arg0) {
@@ -366,7 +381,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getAttribute(java.lang.String)
+     * @see jakarta.servlet.ServletRequest#getAttribute(java.lang.String)
      */
     @Override
     public Object getAttribute(String arg0) {
@@ -375,7 +390,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getAttributeNames()
+     * @see jakarta.servlet.ServletRequest#getAttributeNames()
      */
     @Override
     public Enumeration getAttributeNames() {
@@ -384,7 +399,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getCharacterEncoding()
+     * @see jakarta.servlet.ServletRequest#getCharacterEncoding()
      */
     @Override
     public String getCharacterEncoding() {
@@ -393,7 +408,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getContentLength()
+     * @see jakarta.servlet.ServletRequest#getContentLength()
      */
     @Override
     public int getContentLength() {
@@ -402,7 +417,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getContentLengthLong()
+     * @see jakarta.servlet.ServletRequest#getContentLengthLong()
      */
     @Override
     public long getContentLengthLong() {
@@ -410,7 +425,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getContentType()
+     * @see jakarta.servlet.ServletRequest#getContentType()
      */
     @Override
     public String getContentType() {
@@ -419,7 +434,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getInputStream()
+     * @see jakarta.servlet.ServletRequest#getInputStream()
      */
     @Override
     public ServletInputStream getInputStream() throws IOException {
@@ -428,7 +443,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getLocale()
+     * @see jakarta.servlet.ServletRequest#getLocale()
      */
     @Override
     public Locale getLocale() {
@@ -437,7 +452,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getLocales()
+     * @see jakarta.servlet.ServletRequest#getLocales()
      */
     @Override
     public Enumeration getLocales() {
@@ -446,7 +461,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getParameter(java.lang.String)
+     * @see jakarta.servlet.ServletRequest#getParameter(java.lang.String)
      */
     @Override
     public String getParameter(String arg0) {
@@ -455,7 +470,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getParameterMap()
+     * @see jakarta.servlet.ServletRequest#getParameterMap()
      */
     @Override
     public Map getParameterMap() {
@@ -464,7 +479,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getParameterNames()
+     * @see jakarta.servlet.ServletRequest#getParameterNames()
      */
     @Override
     public Enumeration getParameterNames() {
@@ -473,7 +488,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getParameterValues(java.lang.String)
+     * @see jakarta.servlet.ServletRequest#getParameterValues(java.lang.String)
      */
     @Override
     public String[] getParameterValues(String arg0) {
@@ -482,7 +497,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getProtocol()
+     * @see jakarta.servlet.ServletRequest#getProtocol()
      */
     @Override
     public String getProtocol() {
@@ -491,7 +506,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getReader()
+     * @see jakarta.servlet.ServletRequest#getReader()
      */
     @Override
     public BufferedReader getReader() throws IOException {
@@ -500,17 +515,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getRealPath(java.lang.String)
-     */
-    @Override
-    @Deprecated
-    public String getRealPath(String arg0) {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getRemoteAddr()
+     * @see jakarta.servlet.ServletRequest#getRemoteAddr()
      */
     @Override
     public String getRemoteAddr() {
@@ -518,7 +523,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getRemoteHost()
+     * @see jakarta.servlet.ServletRequest#getRemoteHost()
      */
     @Override
     public String getRemoteHost() {
@@ -526,7 +531,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getRequestDispatcher(java.lang.String)
+     * @see jakarta.servlet.ServletRequest#getRequestDispatcher(java.lang.String)
      */
     @Override
     public RequestDispatcher getRequestDispatcher(String arg0) {
@@ -535,7 +540,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getScheme()
+     * @see jakarta.servlet.ServletRequest#getScheme()
      */
     @Override
     public String getScheme() {
@@ -544,7 +549,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getServerName()
+     * @see jakarta.servlet.ServletRequest#getServerName()
      */
     @Override
     public String getServerName() {
@@ -553,7 +558,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getServerPort()
+     * @see jakarta.servlet.ServletRequest#getServerPort()
      */
     @Override
     public int getServerPort() {
@@ -562,7 +567,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#isSecure()
+     * @see jakarta.servlet.ServletRequest#isSecure()
      */
     @Override
     public boolean isSecure() {
@@ -571,7 +576,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String)
+     * @see jakarta.servlet.ServletRequest#removeAttribute(java.lang.String)
      */
     @Override
     public void removeAttribute(String arg0) {
@@ -579,7 +584,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#setAttribute(java.lang.String, java.lang.Object)
+     * @see jakarta.servlet.ServletRequest#setAttribute(java.lang.String, java.lang.Object)
      */
     @Override
     public void setAttribute(String arg0, Object arg1) {
@@ -587,7 +592,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String)
+     * @see jakarta.servlet.ServletRequest#setCharacterEncoding(java.lang.String)
      */
     @Override
     public void setCharacterEncoding(String arg0)
@@ -596,7 +601,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#startAsync
+     * @see jakarta.servlet.ServletRequest#startAsync
      */
     @Override
     public AsyncContext startAsync() throws IllegalStateException {
@@ -604,7 +609,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#startAsync(javax.servlet.ServletRequest,javax.servlet.ServletResponse)
+     * @see jakarta.servlet.ServletRequest#startAsync(jakarta.servlet.ServletRequest,jakarta.servlet.ServletResponse)
      */
     @Override
     public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse servletResponse)
@@ -613,7 +618,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#isAsyncStarted
+     * @see jakarta.servlet.ServletRequest#isAsyncStarted
      */
     @Override
     public boolean isAsyncStarted() {
@@ -621,7 +626,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#isAsyncSupported
+     * @see jakarta.servlet.ServletRequest#isAsyncSupported
      */
     @Override
     public boolean isAsyncSupported() {
@@ -629,7 +634,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getAsyncContext
+     * @see jakarta.servlet.ServletRequest#getAsyncContext
      */
     @Override
     public AsyncContext getAsyncContext() {
@@ -657,7 +662,7 @@ public class DummyHttpServletRequest implements HttpServletRequest {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.ServletRequest#getServletContext
+     * @see jakarta.servlet.ServletRequest#getServletContext
      */
     @Override
     public ServletContext getServletContext() {
diff --git a/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorServiceImplTest.java b/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorServiceImplTest.java
index 24f8c0f124..0b311a3115 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorServiceImplTest.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorServiceImplTest.java
@@ -94,7 +94,7 @@ public class SpiderDetectorServiceImplTest extends AbstractDSpaceTest {
 
     /**
      * Test method for
-     * {@link org.dspace.statistics.util.SpiderDetectorService#isSpider(javax.servlet.http.HttpServletRequest)}.
+     * {@link org.dspace.statistics.util.SpiderDetectorService#isSpider(jakarta.servlet.http.HttpServletRequest)}.
      */
     @Test
     public void testIsSpiderHttpServletRequest() {
diff --git a/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorTest.java b/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorTest.java
index 63046b32b6..ba638e4ed7 100644
--- a/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorTest.java
+++ b/dspace-api/src/test/java/org/dspace/statistics/util/SpiderDetectorTest.java
@@ -49,7 +49,7 @@ public class SpiderDetectorTest extends AbstractDSpaceTest {
 
     /**
      * Test method for
-     * {@link org.dspace.statistics.util.SpiderDetector#isSpider(javax.servlet.http.HttpServletRequest)}.
+     * {@link org.dspace.statistics.util.SpiderDetector#isSpider(jakarta.servlet.http.HttpServletRequest)}.
      */
     @Test
     public void testIsSpiderHttpServletRequest() {
diff --git a/dspace-api/src/test/java/org/dspace/supervision/SupervisionOrderServiceIT.java b/dspace-api/src/test/java/org/dspace/supervision/SupervisionOrderServiceIT.java
index 6040782348..aa4cd8bd4e 100644
--- a/dspace-api/src/test/java/org/dspace/supervision/SupervisionOrderServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/supervision/SupervisionOrderServiceIT.java
@@ -18,6 +18,7 @@ import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.EPersonBuilder;
 import org.dspace.builder.GroupBuilder;
+import org.dspace.builder.SupervisionOrderBuilder;
 import org.dspace.builder.WorkspaceItemBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
@@ -85,10 +86,10 @@ public class SupervisionOrderServiceIT extends AbstractIntegrationTestWithDataba
                                    .build();
 
         SupervisionOrder supervisionOrderOne =
-            supervisionOrderService.create(context, item, groupA);
+                SupervisionOrderBuilder.createSupervisionOrder(context, item, groupA).build();
 
         SupervisionOrder supervisionOrderTwo =
-            supervisionOrderService.create(context, item, groupB);
+                SupervisionOrderBuilder.createSupervisionOrder(context, item, groupB).build();
 
         context.restoreAuthSystemState();
 
@@ -136,7 +137,8 @@ public class SupervisionOrderServiceIT extends AbstractIntegrationTestWithDataba
                                    .build();
 
         SupervisionOrder supervisionOrderOne =
-            supervisionOrderService.create(context, workspaceItem.getItem(), groupA);
+                SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItem.getItem(), groupA)
+                        .build();
 
         context.restoreAuthSystemState();
 
@@ -205,9 +207,12 @@ public class SupervisionOrderServiceIT extends AbstractIntegrationTestWithDataba
                                    .addMember(userB)
                                    .build();
 
-        supervisionOrderService.create(context, workspaceItem.getItem(), groupA);
-        supervisionOrderService.create(context, workspaceItem.getItem(), groupB);
-        supervisionOrderService.create(context, workspaceItemTwo.getItem(), groupA);
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItem.getItem(), groupA)
+                .build();
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItem.getItem(), groupB)
+                .build();
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItemTwo.getItem(), groupA)
+                .build();
 
         context.restoreAuthSystemState();
 
@@ -259,9 +264,12 @@ public class SupervisionOrderServiceIT extends AbstractIntegrationTestWithDataba
                                    .addMember(eperson)
                                    .build();
 
-        supervisionOrderService.create(context, workspaceItem.getItem(), groupA);
-        supervisionOrderService.create(context, workspaceItem.getItem(), groupB);
-        supervisionOrderService.create(context, workspaceItemTwo.getItem(), groupA);
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItem.getItem(), groupA)
+                .build();
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItem.getItem(), groupB)
+                .build();
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItemTwo.getItem(), groupA)
+                .build();
 
         context.restoreAuthSystemState();
 
@@ -310,7 +318,8 @@ public class SupervisionOrderServiceIT extends AbstractIntegrationTestWithDataba
                                    .addMember(eperson)
                                    .build();
 
-        supervisionOrderService.create(context, item, groupA);
+        SupervisionOrderBuilder.createSupervisionOrder(context, item, groupA)
+                .build();
 
         context.restoreAuthSystemState();
 
@@ -370,7 +379,8 @@ public class SupervisionOrderServiceIT extends AbstractIntegrationTestWithDataba
                     .addMember(userB)
                     .build();
 
-        supervisionOrderService.create(context, workspaceItem.getItem(), groupA);
+        SupervisionOrderBuilder.createSupervisionOrder(context, workspaceItem.getItem(), groupA)
+                .build();
 
         context.restoreAuthSystemState();
 
diff --git a/dspace-api/src/test/java/org/dspace/util/DSpaceH2Dialect.java b/dspace-api/src/test/java/org/dspace/util/DSpaceH2Dialect.java
new file mode 100644
index 0000000000..cd37a6fb31
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/util/DSpaceH2Dialect.java
@@ -0,0 +1,50 @@
+/**
+ * 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.util;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.hibernate.boot.model.FunctionContributions;
+import org.hibernate.dialect.H2Dialect;
+import org.hibernate.type.BasicTypeRegistry;
+import org.hibernate.type.StandardBasicTypes;
+
+/**
+ * H2-specific dialect that adds regular expression support as a function.
+ * @author Jean-François Morin (Université Laval)
+ */
+public class DSpaceH2Dialect extends H2Dialect {
+
+    private static Map<String, Pattern> regexCache = new HashMap<>();
+
+    @Override
+    public void initializeFunctionRegistry(FunctionContributions functionContributions) {
+        super.initializeFunctionRegistry(functionContributions);
+
+        BasicTypeRegistry basicTypeRegistry = functionContributions.getTypeConfiguration().getBasicTypeRegistry();
+
+        functionContributions.getFunctionRegistry().registerPattern(
+            "matches",
+            "matches(?1, ?2)",
+            basicTypeRegistry.resolve(StandardBasicTypes.BOOLEAN));
+
+        // The SQL function is registered in AbstractIntegrationTestWithDatabase.initDatabase().
+    }
+
+    public static boolean matches(String regex, String value) {
+        Pattern pattern = regexCache.get(regex);
+        if (pattern == null) {
+            pattern = Pattern.compile(regex);
+            regexCache.put(regex, pattern);
+        }
+        return pattern.matcher(value).matches();
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/util/DSpaceKernelInitializer.java b/dspace-api/src/test/java/org/dspace/util/DSpaceKernelInitializer.java
index a6f381bafb..8f9169875a 100644
--- a/dspace-api/src/test/java/org/dspace/util/DSpaceKernelInitializer.java
+++ b/dspace-api/src/test/java/org/dspace/util/DSpaceKernelInitializer.java
@@ -83,6 +83,7 @@ public class DSpaceKernelInitializer
      * Initially look for JNDI Resource called "java:/comp/env/dspace.dir".
      * If not found, use value provided in "dspace.dir" in Spring Environment
      */
+    @SuppressWarnings("BanJNDI")
     private String getDSpaceHome(ConfigurableEnvironment environment) {
         // Load the "dspace.dir" property from Spring's configuration.
         // This gives us the location of our DSpace configuration, which is
diff --git a/dspace-api/src/test/java/org/dspace/util/RawJsonDeserializerTest.java b/dspace-api/src/test/java/org/dspace/util/RawJsonDeserializerTest.java
new file mode 100644
index 0000000000..e1e6e246b9
--- /dev/null
+++ b/dspace-api/src/test/java/org/dspace/util/RawJsonDeserializerTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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.util;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import org.junit.Test;
+
+/**
+ * Unit tests for {@link RawJsonDeserializer}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class RawJsonDeserializerTest {
+
+    private String json = ""
+        + "{"
+        + "    \"attribute\": {"
+        + "         \"firstField\":\"value\","
+        + "         \"secondField\": 1"
+        + "    }"
+        + "}";
+
+    @Test
+    public void testDeserialization() throws JsonMappingException, JsonProcessingException {
+
+        ObjectMapper mapper = new ObjectMapper();
+
+        DeserializationTestClass object = mapper.readValue(json, DeserializationTestClass.class);
+        assertThat(object, notNullValue());
+        assertThat(object.getAttribute(), is("{\"firstField\":\"value\",\"secondField\":1}"));
+
+    }
+
+    private static class DeserializationTestClass {
+
+        @JsonDeserialize(using = RawJsonDeserializer.class)
+        private String attribute;
+
+        public String getAttribute() {
+            return attribute;
+        }
+
+    }
+
+}
diff --git a/dspace-api/src/test/java/org/dspace/workflow/CurationTaskConfigTest.java b/dspace-api/src/test/java/org/dspace/workflow/CurationTaskConfigTest.java
index 92d6ff9148..61a283c89e 100644
--- a/dspace-api/src/test/java/org/dspace/workflow/CurationTaskConfigTest.java
+++ b/dspace-api/src/test/java/org/dspace/workflow/CurationTaskConfigTest.java
@@ -16,8 +16,8 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
-import javax.xml.bind.JAXBException;
 
+import jakarta.xml.bind.JAXBException;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.xml.sax.SAXException;
diff --git a/dspace-api/src/test/java/org/dspace/workflow/WorkflowCurationIT.java b/dspace-api/src/test/java/org/dspace/workflow/WorkflowCurationIT.java
index 66dd2cee80..d3866d534b 100644
--- a/dspace-api/src/test/java/org/dspace/workflow/WorkflowCurationIT.java
+++ b/dspace-api/src/test/java/org/dspace/workflow/WorkflowCurationIT.java
@@ -11,8 +11,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.util.List;
 import java.util.regex.Pattern;
-import javax.inject.Inject;
 
+import jakarta.inject.Inject;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
diff --git a/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowServiceIT.java b/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowServiceIT.java
index 865abaca21..20fd0cde26 100644
--- a/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowServiceIT.java
+++ b/dspace-api/src/test/java/org/dspace/xmlworkflow/XmlWorkflowServiceIT.java
@@ -12,8 +12,8 @@ import static org.junit.Assert.assertTrue;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.AbstractIntegrationTestWithDatabase;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.ResourcePolicy;
diff --git a/dspace-api/src/test/java/org/dspace/xmlworkflow/state/actions/processingaction/NoAction.java b/dspace-api/src/test/java/org/dspace/xmlworkflow/state/actions/processingaction/NoAction.java
index ae387c9749..f5e4521fcd 100644
--- a/dspace-api/src/test/java/org/dspace/xmlworkflow/state/actions/processingaction/NoAction.java
+++ b/dspace-api/src/test/java/org/dspace/xmlworkflow/state/actions/processingaction/NoAction.java
@@ -11,8 +11,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.workflow.WorkflowException;
diff --git a/dspace-api/src/test/resources/org/dspace/app/openaire-events/empty-events-list.json b/dspace-api/src/test/resources/org/dspace/app/openaire-events/empty-events-list.json
new file mode 100644
index 0000000000..0637a088a0
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/openaire-events/empty-events-list.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/dspace/modules/rest/src/main/webapp/.gitignore b/dspace-api/src/test/resources/org/dspace/app/openaire-events/empty-file.json
similarity index 100%
rename from dspace/modules/rest/src/main/webapp/.gitignore
rename to dspace-api/src/test/resources/org/dspace/app/openaire-events/empty-file.json
diff --git a/dspace-api/src/test/resources/org/dspace/app/openaire-events/events.json b/dspace-api/src/test/resources/org/dspace/app/openaire-events/events.json
new file mode 100644
index 0000000000..9bb8daae36
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/openaire-events/events.json
@@ -0,0 +1,62 @@
+[
+
+	{
+		"originalId": "oai:www.openstarts.units.it:123456789/99998",
+		"title": "Egypt, crossroad of translations and literary interweavings",
+		"topic": "ENRICH/MORE/PROJECT",
+		"trust": 1.0,
+		"message": {
+			"projects[0].acronym": "PAThs",
+			"projects[0].code": "687567",
+			"projects[0].funder": "EC",
+			"projects[0].fundingProgram": "H2020",
+			"projects[0].jurisdiction": "EU",
+			"projects[0].openaireId": "40|corda__h2020::6e32f5eb912688f2424c68b851483ea4",
+			"projects[0].title": "Tracking Papyrus and Parchment Paths"
+		}
+	},
+	
+	{
+		"originalId": "oai:www.openstarts.units.it:123456789/99999",
+		"title": "Test Publication",
+		"topic": "ENRICH/MISSING/ABSTRACT",
+		"trust": 1.0,
+		"message": {
+			"abstracts[0]": "Missing Abstract"
+		}
+	},
+    {
+        "originalId": "oai:www.openstarts.units.it:123456789/99998",
+        "title": "Egypt, crossroad of translations and literary interweavings",
+        "topic": "ENRICH/MISSING/PID",
+        "trust": 1.0,
+        "message": {
+            "pids[0].type": "doi",
+            "pids[0].value": "10.13137/2282-572x/987"
+        }
+    },
+    {
+        "originalId": "oai:www.openstarts.units.it:123456789/99999",
+        "title": "Test Publication",
+        "topic": "ENRICH/MORE/PID",
+        "trust": 0.375,
+        "message": {
+            "pids[0].type": "doi",
+            "pids[0].value": "987654"
+        }
+    },
+    {
+        "originalId": "oai:www.openstarts.units.it:123456789/99999",
+        "title": "Test Publication",
+        "topic": "ENRICH/MISSING/PROJECT",
+        "trust": 1.0,
+        "message": {
+            "projects[0].acronym": "02.SNES missing project acronym",
+            "projects[0].code": "prjcode_snes",
+            "projects[0].funder": "02.SNES missing project funder",
+            "projects[0].fundingProgram": "02.SNES missing project fundingProgram",
+            "projects[0].jurisdiction": "02.SNES missing project jurisdiction",
+            "projects[0].title": "Project01"
+        }
+    }
+]
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/openaire-events/unknown-topic-events.json b/dspace-api/src/test/resources/org/dspace/app/openaire-events/unknown-topic-events.json
new file mode 100644
index 0000000000..3caa72cf35
--- /dev/null
+++ b/dspace-api/src/test/resources/org/dspace/app/openaire-events/unknown-topic-events.json
@@ -0,0 +1,20 @@
+[
+
+	{
+		"originalId": "oai:www.openstarts.units.it:123456789/99998",
+		"title": "Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature",
+		"topic": "ENRICH/MORE/UNKNOWN",
+		"trust": 1.0
+	},
+	
+	{
+		"originalId": "oai:www.openstarts.units.it:123456789/999991",
+		"title": "Test Publication 2",
+		"topic": "ENRICH/MISSING/ABSTRACT",
+		"trust": 1.0,
+		"message": {
+			"abstracts[0]": "Missing Abstract"
+		}
+	}
+	
+]
\ No newline at end of file
diff --git a/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml b/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml
index 411160ef8e..9ad07607e3 100644
--- a/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml
+++ b/dspace-api/src/test/resources/org/dspace/app/orcid-works/works.xml
@@ -77,6 +77,7 @@
             </common:source>
             <work:title>
                 <common:title>Another cautionary tale.</common:title>
+                <common:title>Second title</common:title>
             </work:title>
             <work:type>journal-article</work:type>
             <common:publication-date>
diff --git a/dspace-iiif/pom.xml b/dspace-iiif/pom.xml
index 8cba905524..98683cdc9f 100644
--- a/dspace-iiif/pom.xml
+++ b/dspace-iiif/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -28,6 +28,12 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
+
         <!-- Needed to support Spring @Configuration classes (to register servlets/beans with Spring Boot webapp) -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -69,6 +75,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Later version brought in by spring-boot-starter-web above -->
+                <exclusion>
+                    <groupId>io.micrometer</groupId>
+                    <artifactId>micrometer-observation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-cache
              Caching dependencies for iiif endpoint. -->
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationGenerator.java
index 3947df3533..f6d7aa8950 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationGenerator.java
@@ -9,11 +9,11 @@ package org.dspace.app.iiif.model.generator;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 
 import de.digitalcollections.iiif.model.Motivation;
 import de.digitalcollections.iiif.model.openannotation.Annotation;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
+import jakarta.validation.constraints.NotNull;
 
 
 /**
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationListGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationListGenerator.java
index da977a5ccc..924cf48a9f 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationListGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/AnnotationListGenerator.java
@@ -9,11 +9,11 @@ package org.dspace.app.iiif.model.generator;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 
 import de.digitalcollections.iiif.model.openannotation.Annotation;
 import de.digitalcollections.iiif.model.sharedcanvas.AnnotationList;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java
index f064a1b974..701a79aa4b 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/CanvasGenerator.java
@@ -9,12 +9,12 @@ package org.dspace.app.iiif.model.generator;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 
 import de.digitalcollections.iiif.model.ImageContent;
 import de.digitalcollections.iiif.model.MetadataEntry;
 import de.digitalcollections.iiif.model.sharedcanvas.Canvas;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * This generator wraps the domain model for a single {@code Canvas}.
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ContentSearchGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ContentSearchGenerator.java
index 28cc13c07d..80af636d35 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ContentSearchGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ContentSearchGenerator.java
@@ -10,11 +10,11 @@ package org.dspace.app.iiif.model.generator;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import javax.validation.constraints.NotNull;
 
 import de.digitalcollections.iiif.model.Profile;
 import de.digitalcollections.iiif.model.Service;
 import de.digitalcollections.iiif.model.search.ContentSearchService;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ExternalLinksGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ExternalLinksGenerator.java
index 94c1828375..709983e9c5 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ExternalLinksGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ExternalLinksGenerator.java
@@ -7,11 +7,10 @@
  */
 package org.dspace.app.iiif.model.generator;
 
-import javax.validation.constraints.NotNull;
-
 import de.digitalcollections.iiif.model.OtherContent;
 import de.digitalcollections.iiif.model.PropertyValue;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * This generator wraps the other content domain model.
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java
index aef979b635..235e7413f6 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ImageContentGenerator.java
@@ -7,10 +7,9 @@
  */
 package org.dspace.app.iiif.model.generator;
 
-import javax.validation.constraints.NotNull;
-
 import de.digitalcollections.iiif.model.ImageContent;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
+import jakarta.validation.constraints.NotNull;
 
 /**
  * This service generator wraps the image content model.
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java
index 8072692640..dd196154ec 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/ManifestGenerator.java
@@ -10,7 +10,6 @@ package org.dspace.app.iiif.model.generator;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 
 import de.digitalcollections.iiif.model.ImageContent;
 import de.digitalcollections.iiif.model.MetadataEntry;
@@ -22,6 +21,7 @@ import de.digitalcollections.iiif.model.sharedcanvas.Manifest;
 import de.digitalcollections.iiif.model.sharedcanvas.Range;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
 import de.digitalcollections.iiif.model.sharedcanvas.Sequence;
+import jakarta.validation.constraints.NotNull;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.annotation.RequestScope;
 
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java
index fe8acf31c4..5b022bc916 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/model/generator/RangeGenerator.java
@@ -9,12 +9,12 @@ package org.dspace.app.iiif.model.generator;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.validation.constraints.NotNull;
 
 import de.digitalcollections.iiif.model.enums.ViewingHint;
 import de.digitalcollections.iiif.model.sharedcanvas.Canvas;
 import de.digitalcollections.iiif.model.sharedcanvas.Range;
 import de.digitalcollections.iiif.model.sharedcanvas.Resource;
+import jakarta.validation.constraints.NotNull;
 import org.dspace.app.iiif.service.RangeService;
 
 /**
diff --git a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java
index 782a5a9852..1a1005993e 100644
--- a/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java
+++ b/dspace-iiif/src/main/java/org/dspace/app/iiif/service/utils/IIIFUtils.java
@@ -175,7 +175,7 @@ public class IIIFUtils {
     }
 
     /**
-     * Retrives a bitstream based on its position in the IIIF bundle.
+     * Retrieves a bitstream based on its position in the IIIF bundle.
      *
      * @param context        DSpace Context
      * @param item           DSpace Item
@@ -361,7 +361,7 @@ public class IIIFUtils {
      * 
      * @param item        the dspace item
      * @param defaultHint the default hint to apply if nothing else is defined at
-     *                    the item leve
+     *                    the item level
      * @return the iiif viewing hint for the item
      */
     public String getIIIFViewingHint(Item item, String defaultHint) {
diff --git a/dspace-oai/pom.xml b/dspace-oai/pom.xml
index 748f6ad2de..dbfaee3f69 100644
--- a/dspace-oai/pom.xml
+++ b/dspace-oai/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <artifactId>dspace-parent</artifactId>
         <groupId>org.dspace</groupId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -118,8 +118,8 @@
 
         <!-- Web API -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/dspace-oai/src/main/java/org/dspace/app/configuration/OAIWebConfig.java b/dspace-oai/src/main/java/org/dspace/app/configuration/OAIWebConfig.java
index 806ecf9d07..dc4efde880 100644
--- a/dspace-oai/src/main/java/org/dspace/app/configuration/OAIWebConfig.java
+++ b/dspace-oai/src/main/java/org/dspace/app/configuration/OAIWebConfig.java
@@ -19,7 +19,7 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 /**
  * OAI-PMH webapp configuration. Replaces the old web.xml
@@ -36,7 +36,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter
 @Import(BasicConfiguration.class)
 // Scan for controllers in this package
 @ComponentScan("org.dspace.xoai.controller")
-public class OAIWebConfig extends WebMvcConfigurerAdapter implements JtwigViewResolverConfigurer {
+public class OAIWebConfig implements WebMvcConfigurer, JtwigViewResolverConfigurer {
 
     // Path where OAI is deployed. Defaults to "oai"
     // NOTE: deployment on this path is handled by org.dspace.xoai.controller.DSpaceOAIDataProvider
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java b/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java
index 4f842b8e94..25cc1ee365 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/app/XOAI.java
@@ -450,6 +450,16 @@ public class XOAI {
             doc.addField("item.communities", "com_" + com.getHandle().replace("/", "_"));
         }
 
+        boolean hasBitstream = false;
+
+        for (Bundle b : item.getBundles("ORIGINAL")) {
+            if (b.getBitstreams().size() > 0) {
+                hasBitstream = true;
+            }
+        }
+
+        doc.addField("item.hasbitstream", hasBitstream);
+
         List<MetadataValue> allData = itemService.getMetadata(item, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
         for (MetadataValue dc : allData) {
             MetadataField field = dc.getMetadataField();
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java b/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java
index 379f2fa181..3d826152c6 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/controller/DSpaceOAIDataProvider.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.xoai.controller;
 
+import static jakarta.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static java.util.Arrays.asList;
-import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static org.apache.logging.log4j.LogManager.getLogger;
 
 import java.io.IOException;
@@ -17,9 +17,6 @@ import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.stream.XMLStreamException;
 
 import com.lyncode.xoai.dataprovider.OAIDataProvider;
@@ -28,6 +25,9 @@ import com.lyncode.xoai.dataprovider.core.XOAIManager;
 import com.lyncode.xoai.dataprovider.exceptions.InvalidContextException;
 import com.lyncode.xoai.dataprovider.exceptions.OAIException;
 import com.lyncode.xoai.dataprovider.exceptions.WritingXmlException;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Context;
 import org.dspace.xoai.services.api.cache.XOAICacheService;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/filter/ItemsWithBitstreamFilter.java b/dspace-oai/src/main/java/org/dspace/xoai/filter/ItemsWithBitstreamFilter.java
new file mode 100644
index 0000000000..3599c5b9e1
--- /dev/null
+++ b/dspace-oai/src/main/java/org/dspace/xoai/filter/ItemsWithBitstreamFilter.java
@@ -0,0 +1,57 @@
+/**
+ * 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.xoai.filter;
+
+import java.sql.SQLException;
+
+import org.apache.log4j.LogManager;
+import org.apache.log4j.Logger;
+import org.dspace.content.Bundle;
+import org.dspace.content.Item;
+import org.dspace.handle.factory.HandleServiceFactory;
+import org.dspace.handle.service.HandleService;
+import org.dspace.xoai.data.DSpaceItem;
+import org.dspace.xoai.filter.results.SolrFilterResult;
+
+
+/**
+ * Created by Philip Vissenaekens (philip at atmire dot com)
+ * Date: 21/04/15
+ * Time: 15:18
+ */
+public class ItemsWithBitstreamFilter extends DSpaceFilter {
+
+    private static Logger log = LogManager.getLogger(ItemsWithBitstreamFilter.class);
+
+    private static final HandleService handleService
+            = HandleServiceFactory.getInstance().getHandleService();
+
+    @Override
+    public SolrFilterResult buildSolrQuery() {
+        return new SolrFilterResult("item.hasbitstream:true");
+    }
+
+    @Override
+    public boolean isShown(DSpaceItem item) {
+        try {
+            String handle = DSpaceItem.parseHandle(item.getIdentifier());
+            if (handle == null) {
+                return false;
+            }
+            Item dspaceItem = (Item) handleService.resolveToObject(context, handle);
+            for (Bundle b : dspaceItem.getBundles("ORIGINAL")) {
+                if (b.getBitstreams().size() > 0) {
+                    return true;
+                }
+            }
+        } catch (SQLException e) {
+            log.error(e.getMessage(), e);
+        }
+        return false;
+    }
+}
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceEarliestDateResolver.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceEarliestDateResolver.java
index 6c378ff6d1..733c1b67e0 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceEarliestDateResolver.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceEarliestDateResolver.java
@@ -9,8 +9,8 @@ package org.dspace.xoai.services.impl;
 
 import java.sql.SQLException;
 import java.util.Date;
-import javax.persistence.NoResultException;
 
+import jakarta.persistence.NoResultException;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.MetadataValue;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceHandleResolver.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceHandleResolver.java
index 6ed44bdcc2..fdce0a23a6 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceHandleResolver.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/DSpaceHandleResolver.java
@@ -8,8 +8,8 @@
 package org.dspace.xoai.services.impl;
 
 import java.sql.SQLException;
-import javax.inject.Inject;
 
+import jakarta.inject.Inject;
 import org.dspace.content.DSpaceObject;
 import org.dspace.handle.factory.HandleServiceFactory;
 import org.dspace.handle.service.HandleService;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/context/DSpaceContextService.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/context/DSpaceContextService.java
index 904b7f8885..e86d15a4fa 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/context/DSpaceContextService.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/context/DSpaceContextService.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.xoai.services.impl.context;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.xoai.services.api.context.ContextService;
 import org.dspace.xoai.services.api.context.ContextServiceException;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/xoai/DSpaceRepositoryConfiguration.java b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/xoai/DSpaceRepositoryConfiguration.java
index 2a000f43ea..8c9841dfb9 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/services/impl/xoai/DSpaceRepositoryConfiguration.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/services/impl/xoai/DSpaceRepositoryConfiguration.java
@@ -14,11 +14,11 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
 import com.lyncode.xoai.dataprovider.core.DeleteMethod;
 import com.lyncode.xoai.dataprovider.core.Granularity;
 import com.lyncode.xoai.dataprovider.services.api.RepositoryConfiguration;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.io.FileUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java b/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
index b329835813..20dcabcb20 100644
--- a/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
+++ b/dspace-oai/src/main/java/org/dspace/xoai/util/ItemUtils.java
@@ -11,6 +11,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 
 import com.lyncode.xoai.dataprovider.xml.xoai.Element;
@@ -21,6 +23,7 @@ import org.apache.logging.log4j.Logger;
 import org.dspace.app.util.factory.UtilServiceFactory;
 import org.dspace.app.util.service.MetadataExposureService;
 import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Bitstream;
@@ -63,7 +66,7 @@ public class ItemUtils {
             = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     private static final AuthorizeService authorizeService
-        = AuthorizeServiceFactory.getInstance().getAuthorizeService();
+            = AuthorizeServiceFactory.getInstance().getAuthorizeService();
 
     /**
      * Default constructor
@@ -114,23 +117,21 @@ public class ItemUtils {
                     log.error("Null bitstream found, check item uuid: " + item.getID());
                     break;
                 }
+                boolean primary = false;
+                // Check if current bitstream is in original bundle + 1 of the 2 following
+                // Bitstream = primary bitstream in bundle -> true
+                // No primary bitstream found in bundle-> only the first one gets flagged as "primary"
+                if (b.getName() != null && b.getName().equals("ORIGINAL") && (b.getPrimaryBitstream() != null
+                        && b.getPrimaryBitstream().getID() == bit.getID()
+                        || b.getPrimaryBitstream() == null && bit.getID() == bits.get(0).getID())) {
+                    primary = true;
+                }
+
                 Element bitstream = create("bitstream");
                 bitstreams.getElement().add(bitstream);
-                String url = "";
-                String bsName = bit.getName();
-                String sid = String.valueOf(bit.getSequenceID());
+
                 String baseUrl = configurationService.getProperty("oai.bitstream.baseUrl");
-                String handle = null;
-                // get handle of parent Item of this bitstream, if there
-                // is one:
-                List<Bundle> bn = bit.getBundles();
-                if (!bn.isEmpty()) {
-                    List<Item> bi = bn.get(0).getItems();
-                    if (!bi.isEmpty()) {
-                        handle = bi.get(0).getHandle();
-                    }
-                }
-                url = baseUrl + "/bitstreams/" + bit.getID().toString() + "/download";
+                String url = baseUrl + "/bitstreams/" + bit.getID().toString() + "/download";
 
                 String cks = bit.getChecksum();
                 String cka = bit.getChecksumAlgorithm();
@@ -147,18 +148,65 @@ public class ItemUtils {
                 if (description != null) {
                     bitstream.getField().add(createValue("description", description));
                 }
+                // Add bitstream embargo information (READ policy present, for Anonymous group with a start date)
+                addResourcePolicyInformation(context, bit, bitstream);
+
                 bitstream.getField().add(createValue("format", bit.getFormat(context).getMIMEType()));
                 bitstream.getField().add(createValue("size", "" + bit.getSizeBytes()));
                 bitstream.getField().add(createValue("url", url));
                 bitstream.getField().add(createValue("checksum", cks));
                 bitstream.getField().add(createValue("checksumAlgorithm", cka));
                 bitstream.getField().add(createValue("sid", bit.getSequenceID() + ""));
+                // Add primary bitstream field to allow locating easily the primary bitstream information
+                bitstream.getField().add(createValue("primary", primary + ""));
             }
         }
 
         return bundles;
     }
 
+    /**
+     * This method will add metadata information about associated resource policies for a give bitstream.
+     * It will parse of relevant policies and add metadata information
+     * @param context
+     * @param bitstream the bitstream object
+     * @param bitstreamEl the bitstream metadata object to add resource policy information to
+     * @throws SQLException
+     */
+    private static void addResourcePolicyInformation(Context context, Bitstream bitstream, Element bitstreamEl)
+            throws SQLException {
+        // Pre-filter access policies by DSO (bitstream) and Action (READ)
+        List<ResourcePolicy> policies = authorizeService.getPoliciesActionFilter(context, bitstream, Constants.READ);
+
+        // Create resourcePolicies container
+        Element resourcePolicies = create("resourcePolicies");
+
+        for (ResourcePolicy policy : policies) {
+            String groupName = policy.getGroup() != null ? policy.getGroup().getName() : null;
+            String user = policy.getEPerson() != null ? policy.getEPerson().getName() : null;
+            String action = Constants.actionText[policy.getAction()];
+            Date startDate = policy.getStartDate();
+            Date endDate = policy.getEndDate();
+
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+
+            Element resourcePolicyEl = create("resourcePolicy");
+            resourcePolicyEl.getField().add(createValue("group", groupName));
+            resourcePolicyEl.getField().add(createValue("user", user));
+            resourcePolicyEl.getField().add(createValue("action", action));
+            if (startDate != null) {
+                resourcePolicyEl.getField().add(createValue("start-date", formatter.format(startDate)));
+            }
+            if (endDate != null) {
+                resourcePolicyEl.getField().add(createValue("end-date", formatter.format(endDate)));
+            }
+            // Add resourcePolicy to list of resourcePolicies
+            resourcePolicies.getElement().add(resourcePolicyEl);
+        }
+        // Add list of resource policies to the corresponding Bitstream XML Element
+        bitstreamEl.getElement().add(resourcePolicies);
+    }
+
     private static Element createLicenseElement(Context context, Item item)
             throws SQLException, AuthorizeException, IOException {
         Element license = create("license");
@@ -178,7 +226,7 @@ public class ItemUtils {
                     license.getField().add(createValue("bin", Base64Utils.encode(out.toString())));
                 } else {
                     log.info("Missing READ rights for license bitstream. Did not include license bitstream for item: "
-                             + item.getID() + ".");
+                            + item.getID() + ".");
                 }
             }
         }
diff --git a/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/RioxxXslTest.java b/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/RioxxXslTest.java
new file mode 100644
index 0000000000..74dfaf2902
--- /dev/null
+++ b/dspace-oai/src/test/java/org/dspace/xoai/tests/stylesheets/RioxxXslTest.java
@@ -0,0 +1,35 @@
+/**
+ * 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.xoai.tests.stylesheets;
+
+import static org.dspace.xoai.tests.support.XmlMatcherBuilder.xml;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+
+import org.dspace.xoai.tests.support.XmlMatcherBuilder;
+import org.junit.Test;
+
+public class RioxxXslTest extends AbstractXSLTest {
+    @Test
+    public void rioxxCanTransformInput() throws Exception {
+        String result = apply("rioxx.xsl").to(resource("xoai-rioxx-test.xml"));
+
+        assertThat(result, is(rioxx().withXPath("//dc:title", equalTo("The Intercorrelation Between " +
+                "Executive Function, Physics Problem Solving, Mathematical, and Matrix Reasoning Skills: " +
+                "Reflections from a Small-Scale Experiment"))));
+    }
+
+    private XmlMatcherBuilder rioxx() {
+        return xml()
+                .withNamespace("rioxx", "http://www.rioxx.net/schema/v3.0/rioxx/")
+                .withNamespace("rioxxterms", "http://docs.rioxx.net/schema/v3.0/rioxxterms/")
+                .withNamespace("dcterms", "http://purl.org/dc/terms/")
+                .withNamespace("dc", "http://purl.org/dc/elements/1.1/");
+    }
+}
diff --git a/dspace-oai/src/test/java/org/dspace/xoai/tests/unit/services/impl/AbstractQueryResolverTest.java b/dspace-oai/src/test/java/org/dspace/xoai/tests/unit/services/impl/AbstractQueryResolverTest.java
index 53fc643449..b1ae4d209f 100644
--- a/dspace-oai/src/test/java/org/dspace/xoai/tests/unit/services/impl/AbstractQueryResolverTest.java
+++ b/dspace-oai/src/test/java/org/dspace/xoai/tests/unit/services/impl/AbstractQueryResolverTest.java
@@ -38,7 +38,7 @@ public abstract class AbstractQueryResolverTest {
 
     @After
     public void tearDown() {
-        //Nullify all resoruces so that JUnit cleans them up
+        //Nullify all resources so that JUnit cleans them up
         applicationContext = null;
         handleResolver = null;
         collectionsService = null;
diff --git a/dspace-oai/src/test/resources/rioxx-test-invalid.xml b/dspace-oai/src/test/resources/rioxx-test-invalid.xml
new file mode 100644
index 0000000000..c8daf1a28d
--- /dev/null
+++ b/dspace-oai/src/test/resources/rioxx-test-invalid.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?><!--
+
+    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/
+
+-->
+<rioxx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.rioxx.net/schema/v3.0/rioxx/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:rioxxterms="http://docs.rioxx.net/schema/v3.0/rioxxterms/">
+    <dc:description>Data on Secchi disc depth (the depth at which a standard white disc lowered into the water just becomes invisible to a surface observer) show that water clarity in the North Sea declined during the 20th century, with likely consequences for marine primary production. However, the causes of this trend remain unknown. Here we analyse the hypothesis that changes in the North Sea's wave climate were largely responsible by causing an increase in the concentrations of suspended particulate matter (SPM) in the water column through the resuspension of seabed sediments. First, we analysed the broad-scale statistical relationships between SPM and bed shear stress due to waves and tides. We used hindcasts of wave and current data to construct a space–time dataset of bed shear stress between 1997 and 2017 across the northwest European Continental Shelf and compared the results with satellite-derived SPM concentrations. Bed shear stress was found to drive most of the inter-annual variation in SPM in the hydrographically mixed waters of the central and southern North Sea. We then used a long-term wave reanalysis to construct a time series of bed shear stress from 1900 to 2010. This shows that bed shear stress increased significantly across much of the shelf during this period, with increases of over 20 % in the southeastern North Sea. An increase in bed shear stress of this magnitude would have resulted in a large reduction in water clarity. Wave-driven processes are rarely included in projections of climate change impacts on marine ecosystems, but our analysis indicates that this should be reconsidered for shelf sea regions.</dc:description>
+
+    <dc:language>en</dc:language>
+
+    <rioxxterms:publisher>
+        <rioxxterms:name>European Geosciences Union</rioxxterms:name>
+        <rioxxterms:id>https://isni.org/isni/0000000110927289</rioxxterms:id>
+    </rioxxterms:publisher>
+
+    <dc:source>1812-0792</dc:source>
+
+    <dc:title>Increasing turbidity in the North Sea during the 20th century due to changing wave climate</dc:title>
+
+    <dcterms:dateAccepted>2019-10-02</dcterms:dateAccepted>
+
+    <rioxxterms:creator
+            first-named-author="true">
+        <rioxxterms:name>Wilson, Robert J.</rioxxterms:name>
+        <rioxxterms:id>https://orcid.org/0000-0002-0592-366X</rioxxterms:id>
+    </rioxxterms:creator>
+
+    <rioxxterms:creator>
+        <rioxxterms:name>Heath, Michael R.</rioxxterms:name>
+        <rioxxterms:id>https://orcid.org/0000-0001-6602-3107</rioxxterms:id>
+        <rioxxterms:id> https://viaf.org/viaf/15147423189944882613</rioxxterms:id>
+    </rioxxterms:creator>
+
+    <rioxxterms:publication_date>2019-12-09</rioxxterms:publication_date>
+
+    <rioxxterms:record_public_release_date>2019-10-15</rioxxterms:record_public_release_date>
+
+    <dc:type>https://purl.org/coar/resource_type/c_2df8fbb1</dc:type>
+
+    <rioxxterms:grant
+            funder_name="Australian Research Council"
+            funder_id="https://ror.org/05mmh0f86">
+        DP190101507
+    </rioxxterms:grant>
+
+    <rioxxterms:grant
+            funder_name="John Templeton Foundation"
+            funder_id="https://ror.org/035tnyy05">
+        61387
+    </rioxxterms:grant>
+
+    <dc:relation
+            rel="item"
+            type="application/pdf"
+            coar_type="https://purl.org/coar/resource_type/c_6501"
+            coar_version="https://purl.org/coar/version/c_ab4af688f83e57aa"
+            deposit_date="2019-12-11"
+            resource_exposed_date="2019-12-11"
+            access_rights_="https://purl.org/coar/access_right/c_abf2"
+            license_ref="https://creativecommons.org/licenses/by-nc-nd/4.0/">
+        https://strathprints.strath.ac.uk/70117/7/Wilson_Heath_OS2019_Increasing_turbidity_in_the_North_Sea_during_the_20th_century.pdf
+    </dc:relation>
+
+    <!-- Other expressions (or 'instances') - publisher version -->
+    <rioxxterms:ext_relation
+            rel="cite-as"
+            coar_type="https://purl.org/coar/resource_type/c_6501"
+            coar_version="https://purl.org/coar/version/c_970fb48d4fbd8a85">
+        https://doi.org/10.1007/s11229-020-02724-x
+    </rioxxterms:ext_relation>
+
+    <!-- related  dataset -->
+    <rioxxterms:ext_relation
+            rel="cite-as"
+            coar_type="https://purl.org/coar/resource_type/c_ddb1">
+        https://doi.org/10.15129/5d28213e-8f9f-402a-b550-fc588518cb8b
+    </rioxxterms:ext_relation >
+
+    <!-- related software -->
+    <rioxxterms:ext_relation
+            rel="cite-as"
+            coar_type="https://purl.org/coar/resource_type/QH80-2R4E">
+        https://doi.org/10.5281/zenodo.3478185
+    </rioxxterms:ext_relation>
+</rioxx>
diff --git a/dspace-oai/src/test/resources/rioxx-test-valid.xml b/dspace-oai/src/test/resources/rioxx-test-valid.xml
new file mode 100644
index 0000000000..74ffd43eb6
--- /dev/null
+++ b/dspace-oai/src/test/resources/rioxx-test-valid.xml
@@ -0,0 +1,92 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+
+    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/
+
+-->
+<rioxx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.rioxx.net/schema/v3.0/rioxx/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:rioxxterms="http://docs.rioxx.net/schema/v3.0/rioxxterms/">
+    <dc:description>Data on Secchi disc depth (the depth at which a standard white disc lowered into the water just becomes invisible to a surface observer) show that water clarity in the North Sea declined during the 20th century, with likely consequences for marine primary production. However, the causes of this trend remain unknown. Here we analyse the hypothesis that changes in the North Sea's wave climate were largely responsible by causing an increase in the concentrations of suspended particulate matter (SPM) in the water column through the resuspension of seabed sediments. First, we analysed the broad-scale statistical relationships between SPM and bed shear stress due to waves and tides. We used hindcasts of wave and current data to construct a space–time dataset of bed shear stress between 1997 and 2017 across the northwest European Continental Shelf and compared the results with satellite-derived SPM concentrations. Bed shear stress was found to drive most of the inter-annual variation in SPM in the hydrographically mixed waters of the central and southern North Sea. We then used a long-term wave reanalysis to construct a time series of bed shear stress from 1900 to 2010. This shows that bed shear stress increased significantly across much of the shelf during this period, with increases of over 20 % in the southeastern North Sea. An increase in bed shear stress of this magnitude would have resulted in a large reduction in water clarity. Wave-driven processes are rarely included in projections of climate change impacts on marine ecosystems, but our analysis indicates that this should be reconsidered for shelf sea regions.</dc:description>
+
+    <dc:language>en</dc:language>
+
+    <rioxxterms:publisher>
+        <rioxxterms:name>European Geosciences Union</rioxxterms:name>
+        <rioxxterms:id>https://isni.org/isni/0000000110927289</rioxxterms:id>
+    </rioxxterms:publisher>
+
+    <dc:source>1812-0792</dc:source>
+
+    <dc:title>Increasing turbidity in the North Sea during the 20th century due to changing wave climate</dc:title>
+
+    <dcterms:dateAccepted>2019-10-02</dcterms:dateAccepted>
+
+    <rioxxterms:creator
+            first-named-author="true">
+        <rioxxterms:name>Wilson, Robert J.</rioxxterms:name>
+        <rioxxterms:id>https://orcid.org/0000-0002-0592-366X</rioxxterms:id>
+    </rioxxterms:creator>
+
+    <rioxxterms:creator>
+        <rioxxterms:name>Heath, Michael R.</rioxxterms:name>
+        <rioxxterms:id>https://orcid.org/0000-0001-6602-3107</rioxxterms:id>
+        <rioxxterms:id> https://viaf.org/viaf/15147423189944882613</rioxxterms:id>
+    </rioxxterms:creator>
+
+    <rioxxterms:publication_date>2019-12-09</rioxxterms:publication_date>
+
+    <rioxxterms:record_public_release_date>2019-10-15</rioxxterms:record_public_release_date>
+
+    <dc:type>https://purl.org/coar/resource_type/c_2df8fbb1</dc:type>
+
+    <rioxxterms:grant
+            funder_name="Australian Research Council"
+            funder_id="https://ror.org/05mmh0f86">
+        DP190101507
+    </rioxxterms:grant>
+
+    <rioxxterms:grant
+            funder_name="John Templeton Foundation"
+            funder_id="https://ror.org/035tnyy05">
+        61387
+    </rioxxterms:grant>
+
+    <dc:identifier>https://strathprints.strath.ac.uk/70117/</dc:identifier>
+
+    <dc:relation
+            rel="item"
+            type="application/pdf"
+            coar_type="https://purl.org/coar/resource_type/c_6501"
+            coar_version="https://purl.org/coar/version/c_ab4af688f83e57aa"
+            deposit_date="2019-12-11"
+            resource_exposed_date="2019-12-11"
+            access_rights_="https://purl.org/coar/access_right/c_abf2"
+            license_ref="https://creativecommons.org/licenses/by-nc-nd/4.0/">
+        https://strathprints.strath.ac.uk/70117/7/Wilson_Heath_OS2019_Increasing_turbidity_in_the_North_Sea_during_the_20th_century.pdf
+    </dc:relation>
+
+    <!-- Other expressions (or 'instances') - publisher version -->
+    <rioxxterms:ext_relation
+            rel="cite-as"
+            coar_type="https://purl.org/coar/resource_type/c_6501"
+            coar_version="https://purl.org/coar/version/c_970fb48d4fbd8a85">
+        https://doi.org/10.1007/s11229-020-02724-x
+    </rioxxterms:ext_relation>
+
+    <!-- related  dataset -->
+    <rioxxterms:ext_relation
+            rel="cite-as"
+            coar_type="https://purl.org/coar/resource_type/c_ddb1">
+        https://doi.org/10.15129/5d28213e-8f9f-402a-b550-fc588518cb8b
+    </rioxxterms:ext_relation >
+
+    <!-- related software -->
+    <rioxxterms:ext_relation
+            rel="cite-as"
+            coar_type="https://purl.org/coar/resource_type/QH80-2R4E">
+        https://doi.org/10.5281/zenodo.3478185
+    </rioxxterms:ext_relation>
+</rioxx>
diff --git a/dspace-oai/src/test/resources/xoai-rioxx-test.xml b/dspace-oai/src/test/resources/xoai-rioxx-test.xml
new file mode 100644
index 0000000000..33c2c3d101
--- /dev/null
+++ b/dspace-oai/src/test/resources/xoai-rioxx-test.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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/
+
+-->
+<metadata
+        xmlns="http://www.lyncode.com/xoai"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.lyncode.com/xoai http://www.lyncode.com/xsd/xoai.xsd">
+    <element name="dspace">
+        <element name="entity">
+            <element name="type">
+                <element name="none">
+                    <field name="value">Publication</field>
+                </element>
+            </element>
+        </element>
+    </element>
+    <element name="dcterms">
+        <element name="dateAccepted">
+            <element name="none">
+                <field name="value">2023-11-07</field>
+            </element>
+        </element>
+    </element>
+    <element name="dc">
+        <element name="contributor">
+            <element name="author">
+                <element name="none">
+                    <field name="value">Tsigaridis, Konstantinos G.</field>
+                    <field name="authority">virtual::44</field>
+                    <field name="confidence">-1</field>
+                    <field name="value">Wang, Rui</field>
+                    <field name="authority">virtual::46</field>
+                    <field name="confidence">-1</field>
+                    <field name="value">Ellefson, Michelle R.</field>
+                    <field name="authority">virtual::47</field>
+                    <field name="confidence">-1</field>
+                </element>
+            </element>
+        </element>
+        <element name="date">
+            <element name="accessioned">
+                <element name="none">
+                    <field name="value">2023-11-07T11:34:10Z</field>
+                </element>
+            </element>
+            <element name="available">
+                <element name="none">
+                    <field name="value">2023-11-07T11:34:10Z</field>
+                </element>
+            </element>
+            <element name="issued">
+                <element name="none">
+                    <field name="value">2022-11-30</field>
+                </element>
+            </element>
+        </element>
+        <element name="identifier">
+            <element name="uri">
+                <element name="none">
+                    <field name="value">https://example.org/handle/1811/160</field>
+                </element>
+            </element>
+        </element>
+        <element name="language">
+            <element name="iso">
+                <element name="none">
+                    <field name="value">eng</field>
+                </element>
+            </element>
+        </element>
+        <element name="title">
+            <element name="none">
+                <field name="value">The Intercorrelation Between Executive Function, Physics Problem Solving, Mathematical, and Matrix Reasoning Skills: Reflections from a Small-Scale Experiment</field>
+            </element>
+        </element>
+        <element name="type">
+            <element name="none">
+                <field name="value">Article</field>
+            </element>
+        </element>
+    </element>
+    <element name="relation">
+        <element name="isAuthorOfPublication">
+            <element name="none">
+                <field name="value">a57363fa-f82e-4684-bd76-f7bc1e893603</field>
+                <field name="authority">virtual::44</field>
+                <field name="confidence">-1</field>
+                <field name="value">e00b3d0d-65e2-4c30-825d-1a4839845790</field>
+                <field name="authority">virtual::46</field>
+                <field name="confidence">-1</field>
+                <field name="value">bdd38a03-206d-4f9b-bafb-70e060ad176f</field>
+                <field name="authority">virtual::47</field>
+                <field name="confidence">-1</field>
+            </element>
+            <element name="latestForDiscovery">
+                <element name="none">
+                    <field name="value">a57363fa-f82e-4684-bd76-f7bc1e893603</field>
+                    <field name="authority">virtual::44</field>
+                    <field name="confidence">-1</field>
+                    <field name="value">e00b3d0d-65e2-4c30-825d-1a4839845790</field>
+                    <field name="authority">virtual::46</field>
+                    <field name="confidence">-1</field>
+                    <field name="value">bdd38a03-206d-4f9b-bafb-70e060ad176f</field>
+                    <field name="authority">virtual::47</field>
+                    <field name="confidence">-1</field>
+                </element>
+            </element>
+        </element>
+        <element name="isJournalOfPublication">
+            <element name="none">
+                <field name="value">05a400b1-ff0b-4e40-80cd-a7d1b712ace2</field>
+                <field name="authority">virtual::71</field>
+                <field name="confidence">-1</field>
+            </element>
+        </element>
+        <element name="isJournalIssueOfPublication">
+            <element name="none">
+                <field name="value">7524a0cf-3ea2-40c7-a265-d583425ed4d7</field>
+                <field name="authority">virtual::71</field>
+                <field name="confidence">-1</field>
+            </element>
+            <element name="latestForDiscovery">
+                <element name="none">
+                    <field name="value">7524a0cf-3ea2-40c7-a265-d583425ed4d7</field>
+                    <field name="authority">virtual::71</field>
+                    <field name="confidence">-1</field>
+                </element>
+            </element>
+        </element>
+    </element>
+    <element name="person">
+        <element name="identifier">
+            <element name="orcid">
+                <element name="none">
+                    <field name="value">0000-0003-0407-9767</field>
+                    <field name="authority">virtual::47</field>
+                    <field name="confidence">-1</field>
+                </element>
+            </element>
+        </element>
+    </element>
+    <element name="creativeworkseries">
+        <element name="issn">
+            <element name="none">
+                <field name="value">2634-9876</field>
+                <field name="authority">virtual::71</field>
+                <field name="confidence">-1</field>
+            </element>
+        </element>
+    </element>
+    <element name="bundles">
+        <element name="bundle">
+            <field name="name">ORIGINAL</field>
+            <element name="bitstreams">
+                <element name="bitstream">
+                    <field name="name">Tsigaridis et al., 2022.pdf</field>
+                    <field name="format">application/pdf</field>
+                    <field name="size">1554917</field>
+                    <field name="url">https://example.org/bitstreams/9121e795-0af3-4ff3-be2a-4b28418fb269/download</field>
+                    <field name="checksum">42d8cd076931e43e02d0af70a36d704e</field>
+                    <field name="checksumAlgorithm">MD5</field>
+                    <field name="sid">1</field>
+                    <field name="primary">true</field>
+                    <element name="resourcePolicies">
+                        <element name="resourcePolicy">
+                            <field name="group">Anonymous</field>
+                            <field name="user">Anonymous</field>
+                            <field name="action">READ</field>
+                        </element>
+                    </element>
+                </element>
+            </element>
+        </element>
+        <element name="bundle">
+            <field name="name">THUMBNAIL</field>
+            <element name="bitstreams">
+                <element name="bitstream">
+                    <field name="name">cerj_volume_9_thumbnail.jpg</field>
+                    <field name="format">image/jpeg</field>
+                    <field name="size">14513</field>
+                    <field name="url">https://example.org/bitstreams/16245937-10bb-46db-9817-683a5ebd8d63/download</field>
+                    <field name="checksum">8c39d691daa8e5f9d668668db7910cd6</field>
+                    <field name="checksumAlgorithm">MD5</field>
+                    <field name="sid">2</field>
+                    <field name="primary">false</field>
+                    <element name="resourcePolicies">
+                        <element name="resourcePolicy">
+                            <field name="group">Anonymous</field>
+                            <field name="user">Anonymous</field>
+                            <field name="action">READ</field>
+                        </element>
+                    </element>
+                </element>
+            </element>
+        </element>
+    </element>
+    <element name="others">
+        <field name="handle">1811/160</field>
+        <field name="identifier">oai:example.org:1811/160</field>
+        <field name="lastModifyDate">2023-12-13 13:07:56.51</field>
+        <element name="access-status">
+            <field name="value">open.access</field>
+        </element>
+    </element>
+    <element name="repository">
+        <field name="url">https://example.org</field>
+        <field name="name">Diamond DSpace (dev)</field>
+        <field name="mail">support@example.org</field>
+    </element>
+    <element name="license"/>
+</metadata>
diff --git a/dspace-rdf/pom.xml b/dspace-rdf/pom.xml
index f118ebddb3..45ab69b483 100644
--- a/dspace-rdf/pom.xml
+++ b/dspace-rdf/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -71,8 +71,8 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
diff --git a/dspace-rdf/src/main/java/org/dspace/rdf/providing/DataProviderServlet.java b/dspace-rdf/src/main/java/org/dspace/rdf/providing/DataProviderServlet.java
index 007f865fb7..7344b2c74e 100644
--- a/dspace-rdf/src/main/java/org/dspace/rdf/providing/DataProviderServlet.java
+++ b/dspace-rdf/src/main/java/org/dspace/rdf/providing/DataProviderServlet.java
@@ -11,13 +11,13 @@ package org.dspace.rdf.providing;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import com.hp.hpl.jena.rdf.model.Model;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.jena.rdf.model.Model;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
@@ -159,7 +159,7 @@ public class DataProviderServlet extends HttpServlet {
     }
 
     protected String detectContentType(HttpServletRequest request, String lang) {
-        // It is usefull to be able to overwrite the content type, to see the
+        // It is useful to be able to overwrite the content type, to see the
         // request result directly in the browser. If a parameter "text" is part
         // of the request, we send the result with the content type "text/plain".
         if (request.getParameter("text") != null) {
diff --git a/dspace-rdf/src/main/java/org/dspace/rdf/providing/LocalURIRedirectionServlet.java b/dspace-rdf/src/main/java/org/dspace/rdf/providing/LocalURIRedirectionServlet.java
index 7224bb9bfb..d985740f52 100644
--- a/dspace-rdf/src/main/java/org/dspace/rdf/providing/LocalURIRedirectionServlet.java
+++ b/dspace-rdf/src/main/java/org/dspace/rdf/providing/LocalURIRedirectionServlet.java
@@ -9,11 +9,11 @@ package org.dspace.rdf.providing;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.content.DSpaceObject;
diff --git a/dspace-rest/README.md b/dspace-rest/README.md
deleted file mode 100644
index 07d71d66ed..0000000000
--- a/dspace-rest/README.md
+++ /dev/null
@@ -1,194 +0,0 @@
-#DSpace REST API (Jersey) - DEPRECATED
-
-A RESTful web services API for DSpace, built using JAX-RS1 JERSEY.
-
-_This REST API has been deprecated and will be removed in v8. Please use the Server API (/server) webapp instead._
-
-##Getting Started
-This REST API is integrated directly into the DSpace codebase.
-
- * Rebuild as usual: mvn + ant
- * Deploy the webapp (i.e to Tomcat)
-  * ```<Context path="/rest" docBase="/dspace/webapps/rest" />```
-
-
-REST API can do all CRUD (create, read, update, delete) operations over communities, collections, items, bitstream and bitstream policies. Without logging into the REST API, you have read access as an anonymous user (member of the Anonymous group). If you want to make changes in DSpace using the REST API, you must log into the API using the "login" endpoint and then use the returned token in request header of your subsequent API calls.
-
-##Endpoints
-
-| Resource      |CREATE|READ list|READ single|Edit|Delete|Search|
-| ------------- |------|:-------:|-----------|----|------|------|
-| /communities  |  Y   |   Y     |     Y     |  Y |  Y   |      |
-| /collections  |  Y   |   Y     |     Y     |  Y |  Y   |  Y   |
-| /items        |  Y   |   Y     |     Y     |  Y |  Y   |  Y   |
-| /bitstreams   |  Y   |   Y     |     Y     |  Y |  Y   |      ||
-
-Search in collections is possible only by name and search in items only by metadata field.
-
-###Index
-Get information on how to use the API
-- GET http://localhost:8080
-
-Test whether the REST API is running and available
-- GET http://localhost:8080/rest/test
-
-Log into REST API
-- POST http://localhost:8080/rest/login
-
-Logout from REST API
-- POST http://localhost:8080/rest/logout
-
-Get status of REST API and the logged-in user
-- GET http://localhost:8080/rest/status
-
-
-###Communities
-View the list of top-level communities
-- GET http://localhost:8080/rest/communities/top-communities
-
-View the list of all communities
-- GET http://localhost:8080/rest/communities[?expand={collections,parentCommunity,subCommunities,logo,all}]
-
-View a specific community
-- GET http://localhost:8080/rest/communities/:ID[?expand={collections,parentCommunity,subCommunities,logo,all}]
-
-View the list of subcollections in community
-- GET http://localhost:8080/rest/communities/:ID/collections[?expand={items,parentCommunityList,license,logo,all}]
-
-View the list of subcommunities in community
-- GET http://localhost:8080/rest/communities/:ID/communities[?expand={collections,parentCommunity,subCommunities,logo,all}]
-
-Create new top-level community
-- POST http://localhost:8080/rest/communities
-
-Create new subcollection in community
-- POST http://localhost:8080/rest/communities/:ID/collections
-
-Create new subcommunity in community
-- POST http://localhost:8080/rest/communities/:ID/communities
-
-Update community
-- PUT http://localhost:8080/rest/communities/:ID
-
-Delete community
-- DELETE http://localhost:8080/rest/communities/:ID
-
-Delete subcollection in community
-- DELETE http://localhost:8080/rest/communities/:ID/collections/:ID
-
-Delete subcommunity in community
-- DELETE http://localhost:8080/rest/communities/:ID/communities/:ID
-
-
-###Collections
-View the list of collections
-- GET http://localhost:8080/rest/collections[?expand={items,parentCommunityList,license,logo,all}]
-
-View a specific collection
-- GET http://localhost:8080/rest/collections/:ID[?expand={items,parentCommunityList,license,logo,all}]
-
-View items in collection
-- GET http://localhost:8080/rest/collections/:ID/items[?expand={metadata,parentCollection,parentcollectionList,parentCommunityList,bitstreams,all}]
-
-Create item in collection
-- POST http://localhost:8080/rest/collections/:ID/items
-
-Find collection by name
-- POST http://localhost:8080/rest/collections/find-collection
-
-Update collection
-- PUT http://localhost:8080/rest/collections/:ID
-
-Delete collection
-- DELETE http://localhost:8080/rest/collections/:ID
-
-Delete item in collection
-- DELETE http://localhost:8080/rest/collections/:ID/items/:ID
-
-
-###Items
-View the list of items
-- GET http://localhost:8080/rest/items[?expand={metadata,parentCollection,parentcollectionList,parentCommunityList,bitstreams,all}]
-
-View speciific item
-- GET http://localhost:8080/rest/items/:ID[?expand={metadata,parentCollection,parentcollectionList,parentCommunityList,bitstreams,all}]
-
-View an Item and view its bitstreams
-- GET http://localhost:8080/rest/items/:ID/bitstreams[?expand={parent,policies,all}]
-
-View an Item, and view its metadata
-- GET http://localhost:8080/rest/items/:ID/metadata
-
-Find item by metadata
-- POST http://localhost:8080/rest/items/find-by-metadata-field
-
-Add metadata to item
-- POST http://localhost:8080/rest/items/:ID/metadata
-
-Create bitstream in item
-- POST http://localhost:8080/rest/items/:ID/bitstreams
-
-Update metadata in item
-- PUT http://localhost:8080/rest/items/:ID/metadata
-
-Delete item
-- DELETE http://localhost:8080/rest/items/:ID
-
-Delete all metadata in item
-- DELETE http://localhost:8080/rest/items/:ID/metadata
-
-Delete bitstream in item
-- DELETE http://localhost:8080/rest/items/:ID/bitstreams/:ID
-
-
-###Bitstreams
-View the list of bitstreams
-- GET http://localhost:8080/rest/bitstreams[?expand={parent,policies,all}]
-
-View information about a bitstream
-- GET http://localhost:8080/rest/bitstreams/:ID[?expand={parent,policies,all}]
-
-View/Download a specific Bitstream
-- GET http://localhost:8080/rest/bitstreams/:ID/retrieve
-
-View the list of policies of bitstream
-- GET http://localhost:8080/rest/bitstreams/:ID/policy
-
-Add policy to bitstream
-- POST http://localhost:8080/rest/bitstreams/:ID/policy
-
-Update bitstream
-- PUT http://localhost:8080/rest/bitstreams/:ID
-
-Update data of bitstream
-- PUT http://localhost:8080/rest/bitstreams/:ID/data
-
-Delete bitstream
-- DELETE http://localhost:8080/rest/bitstreams/:ID
-
-Delete policy of bitstream
-- DELETE http://localhost:8080/rest/bitstreams/:ID/policy/:ID
-
-
-####Statistics
-Recording view events of items and download events of bitstreams (set stats = true in rest.cfg to enable recording of events)
-http://localhost:8080/rest/items/:ID?userIP=ip&userAgent=userAgent&xforwardedfor=xforwardedfor
-If no parameters are given, the details of the HTTP request sender are used in statistics. 
-This enables tools like proxies to supply the details of their user rather than themselves.
-
-
-###Handles
-Lookup a DSpaceObject by its Handle, this produces the name/ID that you look up in /bitstreams, /items, /collections, /communities
-- http://localhost:8080/rest/handle/{prefix}/{suffix}
-
-##Expand
-There is an ?expand= query parameter for more expensive operations. You can add it at the end of the request URL.
-It is optional, all, some or none. The response will usually indicate what the available "expand" options are.
-
-##HTTP Responses
-* 200 OK            - The requested object/objects exists
-* 401 Unauthorized  - The anonymous user does not have READ access to that object
-* 404 Not Found     - The specified object doesn't exist
-* 405 Method Not Allowed - Wrong request method (GET,POST,PUT,DELETE) or wrong data format (JSON/XML). 
-* 415 Unsupported Media Type - Missing "Content-Type: application/json" or "Content-Type: application/xml" request header
-* 500 Server Error  - Likely a SQLException, IOException, more details in the logs.
diff --git a/dspace-rest/pom.xml b/dspace-rest/pom.xml
deleted file mode 100644
index 5688424a1c..0000000000
--- a/dspace-rest/pom.xml
+++ /dev/null
@@ -1,202 +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</groupId>
-    <artifactId>dspace-rest</artifactId>
-    <packaging>war</packaging>
-    <version>7.6.2-SNAPSHOT</version>
-    <name>DSpace (Deprecated) REST Webapp</name>
-    <description>DSpace RESTful Web Services API. NOTE: this REST API is DEPRECATED.
-        Please consider using the REST API in the dspace-server-webapp instead!</description>
-    <url>http://demo.dspace.org</url>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
-        <relativePath>..</relativePath>
-    </parent>
-
-    <properties>
-        <!-- This is the path to the root [dspace-src] directory. -->
-        <root.basedir>${basedir}/..</root.basedir>
-    </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>
-            </plugin>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <!--Exclude license check for third-party files which don't need it-->
-                    <excludes>
-                        <exclude>**/static/reports/spin.js</exclude>
-                        <exclude>**/static/reports/README.md</exclude>
-                        <exclude>**/*.xsd</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <!-- Jersey, for RESTful web services -->
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-server</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.containers</groupId>
-            <artifactId>jersey-container-servlet</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-json-jackson</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.media</groupId>
-            <artifactId>jersey-media-jaxb</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
-
-        <!-- Spring dependencies -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-        </dependency>
-
-        <!-- Jersey + Spring -->
-        <dependency>
-            <groupId>org.glassfish.jersey.ext</groupId>
-            <artifactId>jersey-spring5</artifactId>
-            <version>${jersey.version}</version>
-            <exclusions>
-                <!-- We provide our own version of Spring framework dependencies -->
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-web</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-beans</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-context</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-aop</artifactId>
-                </exclusion>
-                <!-- Newer version provided by jersey-server above -->
-                <exclusion>
-                    <groupId>jakarta.annotation</groupId>
-                    <artifactId>jakarta.annotation-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-core</artifactId>
-            <version>${spring-security.version}</version>
-            <exclusions>
-                <!-- Latest version will be provided by spring-context-->
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-expression</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-web</artifactId>
-            <version>${spring-security.version}</version>
-            <exclusions>
-                <!-- Latest version will be provided by spring-context-->
-                <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-expression</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-config</artifactId>
-            <version>${spring-security.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-api</artifactId>
-        </dependency>
-
-        <!-- Connecting to DSpace datasource sets a dependency on Postgres DB-->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-dbcp2</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.atteo</groupId>
-            <artifactId>evo-inflector</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-        </dependency>
-	<dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-web</artifactId>
-	</dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-services</artifactId>
-        </dependency>
-        <dependency>
-           <groupId>junit</groupId>
-           <artifactId>junit</artifactId>
-           <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java b/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
deleted file mode 100644
index b71bfad592..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/BitstreamResource.java
+++ /dev/null
@@ -1,784 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URLConnection;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.authorize.service.ResourcePolicyService;
-import org.dspace.content.BitstreamFormat;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.BitstreamFormatService;
-import org.dspace.content.service.BitstreamService;
-import org.dspace.content.service.BundleService;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.GroupService;
-import org.dspace.rest.common.Bitstream;
-import org.dspace.rest.common.ResourcePolicy;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.storage.bitstore.factory.StorageServiceFactory;
-import org.dspace.storage.bitstore.service.BitstreamStorageService;
-import org.dspace.usage.UsageEvent;
-
-/**
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-// Every DSpace class used without namespace is from package
-// org.dspace.rest.common.*. Otherwise namespace is defined.
-@Path("/bitstreams")
-public class BitstreamResource extends Resource {
-    protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
-    protected BundleService bundleService = ContentServiceFactory.getInstance().getBundleService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance()
-                                                                                   .getBitstreamFormatService();
-    protected BitstreamStorageService bitstreamStorageService = StorageServiceFactory.getInstance()
-                                                                                     .getBitstreamStorageService();
-    protected ResourcePolicyService resourcePolicyService = AuthorizeServiceFactory.getInstance()
-                                                                                   .getResourcePolicyService();
-    protected GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(BitstreamResource.class);
-
-    /**
-     * Return bitstream properties without file data. It can throw
-     * WebApplicationException with three response codes. Response code
-     * NOT_FOUND(404) or UNAUTHORIZED(401) or INTERNAL_SERVER_ERROR(500). Bad
-     * request is when the bitstream id does not exist. UNAUTHORIZED if the user
-     * logged into the DSpace context does not have the permission to access the
-     * bitstream. Server error when something went wrong.
-     *
-     * @param bitstreamId   Id of bitstream in DSpace.
-     * @param expand        This string defines which additional optional fields will be added
-     *                      to bitstream response. Individual options are separated by commas without
-     *                      spaces. The options are: "all", "parent".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return If user is allowed to read bitstream, it returns instance of
-     * bitstream. Otherwise, it throws WebApplicationException with
-     * response code UNAUTHORIZED.
-     * @throws WebApplicationException It can happen on: Bad request, unauthorized, SQL exception
-     *                                 and context exception(could not create context).
-     */
-    @GET
-    @Path("/{bitstream_id}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Bitstream getBitstream(@PathParam("bitstream_id") String bitstreamId, @QueryParam("expand") String expand,
-                                  @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                  @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                  @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading bitstream(id=" + bitstreamId + ") metadata.");
-        org.dspace.core.Context context = null;
-        Bitstream bitstream = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.READ);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            bitstream = new Bitstream(dspaceBitstream, servletContext, expand, context);
-            context.complete();
-            log.trace("Bitstream(id=" + bitstreamId + ") was successfully read.");
-
-        } catch (SQLException e) {
-            processException(
-                "Someting went wrong while reading bitstream(id=" + bitstreamId + ") from database! Message: " + e,
-                context);
-        } catch (ContextException e) {
-            processException(
-                "Someting went wrong while reading bitstream(id=" + bitstreamId + "), ContextException. Message: "
-                    + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        return bitstream;
-    }
-
-    /**
-     * Return all bitstream resource policies from all bundles, in which
-     * the bitstream is present.
-     *
-     * @param bitstreamId Id of bitstream in DSpace.
-     * @param headers     If you want to access the item as the user logged into the context.
-     *                    The header "rest-dspace-token" with the token passed
-     *                    from the login method must be set.
-     * @return Returns an array of ResourcePolicy objects.
-     */
-    @GET
-    @Path("/{bitstream_id}/policy")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ResourcePolicy[] getBitstreamPolicies(@PathParam("bitstream_id") String bitstreamId,
-                                                 @Context HttpHeaders headers) {
-
-        log.info("Reading bitstream(id=" + bitstreamId + ") policies.");
-        org.dspace.core.Context context = null;
-        ResourcePolicy[] policies = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.READ);
-            policies = new Bitstream(dspaceBitstream, servletContext, "policies", context).getPolicies();
-
-            context.complete();
-            log.trace("Policies for bitstream(id=" + bitstreamId + ") was successfully read.");
-
-        } catch (SQLException e) {
-            processException("Someting went wrong while reading policies of bitstream(id=" + bitstreamId
-                                 + "), SQLException! Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Someting went wrong while reading policies of bitstream(id=" + bitstreamId
-                                 + "), ContextException. Message: " + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        return policies;
-    }
-
-    /**
-     * Read list of bitstreams. It throws WebApplicationException with response
-     * code INTERNAL_SERVER_ERROR(500), if there was problem while reading
-     * bitstreams from database.
-     *
-     * @param expand        This string defines which additional optional fields will be added
-     *                      to bitstream response. Individual options are separated by commas without
-     *                      spaces. The options are: "all", "parent".
-     * @param limit         How many bitstreams will be in the list. Default value is 100.
-     * @param offset        On which offset (item) the list starts. Default value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return Returns an array of bistreams. Array doesn't contain bitstreams for
-     * which the user doesn't have read permission.
-     * @throws WebApplicationException Thrown in case of a problem with reading the database or with
-     *                                 creating a context.
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Bitstream[] getBitstreams(@QueryParam("expand") String expand,
-                                     @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                     @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                     @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                     @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                     @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading bitstreams.(offset=" + offset + ",limit=" + limit + ")");
-        org.dspace.core.Context context = null;
-        List<Bitstream> bitstreams = new ArrayList<Bitstream>();
-
-        try {
-            context = createContext();
-            List<org.dspace.content.Bitstream> dspaceBitstreams = bitstreamService.findAll(context);
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Paging was badly set.");
-                limit = 100;
-                offset = 0;
-            }
-
-            // TODO If bitstream doesn't exist, throws exception.
-            for (int i = offset; (i < (offset + limit)) && (i < dspaceBitstreams.size()); i++) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceBitstreams.get(i), org.dspace.core.Constants.READ)) {
-                    if (bitstreamService.getParentObject(context, dspaceBitstreams
-                        .get(i)) != null) { // To eliminate bitstreams which cause exception, because of
-                        // reading under administrator permissions
-                        bitstreams.add(new Bitstream(dspaceBitstreams.get(i), servletContext, expand, context));
-                        writeStats(dspaceBitstreams.get(i), UsageEvent.Action.VIEW, user_ip, user_agent,
-                                   xforwardedfor, headers, request, context);
-                    }
-                }
-            }
-
-            context.complete();
-            log.trace("Bitstreams were successfully read.");
-
-        } catch (SQLException e) {
-            processException("Something went wrong while reading bitstreams from database!. Message: " + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Something went wrong while reading bitstreams, ContextException. Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        return bitstreams.toArray(new Bitstream[0]);
-    }
-
-    /**
-     * Read bitstream data. May throw WebApplicationException with the
-     * INTERNAL_SERVER_ERROR(500) code. Caused by three exceptions: IOException if
-     * there was a problem with reading bitstream file. SQLException if there was
-     * a problem while reading from database. And AuthorizeException if there was
-     * a problem with authorization of user logged to DSpace context.
-     *
-     * @param bitstreamId   Id of the bitstream, whose data will be read.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return Returns response with data with file content type. It can
-     * return the NOT_FOUND(404) response code in case of wrong bitstream
-     * id. Or response code UNAUTHORIZED(401) if user is not
-     * allowed to read bitstream.
-     * @throws WebApplicationException Thrown if there was a problem: reading the file data; or reading
-     *                                 the database; or creating the context; or with authorization.
-     */
-    @GET
-    @Path("/{bitstream_id}/retrieve")
-    public javax.ws.rs.core.Response getBitstreamData(@PathParam("bitstream_id") String bitstreamId,
-                                                      @QueryParam("userIP") String user_ip,
-                                                      @QueryParam("userAgent") String user_agent,
-                                                      @QueryParam("xforwardedfor") String xforwardedfor,
-                                                      @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading data of bitstream(id=" + bitstreamId + ").");
-        org.dspace.core.Context context = null;
-        InputStream inputStream = null;
-        String type = null;
-        String name = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.READ);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            log.trace("Bitstream(id=" + bitstreamId + ") data was successfully read.");
-            inputStream = bitstreamService.retrieve(context, dspaceBitstream);
-            type = dspaceBitstream.getFormat(context).getMIMEType();
-            name = dspaceBitstream.getName();
-
-            context.complete();
-        } catch (IOException e) {
-            processException("Could not read file of bitstream(id=" + bitstreamId + ")! Message: " + e, context);
-        } catch (SQLException e) {
-            processException(
-                "Something went wrong while reading bitstream(id=" + bitstreamId + ") from database! Message: " + e,
-                context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not retrieve file of bitstream(id=" + bitstreamId + "), AuthorizeException! Message: " + e,
-                context);
-        } catch (ContextException e) {
-            processException(
-                "Could not retrieve file of bitstream(id=" + bitstreamId + "), ContextException! Message: " + e
-                    .getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        return Response.ok(inputStream).type(type)
-                       .header("Content-Disposition", "attachment; filename=\"" + name + "\"")
-                       .build();
-    }
-
-    /**
-     * Add bitstream policy to all bundles containing the bitstream.
-     *
-     * @param bitstreamId   Id of bitstream in DSpace.
-     * @param policy        Policy to be added. The following attributes are not
-     *                      applied: epersonId,
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return Returns ok, if all was ok. Otherwise status code 500.
-     */
-    @POST
-    @Path("/{bitstream_id}/policy")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public javax.ws.rs.core.Response addBitstreamPolicy(@PathParam("bitstream_id") String bitstreamId,
-                                                        ResourcePolicy policy,
-                                                        @QueryParam("userIP") String user_ip,
-                                                        @QueryParam("userAgent") String user_agent,
-                                                        @QueryParam("xforwardedfor") String xforwardedfor,
-                                                        @Context HttpHeaders headers,
-                                                        @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Adding bitstream(id=" + bitstreamId + ") " + policy
-            .getAction() + " policy with permission for group(id=" + policy.getGroupId()
-                     + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            addPolicyToBitstream(context, policy, dspaceBitstream);
-
-            context.complete();
-            log.trace("Policy for bitstream(id=" + bitstreamId + ") was successfully added.");
-
-        } catch (SQLException e) {
-            processException("Someting went wrong while adding policy to bitstream(id=" + bitstreamId
-                                 + "), SQLException! Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Someting went wrong while adding policy to bitstream(id=" + bitstreamId
-                                 + "), ContextException. Message: " + e.getMessage(), context);
-        } catch (AuthorizeException e) {
-            processException("Someting went wrong while adding policy to bitstream(id=" + bitstreamId
-                                 + "), AuthorizeException! Message: " + e, context);
-        } finally {
-            processFinally(context);
-        }
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Update bitstream metadata. Replaces everything on targeted bitstream.
-     * May throw WebApplicationException caused by two exceptions:
-     * SQLException, if there was a problem with the database. AuthorizeException if
-     * there was a problem with the authorization to edit bitstream metadata.
-     *
-     * @param bitstreamId   Id of bistream to be updated.
-     * @param bitstream     Bitstream with will be placed. It must have filled user
-     *                      credentials.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response codes: OK(200), NOT_FOUND(404) if bitstream does
-     * not exist and UNAUTHORIZED(401) if user is not allowed to write
-     * to bitstream.
-     * @throws WebApplicationException Thrown when: Error reading from database; or error
-     *                                 creating context; or error regarding bitstream authorization.
-     */
-    @PUT
-    @Path("/{bitstream_id}")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response updateBitstream(@PathParam("bitstream_id") String bitstreamId, Bitstream bitstream,
-                                    @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                    @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                    @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Updating bitstream(id=" + bitstreamId + ") metadata.");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            log.trace("Updating bitstream metadata.");
-
-            dspaceBitstream.setDescription(context, bitstream.getDescription());
-            if (getMimeType(bitstream.getName()) == null) {
-                BitstreamFormat unknownFormat = bitstreamFormatService.findUnknown(context);
-                bitstreamService.setFormat(context, dspaceBitstream, unknownFormat);
-            } else {
-                BitstreamFormat guessedFormat = bitstreamFormatService
-                    .findByMIMEType(context, getMimeType(bitstream.getName()));
-                bitstreamService.setFormat(context, dspaceBitstream, guessedFormat);
-            }
-            dspaceBitstream.setName(context, bitstream.getName());
-            Integer sequenceId = bitstream.getSequenceId();
-            if (sequenceId != null && sequenceId.intValue() != -1) {
-                dspaceBitstream.setSequenceID(sequenceId);
-            }
-
-            bitstreamService.update(context, dspaceBitstream);
-
-            if (bitstream.getPolicies() != null) {
-                log.trace("Updating bitstream policies.");
-
-                // Remove all old bitstream policies.
-                authorizeService.removeAllPolicies(context, dspaceBitstream);
-
-                // Add all new bitstream policies
-                for (ResourcePolicy policy : bitstream.getPolicies()) {
-                    addPolicyToBitstream(context, policy, dspaceBitstream);
-                }
-            }
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not update bitstream(id=" + bitstreamId + ") metadata, SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not update bitstream(id=" + bitstreamId + ") metadata, AuthorizeException. Message: " + e,
-                context);
-        } catch (ContextException e) {
-            processException(
-                "Could not update bitstream(id=" + bitstreamId + ") metadata, ContextException. Message: " + e
-                    .getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Bitstream metadata(id=" + bitstreamId + ") were successfully updated.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Update bitstream data. Changes bitstream data by editing database rows.
-     * May throw WebApplicationException caused by: SQLException if there was
-     * a problem editing or reading the database, IOException if there was
-     * a problem with reading from InputStream, Exception if there was another
-     * problem.
-     *
-     * @param bitstreamId   Id of bistream to be updated.
-     * @param is            InputStream filled with new data.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response if bitstream was updated. Response codes:
-     * OK(200), NOT_FOUND(404) if id of bitstream was bad. And
-     * UNAUTHORIZED(401) if user is not allowed to update bitstream.
-     * @throws WebApplicationException This exception can be thrown in this cases: Problem with
-     *                                 reading or writing to database. Or problem with reading from
-     *                                 InputStream.
-     */
-    // TODO Change to better logic, without editing database.
-    @PUT
-    @Path("/{bitstream_id}/data")
-    public Response updateBitstreamData(@PathParam("bitstream_id") String bitstreamId, InputStream is,
-                                        @QueryParam("userIP") String user_ip,
-                                        @QueryParam("userAgent") String user_agent,
-                                        @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                        @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Updating bitstream(id=" + bitstreamId + ") data.");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            log.trace("Creating new bitstream.");
-
-            UUID newBitstreamId = bitstreamStorageService.store(context, dspaceBitstream, is);
-            log.trace("Bitstream data stored: " + newBitstreamId);
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not update bitstream(id=" + bitstreamId + ") data, SQLException. Message: " + e,
-                             context);
-        } catch (IOException e) {
-            processException("Could not update bitstream(id=" + bitstreamId + ") data, IOException. Message: " + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not update bitstream(id=" + bitstreamId + ") data, ContextException. Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Bitstream(id=" + bitstreamId + ") data was successfully updated.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Delete bitstream from all bundles in DSpace. May throw
-     * WebApplicationException, which can be caused by three exceptions.
-     * SQLException if there was a problem reading from database or removing
-     * from database. AuthorizeException, if user doesn't have permission to delete
-     * the bitstream or file. IOException, if there was a problem deleting the file.
-     *
-     * @param bitstreamId   Id of bitstream to be deleted.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response codes: OK(200), NOT_FOUND(404) if bitstream of
-     * that id does not exist and UNAUTHORIZED(401) if user is not
-     * allowed to delete bitstream.
-     * @throws WebApplicationException Can be thrown if there was a problem reading or editing
-     *                                 the database. Or problem deleting the file. Or problem with
-     *                                 authorization to bitstream and bundles. Or problem with
-     *                                 creating context.
-     */
-    @DELETE
-    @Path("/{bitstream_id}")
-    public Response deleteBitstream(@PathParam("bitstream_id") String bitstreamId, @QueryParam("userIP") String user_ip,
-                                    @QueryParam("userAgent") String user_agent,
-                                    @QueryParam("xforwardedfor") String xforwardedfor,
-                                    @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting bitstream(id=" + bitstreamId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.DELETE);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            log.trace("Deleting bitstream from all bundles.");
-            bitstreamService.delete(context, dspaceBitstream);
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not delete bitstream(id=" + bitstreamId + "), SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete bitstream(id=" + bitstreamId + "), AuthorizeException. Message: " + e,
-                             context);
-        } catch (IOException e) {
-            processException("Could not delete bitstream(id=" + bitstreamId + "), IOException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not delete bitstream(id=" + bitstreamId + "), ContextException. Message:" + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Bitstream(id=" + bitstreamId + ") was successfully deleted.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Delete policy.
-     *
-     * @param bitstreamId   Id of the DSpace bitstream whose policy will be deleted.
-     * @param policyId      Id of the policy to delete.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @return It returns Ok, if all was ok. Otherwise status code 500.
-     */
-    @DELETE
-    @Path("/{bitstream_id}/policy/{policy_id}")
-    public javax.ws.rs.core.Response deleteBitstreamPolicy(@PathParam("bitstream_id") String bitstreamId,
-                                                           @PathParam("policy_id") Integer policyId,
-                                                           @QueryParam("userIP") String user_ip,
-                                                           @QueryParam("userAgent") String user_agent,
-                                                           @QueryParam("xforwardedfor") String xforwardedfor,
-                                                           @Context HttpHeaders headers,
-                                                           @Context HttpServletRequest request)
-        throws WebApplicationException {
-        log.info("Deleting  policy(id=" + policyId + ") from bitstream(id=" + bitstreamId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Bitstream dspaceBitstream = findBitstream(context, bitstreamId,
-                                                                         org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceBitstream, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            org.dspace.authorize.ResourcePolicy resourcePolicy = resourcePolicyService.find(context, policyId);
-            if (resourcePolicy.getdSpaceObject().getID().equals(dspaceBitstream.getID()) && authorizeService
-                .authorizeActionBoolean(context, dspaceBitstream, org.dspace.core.Constants.REMOVE)) {
-
-                try {
-                    resourcePolicyService.delete(context, resourcePolicy);
-                } catch (AuthorizeException e) {
-                    processException(
-                        "Someting went wrong while deleting policy(id=" + policyId + ") to bitstream(id=" + bitstreamId
-                            + "), AuthorizeException! Message: " + e, context);
-                }
-                log.trace("Policy for bitstream(id=" + bitstreamId + ") was successfully removed.");
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException(
-                "Someting went wrong while deleting policy(id=" + policyId + ") to bitstream(id=" + bitstreamId
-                    + "), SQLException! Message: " + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Someting went wrong while deleting policy(id=" + policyId + ") to bitstream(id=" + bitstreamId
-                    + "), ContextException. Message: " + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Return the MIME type of the file, by file extension.
-     *
-     * @param name Name of file.
-     * @return String filled with type of file in MIME style.
-     */
-    static String getMimeType(String name) {
-        return URLConnection.guessContentTypeFromName(name);
-    }
-
-    /**
-     * Add policy(org.dspace.rest.common.ResourcePolicy) to bitstream.
-     *
-     * @param context         Context to create DSpace ResourcePolicy.
-     * @param policy          Policy which will be added to bitstream.
-     * @param dspaceBitstream DSpace Bitstream object.
-     * @throws SQLException       An exception that provides information on a database access error or other errors.
-     * @throws AuthorizeException Exception indicating the current user of the context does not have permission
-     *                            to perform a particular action.
-     */
-    private void addPolicyToBitstream(org.dspace.core.Context context, ResourcePolicy policy,
-                                      org.dspace.content.Bitstream dspaceBitstream)
-        throws SQLException, AuthorizeException {
-        org.dspace.authorize.ResourcePolicy dspacePolicy =
-                resourcePolicyService.create(context, null,
-                                             groupService.findByIdOrLegacyId(context, policy.getGroupId()));
-        dspacePolicy.setAction(policy.getActionInt());
-        dspacePolicy.setdSpaceObject(dspaceBitstream);
-        dspacePolicy.setStartDate(policy.getStartDate());
-        dspacePolicy.setEndDate(policy.getEndDate());
-        dspacePolicy.setRpDescription(policy.getRpDescription());
-        dspacePolicy.setRpName(policy.getRpName());
-
-        resourcePolicyService.update(context, dspacePolicy);
-    }
-
-    /**
-     * Find bitstream from DSpace database. This encapsulates the
-     * org.dspace.content.Bitstream.find method with a check whether the item exists and
-     * whether the user logged into the context has permission to preform the requested action.
-     *
-     * @param context Context of actual logged user.
-     * @param id      Id of bitstream in DSpace.
-     * @param action  Constant from org.dspace.core.Constants.
-     * @return Returns DSpace bitstream.
-     * @throws WebApplicationException Is thrown when item with passed id is not exists and if user
-     *                                 has no permission to do passed action.
-     */
-    private org.dspace.content.Bitstream findBitstream(org.dspace.core.Context context, String id, int action)
-        throws WebApplicationException {
-        org.dspace.content.Bitstream bitstream = null;
-        try {
-            bitstream = bitstreamService.findByIdOrLegacyId(context, id);
-
-            if ((bitstream == null) || (bitstreamService.getParentObject(context, bitstream) == null)) {
-                context.abort();
-                log.warn("Bitstream(id=" + id + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            } else if (!authorizeService.authorizeActionBoolean(context, bitstream, action)) {
-                context.abort();
-                if (context.getCurrentUser() != null) {
-                    log.error("User(" + context.getCurrentUser().getEmail() + ") doesn't have the permission to "
-                                  + getActionString(action) + " bitstream!");
-                } else {
-                    log.error(
-                        "User(anonymous) doesn't have the permission to " + getActionString(action) + " bitsteam!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-        } catch (SQLException e) {
-            processException("Something went wrong while finding bitstream. SQLException, Message:" + e, context);
-        }
-        return bitstream;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java b/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
deleted file mode 100644
index 395a0af766..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/CollectionsResource.java
+++ /dev/null
@@ -1,755 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import static org.dspace.content.service.DSpaceObjectService.MD_COPYRIGHT_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_INTRODUCTORY_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_LICENSE;
-import static org.dspace.content.service.DSpaceObjectService.MD_NAME;
-import static org.dspace.content.service.DSpaceObjectService.MD_SHORT_DESCRIPTION;
-import static org.dspace.content.service.DSpaceObjectService.MD_SIDEBAR_TEXT;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.ItemService;
-import org.dspace.content.service.WorkspaceItemService;
-import org.dspace.core.Constants;
-import org.dspace.core.LogHelper;
-import org.dspace.rest.common.Collection;
-import org.dspace.rest.common.Item;
-import org.dspace.rest.common.MetadataEntry;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.usage.UsageEvent;
-import org.dspace.workflow.WorkflowService;
-import org.dspace.workflow.factory.WorkflowServiceFactory;
-
-/**
- * This class provides all CRUD operation over collections.
- *
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-@Path("/collections")
-public class CollectionsResource extends Resource {
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
-    protected WorkflowService workflowService = WorkflowServiceFactory.getInstance().getWorkflowService();
-
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(CollectionsResource.class);
-
-    /**
-     * Return instance of collection with passed id. You can add more properties
-     * through expand parameter.
-     *
-     * @param collectionId  Id of collection in DSpace.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of collection. Options are: "all", "parentCommunityList",
-     *                      "parentCommunity", "items", "license" and "logo". If you want
-     *                      to use multiple options, it must be separated by commas.
-     * @param limit         Limit value for items in list in collection. Default value is
-     *                      100.
-     * @param offset        Offset of start index in list of items of collection. Default
-     *                      value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of collection. It can also return status code
-     * NOT_FOUND(404) if id of collection is incorrect or status code
-     * UNATHORIZED(401) if user has no permission to read collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading
-     *                                 (SQLException) or problem with creating
-     *                                 context(ContextException). It is thrown by NOT_FOUND and
-     *                                 UNATHORIZED status codes, too.
-     */
-    @GET
-    @Path("/{collection_id}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.Collection getCollection(@PathParam("collection_id") String collectionId,
-                                                           @QueryParam("expand") String expand,
-                                                           @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                                           @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                                           @QueryParam("userIP") String user_ip,
-                                                           @QueryParam("userAgent") String user_agent,
-                                                           @QueryParam("xforwardedfor") String xforwardedfor,
-                                                           @Context HttpHeaders headers,
-                                                           @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading collection(id=" + collectionId + ").");
-        org.dspace.core.Context context = null;
-        Collection collection = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
-                                                                            org.dspace.core.Constants.READ);
-            writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            collection = new Collection(dspaceCollection, servletContext, expand, context, limit, offset);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not read collection(id=" + collectionId + "), SQLException. Message: " + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not read collection(id=" + collectionId + "), ContextException. Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Collection(id=" + collectionId + ") has been successfully read.");
-        return collection;
-    }
-
-    /**
-     * Return array of all collections in DSpace. You can add more properties
-     * through expand parameter.
-     *
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of collection. Options are: "all", "parentCommunityList",
-     *                      "parentCommunity", "items", "license" and "logo". If you want
-     *                      to use multiple options, it must be separated by commas.
-     * @param limit         Limit value for items in list in collection. Default value is
-     *                      100.
-     * @param offset        Offset of start index in list of items of collection. Default
-     *                      value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collections as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of collection, on which has logged user permission
-     * to view.
-     * @throws WebApplicationException It is thrown when was problem with database reading
-     *                                 (SQLException) or problem with creating
-     *                                 context(ContextException).
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.Collection[] getCollections(@QueryParam("expand") String expand,
-                                                              @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                                              @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                                              @QueryParam("userIP") String user_ip,
-                                                              @QueryParam("userAgent") String user_agent,
-                                                              @QueryParam("xforwardedfor") String xforwardedfor,
-                                                              @Context HttpHeaders headers,
-                                                              @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading all collections.(offset=" + offset + ",limit=" + limit + ")");
-        org.dspace.core.Context context = null;
-        List<Collection> collections = new ArrayList<>();
-
-        try {
-            context = createContext();
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Paging was badly set.");
-                limit = 100;
-                offset = 0;
-            }
-
-            List<org.dspace.content.Collection> dspaceCollections = collectionService.findAll(context, limit, offset);
-            for (org.dspace.content.Collection dspaceCollection : dspaceCollections) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCollection, org.dspace.core.Constants.READ)) {
-                    Collection collection = new org.dspace.rest.common.Collection(dspaceCollection, servletContext,
-                                                                                  null, context, limit,
-                                                                                  offset);
-                    collections.add(collection);
-                    writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent,
-                               xforwardedfor, headers, request, context);
-                }
-            }
-            context.complete();
-        } catch (SQLException e) {
-            processException("Something went wrong while reading collections from database. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Something went wrong while reading collections, ContextError. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("All collections were successfully read.");
-        return collections.toArray(new org.dspace.rest.common.Collection[0]);
-    }
-
-    /**
-     * Return array of items in collection. You can add more properties to items
-     * with expand parameter.
-     *
-     * @param collectionId  Id of collection in DSpace.
-     * @param expand        String which define, what additional properties will be in
-     *                      returned item. Options are separeted by commas and are: "all",
-     *                      "metadata", "parentCollection", "parentCollectionList",
-     *                      "parentCommunityList" and "bitstreams".
-     * @param limit         Limit value for items in array. Default value is 100.
-     * @param offset        Offset of start index in array of items of collection. Default
-     *                      value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of items, on which has logged user permission to
-     * read. It can also return status code NOT_FOUND(404) if id of
-     * collection is incorrect or status code UNATHORIZED(401) if user
-     * has no permission to read collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading
-     *                                 (SQLException) or problem with creating
-     *                                 context(ContextException). It is thrown by NOT_FOUND and
-     *                                 UNATHORIZED status codes, too.
-     */
-    @GET
-    @Path("/{collection_id}/items")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.Item[] getCollectionItems(@PathParam("collection_id") String collectionId,
-                                                            @QueryParam("expand") String expand,
-                                                            @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                                            @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                                            @QueryParam("userIP") String user_ip,
-                                                            @QueryParam("userAgent") String user_agent,
-                                                            @QueryParam("xforwardedfor") String xforwardedfor,
-                                                            @Context HttpHeaders headers,
-                                                            @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading collection(id=" + collectionId + ") items.");
-        org.dspace.core.Context context = null;
-        List<Item> items = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
-                                                                            org.dspace.core.Constants.READ);
-            writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            items = new ArrayList<>();
-            Iterator<org.dspace.content.Item> dspaceItems = itemService.findByCollection(context, dspaceCollection,
-                                                                                         limit, offset);
-
-            while (dspaceItems.hasNext()) {
-                org.dspace.content.Item dspaceItem = dspaceItems.next();
-
-                if (itemService.isItemListedForUser(context, dspaceItem)) {
-                    items.add(new Item(dspaceItem, servletContext, expand, context));
-                    writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
-                               headers, request, context);
-                }
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read collection items, SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not read collection items, ContextException. Message: " + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("All items in collection(id=" + collectionId + ") were successfully read.");
-        return items.toArray(new Item[0]);
-    }
-
-    /**
-     * Create item in collection. Item can be without filled metadata.
-     *
-     * @param collectionId  Id of collection in which will be item created.
-     * @param item          Item filled only with metadata, other variables are ignored.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return status code with item. Return status (OK)200 if item was
-     * created. NOT_FOUND(404) if id of collection does not exists.
-     * UNAUTHORIZED(401) if user have not permission to write items in
-     * collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading or
-     *                                 writing (SQLException) or problem with creating
-     *                                 context(ContextException) or problem with authorization to
-     *                                 collection or IOException or problem with index item into
-     *                                 browse index. It is thrown by NOT_FOUND and UNATHORIZED
-     *                                 status codes, too.
-     */
-    @POST
-    @Path("/{collection_id}/items")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Item addCollectionItem(@PathParam("collection_id") String collectionId, Item item,
-                                  @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                  @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                  @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Create item in collection(id=" + collectionId + ").");
-        org.dspace.core.Context context = null;
-        Item returnItem = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
-                                                                            org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            log.trace("Creating item in collection(id=" + collectionId + ").");
-            org.dspace.content.WorkspaceItem workspaceItem = workspaceItemService
-                .create(context, dspaceCollection, false);
-            org.dspace.content.Item dspaceItem = workspaceItem.getItem();
-
-            log.trace("Adding metadata to item(id=" + dspaceItem.getID() + ").");
-            if (item.getMetadata() != null) {
-                for (MetadataEntry entry : item.getMetadata()) {
-                    String data[] = mySplit(entry.getKey());
-                    itemService.addMetadata(context, dspaceItem, data[0], data[1], data[2], entry.getLanguage(),
-                                            entry.getValue());
-                }
-            }
-
-            workspaceItemService.update(context, workspaceItem);
-
-            try {
-                // Must insert the item into workflow
-                log.trace("Starting workflow for item(id=" + dspaceItem.getID() + ").");
-                workflowService.start(context, workspaceItem);
-            } catch (Exception e) {
-                log.error(
-                    LogHelper.getHeader(context, "Error while starting workflow",
-                            "Item id: " + dspaceItem.getID()),
-                    e);
-                throw new ContextException("Error while starting workflow for item(id=" + dspaceItem.getID() + ")", e);
-            }
-
-            returnItem = new Item(workspaceItem.getItem(), servletContext, "", context);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not add item into collection(id=" + collectionId + "), SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not add item into collection(id=" + collectionId + "), AuthorizeException. Message: " + e,
-                context);
-        } catch (ContextException e) {
-            processException(
-                "Could not add item into collection(id=" + collectionId + "), ContextException. Message: " + e
-                    .getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info(
-            "Item successfully created in collection(id=" + collectionId + "). Item handle=" + returnItem.getHandle());
-        return returnItem;
-    }
-
-    /**
-     * Update collection. It replace all properties.
-     *
-     * @param collectionId  Id of collection in DSpace.
-     * @param collection    Collection which will replace properties of actual collection.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response 200 if was everything all right. Otherwise 400
-     * when id of community was incorrect or 401 if was problem with
-     * permission to write into collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading or
-     *                                 writing. Or problem with authorization to collection. Or
-     *                                 problem with creating context.
-     */
-    @PUT
-    @Path("/{collection_id}")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response updateCollection(@PathParam("collection_id") String collectionId,
-                                     org.dspace.rest.common.Collection collection, @QueryParam("userIP") String user_ip,
-                                     @QueryParam("userAgent") String user_agent,
-                                     @QueryParam("xforwardedfor") String xforwardedfor,
-                                     @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Updating collection(id=" + collectionId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
-                                                                            org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_NAME, collection.getName(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_LICENSE, collection.getLicense(), null);
-
-            // dspaceCollection.setLogo(collection.getLogo()); // TODO Add this option.
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_COPYRIGHT_TEXT, collection.getCopyrightText(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_INTRODUCTORY_TEXT, collection.getIntroductoryText(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_SHORT_DESCRIPTION, collection.getShortDescription(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_SIDEBAR_TEXT, collection.getSidebarText(), null);
-            collectionService.update(context, dspaceCollection);
-
-            context.complete();
-
-        } catch (ContextException e) {
-            processException(
-                "Could not update collection(id=" + collectionId + "), ContextException. Message: " + e.getMessage(),
-                context);
-        } catch (SQLException e) {
-            processException("Could not update collection(id=" + collectionId + "), SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not update collection(id=" + collectionId + "), AuthorizeException. Message: " + e,
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Collection(id=" + collectionId + ") successfully updated.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Delete collection.
-     *
-     * @param collectionId  Id of collection which will be deleted.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response code OK(200) if was everything all right.
-     * Otherwise return NOT_FOUND(404) if was id of community or
-     * collection incorrect. Or (UNAUTHORIZED)401 if was problem with
-     * permission to community or collection.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or writing. Or problem with deleting
-     *                                 collection caused by IOException or authorization.
-     */
-    @DELETE
-    @Path("/{collection_id}")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response deleteCollection(@PathParam("collection_id") String collectionId,
-                                     @QueryParam("userIP") String user_ip,
-                                     @QueryParam("userAgent") String user_agent,
-                                     @QueryParam("xforwardedfor") String xforwardedfor,
-                                     @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Delete collection(id=" + collectionId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Collection dspaceCollection = findCollection(context, collectionId,
-                                                                            org.dspace.core.Constants.DELETE);
-
-            writeStats(dspaceCollection, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            collectionService.delete(context, dspaceCollection);
-            collectionService.update(context, dspaceCollection);
-
-            context.complete();
-        } catch (ContextException e) {
-            processException(
-                "Could not delete collection(id=" + collectionId + "), ContextException. Message: " + e.getMessage(),
-                context);
-        } catch (SQLException e) {
-            processException("Could not delete collection(id=" + collectionId + "), SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete collection(id=" + collectionId + "), AuthorizeException. Message: " + e,
-                             context);
-        } catch (IOException e) {
-            processException("Could not delete collection(id=" + collectionId + "), IOException. Message: " + e,
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Collection(id=" + collectionId + ") was successfully deleted.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Delete item in collection.
-     *
-     * @param collectionId  Id of collection which will be deleted.
-     * @param itemId        Id of item in colletion.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return It returns status code: OK(200). NOT_FOUND(404) if item or
-     * collection was not found, UNAUTHORIZED(401) if user is not
-     * allowed to delete item or permission to write into collection.
-     * @throws WebApplicationException It can be thrown by: SQLException, when was problem with
-     *                                 database reading or writting. AuthorizeException, when was
-     *                                 problem with authorization to item or collection.
-     *                                 IOException, when was problem with removing item.
-     *                                 ContextException, when was problem with creating context of
-     *                                 DSpace.
-     */
-    @DELETE
-    @Path("/{collection_id}/items/{item_id}")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response deleteCollectionItem(@PathParam("collection_id") String collectionId,
-                                         @PathParam("item_id") String itemId,
-                                         @QueryParam("userIP") String user_ip,
-                                         @QueryParam("userAgent") String user_agent,
-                                         @QueryParam("xforwardedfor") String xforwardedfor,
-                                         @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Delete item(id=" + itemId + ") in collection(id=" + collectionId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Collection dspaceCollection = collectionService
-                .findByIdOrLegacyId(context, collectionId);
-            org.dspace.content.Item item = itemService.findByIdOrLegacyId(context, itemId);
-
-
-            if (dspaceCollection == null) {
-                //throw collection not exist
-                log.warn("Collection(id=" + itemId + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-
-            if (item == null) {
-                //throw item not exist
-                log.warn("Item(id=" + itemId + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-
-            if (!authorizeService.authorizeActionBoolean(context, item, Constants.REMOVE)
-                || !authorizeService.authorizeActionBoolean(context, dspaceCollection, Constants.REMOVE)) {
-                //throw auth
-                if (context.getCurrentUser() != null) {
-                    log.error(
-                        "User(" + context.getCurrentUser().getEmail() + ") does not have permission to delete item!");
-                } else {
-                    log.error("User(anonymous) has not permission to delete item!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            collectionService.removeItem(context, dspaceCollection, item);
-            collectionService.update(context, dspaceCollection);
-            itemService.update(context, item);
-
-            writeStats(dspaceCollection, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-            writeStats(item, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor, headers, request, context);
-
-            context.complete();
-
-        } catch (ContextException e) {
-            processException("Could not delete item(id=" + itemId + ") in collection(id=" + collectionId
-                                 + "), ContextException. Message: " + e.getMessage(), context);
-        } catch (SQLException e) {
-            processException("Could not delete item(id=" + itemId + ") in collection(id=" + collectionId
-                                 + "), SQLException. Message: " + e, context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete item(id=" + itemId + ") in collection(id=" + collectionId
-                                 + "), AuthorizeException. Message: " + e, context);
-        } catch (IOException e) {
-            processException("Could not delete item(id=" + itemId + ") in collection(id=" + collectionId
-                                 + "), IOException. Message: " + e, context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Item(id=" + itemId + ") in collection(id=" + collectionId + ") was successfully deleted.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Search for first collection with passed name.
-     *
-     * @param name    Name of collection.
-     * @param headers If you want to access the collection as the user logged into the
-     *                context. The value of the "rest-dspace-token" header must be set
-     *                to the token received from the login method response.
-     * @return It returns null if collection was not found. Otherwise returns
-     * first founded collection.
-     * @throws WebApplicationException A general exception a servlet can throw when it encounters difficulty.
-     */
-    @POST
-    @Path("/find-collection")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Collection findCollectionByName(String name, @Context HttpHeaders headers) throws WebApplicationException {
-        log.info("Searching for first collection with name=" + name + ".");
-        org.dspace.core.Context context = null;
-        Collection collection = null;
-
-        try {
-            context = createContext();
-
-            List<org.dspace.content.Collection> dspaceCollections = collectionService.findAll(context);
-            //TODO, this would be more efficient with a findByName query
-
-            for (org.dspace.content.Collection dspaceCollection : dspaceCollections) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCollection, org.dspace.core.Constants.READ)) {
-                    if (dspaceCollection.getName().equals(name)) {
-                        collection = new Collection(dspaceCollection, servletContext, "", context, 100, 0);
-                        break;
-                    }
-                }
-            }
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException(
-                "Something went wrong while searching for collection(name=" + name + ") from database. Message: "
-                    + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Something went wrong while searching for collection(name=" + name + "), ContextError. Message: "
-                    + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        if (collection == null) {
-            log.info("Collection was not found.");
-        } else {
-            log.info("Collection was found with id(" + collection.getUUID() + ").");
-        }
-        return collection;
-    }
-
-    /**
-     * Find collection from DSpace database. It is encapsulation of method
-     * org.dspace.content.Collection.find with checking if item exist and if
-     * user logged into context has permission to do passed action.
-     *
-     * @param context Context of actual logged user.
-     * @param id      Id of collection in DSpace.
-     * @param action  Constant from org.dspace.core.Constants.
-     * @return It returns DSpace collection.
-     * @throws WebApplicationException Is thrown when item with passed id is not exists and if user
-     *                                 has no permission to do passed action.
-     */
-    private org.dspace.content.Collection findCollection(org.dspace.core.Context context, String id, int action)
-        throws WebApplicationException {
-        org.dspace.content.Collection collection = null;
-        try {
-            collection = collectionService.findByIdOrLegacyId(context, id);
-
-            if (collection == null) {
-                context.abort();
-                log.warn("Collection(id=" + id + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            } else if (!authorizeService.authorizeActionBoolean(context, collection, action)) {
-                context.abort();
-                if (context.getCurrentUser() != null) {
-                    log.error("User(" + context.getCurrentUser().getEmail() + ") has not permission to "
-                                  + getActionString(action) + " collection!");
-                } else {
-                    log.error("User(anonymous) has not permission to " + getActionString(action) + " collection!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-        } catch (SQLException e) {
-            processException("Something get wrong while finding collection(id=" + id + "). SQLException, Message: " + e,
-                             context);
-        }
-        return collection;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java b/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java
deleted file mode 100644
index c3d4840910..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/CommunitiesResource.java
+++ /dev/null
@@ -1,1052 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import static org.dspace.content.service.DSpaceObjectService.MD_COPYRIGHT_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_INTRODUCTORY_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_LICENSE;
-import static org.dspace.content.service.DSpaceObjectService.MD_NAME;
-import static org.dspace.content.service.DSpaceObjectService.MD_SHORT_DESCRIPTION;
-import static org.dspace.content.service.DSpaceObjectService.MD_SIDEBAR_TEXT;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.CommunityService;
-import org.dspace.rest.common.Collection;
-import org.dspace.rest.common.Community;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.usage.UsageEvent;
-
-/**
- * Class which provides CRUD methods over communities.
- *
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-@Path("/communities")
-public class CommunitiesResource extends Resource {
-    protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(CommunitiesResource.class);
-
-    /**
-     * Returns community with basic properties. If you want more, use expand
-     * parameter or method for community collections or subcommunities.
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of community. Options are: "all", "parentCommunity",
-     *                      "collections", "subCommunities" and "logo". If you want to use
-     *                      multiple options, it must be separated by commas.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of org.dspace.rest.common.Community.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading. Also if id of community is incorrect
-     *                                 or logged user into context has no permission to read.
-     */
-    @GET
-    @Path("/{community_id}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Community getCommunity(@PathParam("community_id") String communityId, @QueryParam("expand") String expand,
-                                  @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                  @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                  @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading community(id=" + communityId + ").");
-        org.dspace.core.Context context = null;
-        Community community = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId,
-                                                                         org.dspace.core.Constants.READ);
-            writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            community = new Community(dspaceCommunity, servletContext, expand, context);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not read community(id=" + communityId + "), SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not read community(id=" + communityId + "), ContextException. Message:" + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.trace("Community(id=" + communityId + ") was successfully read.");
-        return community;
-    }
-
-    /**
-     * Return all communities in DSpace.
-     *
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of community. Options are: "all", "parentCommunity",
-     *                      "collections", "subCommunities" and "logo". If you want to use
-     *                      multiple options, it must be separated by commas.
-     * @param limit         Maximum communities in array. Default value is 100.
-     * @param offset        Index from which will start array of communities.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of communities.
-     * @throws WebApplicationException It can be caused by creating context or while was problem
-     *                                 with reading community from database(SQLException).
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Community[] getCommunities(@QueryParam("expand") String expand,
-                                      @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                      @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                      @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                      @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                      @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading all communities.(offset=" + offset + " ,limit=" + limit + ").");
-        org.dspace.core.Context context = null;
-        ArrayList<Community> communities = null;
-
-        try {
-            context = createContext();
-
-            List<org.dspace.content.Community> dspaceCommunities = communityService.findAll(context);
-            communities = new ArrayList<>();
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Paging was badly set, using default values.");
-                limit = 100;
-                offset = 0;
-            }
-
-            for (int i = offset; (i < (offset + limit)) && i < dspaceCommunities.size(); i++) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCommunities.get(i), org.dspace.core.Constants.READ)) {
-                    Community community = new Community(dspaceCommunities.get(i), servletContext, expand, context);
-                    writeStats(dspaceCommunities.get(i), UsageEvent.Action.VIEW, user_ip, user_agent,
-                               xforwardedfor, headers, request, context);
-                    communities.add(community);
-                }
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read communities, SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not read communities, ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("All communities successfully read.");
-        return communities.toArray(new Community[0]);
-    }
-
-    /**
-     * Return all top communities in DSpace. Top communities are communities on
-     * the root of tree.
-     *
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of community. Options are: "all", "parentCommunity",
-     *                      "collections", "subCommunities" and "logo". If you want to use
-     *                      multiple options, it must be separated by commas.
-     * @param limit         Maximum communities in array. Default value is 100.
-     * @param offset        Index from which will start array of communities. Default
-     *                      value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of top communities.
-     * @throws WebApplicationException It can be caused by creating context or while was problem
-     *                                 with reading community from database(SQLException).
-     */
-    @GET
-    @Path("/top-communities")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Community[] getTopCommunities(@QueryParam("expand") String expand,
-                                         @QueryParam("limit") @DefaultValue("20") Integer limit,
-                                         @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                         @QueryParam("userIP") String user_ip,
-                                         @QueryParam("userAgent") String user_agent,
-                                         @QueryParam("xforwardedfor") String xforwardedfor,
-                                         @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading all top communities.(offset=" + offset + " ,limit=" + limit + ").");
-        org.dspace.core.Context context = null;
-        ArrayList<Community> communities = null;
-
-        try {
-            context = createContext();
-
-            List<org.dspace.content.Community> dspaceCommunities = communityService.findAllTop(context);
-            communities = new ArrayList<>();
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Paging was badly set, using default values.");
-                limit = 100;
-                offset = 0;
-            }
-
-            for (int i = offset; (i < (offset + limit)) && i < dspaceCommunities.size(); i++) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCommunities.get(i), org.dspace.core.Constants.READ)) {
-                    Community community = new Community(dspaceCommunities.get(i), servletContext, expand, context);
-                    writeStats(dspaceCommunities.get(i), UsageEvent.Action.VIEW, user_ip, user_agent,
-                               xforwardedfor, headers, request, context);
-                    communities.add(community);
-                }
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read top communities, SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not read top communities, ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("All top communities successfully read.");
-        return communities.toArray(new Community[0]);
-    }
-
-    /**
-     * Return all collections of community.
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of collection. Options are: "all", "parentCommunityList",
-     *                      "parentCommunity", "items", "license" and "logo". If you want
-     *                      to use multiple options, it must be separated by commas.
-     * @param limit         Maximum collection in array. Default value is 100.
-     * @param offset        Index from which will start array of collections. Default
-     *                      value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of collections of community.
-     * @throws WebApplicationException It can be caused by creating context or while was problem
-     *                                 with reading community from database(SQLException).
-     */
-    @GET
-    @Path("/{community_id}/collections")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Collection[] getCommunityCollections(@PathParam("community_id") String communityId,
-                                                @QueryParam("expand") String expand,
-                                                @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                                @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                                @QueryParam("userIP") String user_ip,
-                                                @QueryParam("userAgent") String user_agent,
-                                                @QueryParam("xforwardedfor") String xforwardedfor,
-                                                @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading community(id=" + communityId + ") collections.");
-        org.dspace.core.Context context = null;
-        ArrayList<Collection> collections = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId,
-                                                                         org.dspace.core.Constants.READ);
-            writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Pagging was badly set, using default values.");
-                limit = 100;
-                offset = 0;
-            }
-
-            collections = new ArrayList<>();
-            List<org.dspace.content.Collection> dspaceCollections = dspaceCommunity.getCollections();
-            for (int i = offset; (i < (offset + limit)) && (i < dspaceCollections.size()); i++) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCollections.get(i), org.dspace.core.Constants.READ)) {
-                    collections.add(new Collection(dspaceCollections.get(i), servletContext, expand, context, 20, 0));
-                    writeStats(dspaceCollections.get(i), UsageEvent.Action.VIEW, user_ip, user_agent,
-                               xforwardedfor, headers, request, context);
-                }
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read community(id=" + communityId + ") collections, SQLException. Message:" + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not read community(id=" + communityId + ") collections, ContextException. Message:" + e
-                    .getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Community(id=" + communityId + ") collections were successfully read.");
-        return collections.toArray(new Collection[0]);
-    }
-
-    /**
-     * Return all subcommunities of community.
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of community. Options are: "all", "parentCommunity",
-     *                      "collections", "subCommunities" and "logo". If you want to use
-     *                      multiple options, it must be separated by commas.
-     * @param limit         Maximum communities in array. Default value is 20.
-     * @param offset        Index from which will start array of communities. Default
-     *                      value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of subcommunities of community.
-     * @throws WebApplicationException It can be caused by creating context or while was problem
-     *                                 with reading community from database(SQLException).
-     */
-    @GET
-    @Path("/{community_id}/communities")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Community[] getCommunityCommunities(@PathParam("community_id") String communityId,
-                                               @QueryParam("expand") String expand,
-                                               @QueryParam("limit") @DefaultValue("20") Integer limit,
-                                               @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                               @QueryParam("userIP") String user_ip,
-                                               @QueryParam("userAgent") String user_agent,
-                                               @QueryParam("xforwardedfor") String xforwardedfor,
-                                               @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading community(id=" + communityId + ") subcommunities.");
-        org.dspace.core.Context context = null;
-        ArrayList<Community> communities = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId,
-                                                                         org.dspace.core.Constants.READ);
-            writeStats(dspaceCommunity, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Pagging was badly set, using default values.");
-                limit = 100;
-                offset = 0;
-            }
-
-            communities = new ArrayList<>();
-            List<org.dspace.content.Community> dspaceCommunities = dspaceCommunity.getSubcommunities();
-            for (int i = offset; (i < (offset + limit)) && (i < dspaceCommunities.size()); i++) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCommunities.get(i), org.dspace.core.Constants.READ)) {
-                    communities.add(new Community(dspaceCommunities.get(i), servletContext, expand, context));
-                    writeStats(dspaceCommunities.get(i), UsageEvent.Action.VIEW, user_ip, user_agent,
-                               xforwardedfor, headers, request, context);
-                }
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException(
-                "Could not read community(id=" + communityId + ") subcommunities, SQLException. Message:" + e,
-                context);
-        } catch (ContextException e) {
-            processException(
-                "Could not read community(id=" + communityId + ") subcommunities, ContextException. Message:"
-                    + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Community(id=" + communityId + ") subcommunities were successfully read.");
-        return communities.toArray(new Community[0]);
-    }
-
-    /**
-     * Create community at top level. Creating community at top level has
-     * permission only admin.
-     *
-     * @param community     Community which will be created at top level of communities.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Returns response with handle of community, if was all ok.
-     * @throws WebApplicationException It can be thrown by SQLException, AuthorizeException and
-     *                                 ContextException.
-     */
-    @POST
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Community createCommunity(Community community, @QueryParam("userIP") String user_ip,
-                                     @QueryParam("userAgent") String user_agent,
-                                     @QueryParam("xforwardedfor") String xforwardedfor,
-                                     @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Creating community at top level.");
-        org.dspace.core.Context context = null;
-        Community retCommunity = null;
-
-        try {
-            context = createContext();
-            if (!authorizeService.isAdmin(context)) {
-                context.abort();
-                String user = "anonymous";
-                if (context.getCurrentUser() != null) {
-                    user = context.getCurrentUser().getEmail();
-                }
-                log.error("User(" + user + ") has not permission to create community!");
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            org.dspace.content.Community dspaceCommunity = communityService.create(null, context);
-            writeStats(dspaceCommunity, UsageEvent.Action.CREATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_NAME, community.getName(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_COPYRIGHT_TEXT, community.getCopyrightText(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_INTRODUCTORY_TEXT, community.getIntroductoryText(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_SHORT_DESCRIPTION, community.getShortDescription(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_SIDEBAR_TEXT, community.getSidebarText(), null);
-            communityService.update(context, dspaceCommunity);
-
-            retCommunity = new Community(dspaceCommunity, servletContext, "", context);
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not create new top community, SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not create new top community, ContextException. Message: " + e.getMessage(),
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not create new top community, AuthorizeException. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Community at top level has been successfully created. Handle:" + retCommunity.getHandle());
-        return retCommunity;
-    }
-
-    /**
-     * Create collection in community.
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param collection    Collection which will be added into community.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response 200 if was everything all right. Otherwise 400
-     * when id of community was incorrect or 401 if was problem with
-     * permission to write into collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading or
-     *                                 writing. Or problem with authorization to community. Or
-     *                                 problem with creating context.
-     */
-    @POST
-    @Path("/{community_id}/collections")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Collection addCommunityCollection(@PathParam("community_id") String communityId, Collection collection,
-                                             @QueryParam("userIP") String user_ip,
-                                             @QueryParam("userAgent") String user_agent,
-                                             @QueryParam("xforwardedfor") String xforwardedfor,
-                                             @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Adding collection into community(id=" + communityId + ").");
-        org.dspace.core.Context context = null;
-        Collection retCollection = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId,
-                                                                         org.dspace.core.Constants.WRITE);
-            writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-            org.dspace.content.Collection dspaceCollection = collectionService.create(context, dspaceCommunity);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_LICENSE, collection.getLicense(), null);
-            // dspaceCollection.setLogo(collection.getLogo()); // TODO Add this option.
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_NAME, collection.getName(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_COPYRIGHT_TEXT, collection.getCopyrightText(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_INTRODUCTORY_TEXT, collection.getIntroductoryText(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_SHORT_DESCRIPTION, collection.getShortDescription(), null);
-            collectionService.setMetadataSingleValue(context, dspaceCollection,
-                    MD_SIDEBAR_TEXT, collection.getSidebarText(), null);
-            collectionService.update(context, dspaceCollection);
-            communityService.update(context, dspaceCommunity);
-            retCollection = new Collection(dspaceCollection, servletContext, "", context, 100, 0);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException(
-                "Could not add collection into community(id=" + communityId + "), SQLException. Message:" + e,
-                context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not add collection into community(id=" + communityId + "), AuthorizeException. Message:" + e,
-                context);
-        } catch (ContextException e) {
-            processException(
-                "Could not add collection into community(id=" + communityId + "), ContextException. Message:"
-                    + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Collection was successfully added into community(id=" + communityId + "). Collection handle="
-                     + retCollection.getHandle());
-        return retCollection;
-    }
-
-    /**
-     * Create subcommunity in community.
-     *
-     * @param communityId   Id of community in DSpace, in which will be created
-     *                      subcommunity.
-     * @param community     Community which will be added into community.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response 200 if was everything all right. Otherwise 400
-     * when id of community was incorrect or 401 if was problem with
-     * permission to write into collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading or
-     *                                 writing. Or problem with authorization to community. Or
-     *                                 problem with creating context.
-     */
-    @POST
-    @Path("/{community_id}/communities")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Community addCommunityCommunity(@PathParam("community_id") String communityId, Community community,
-                                           @QueryParam("userIP") String user_ip,
-                                           @QueryParam("userAgent") String user_agent,
-                                           @QueryParam("xforwardedfor") String xforwardedfor,
-                                           @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Add subcommunity into community(id=" + communityId + ").");
-        org.dspace.core.Context context = null;
-        Community retCommunity = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Community dspaceParentCommunity = findCommunity(context, communityId,
-                                                                               org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceParentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            org.dspace.content.Community dspaceCommunity = communityService
-                .createSubcommunity(context, dspaceParentCommunity);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_NAME, community.getName(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_COPYRIGHT_TEXT, community.getCopyrightText(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_INTRODUCTORY_TEXT, community.getIntroductoryText(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_SHORT_DESCRIPTION, community.getShortDescription(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_SIDEBAR_TEXT,  community.getSidebarText(), null);
-            communityService.update(context, dspaceCommunity);
-            communityService.update(context, dspaceParentCommunity);
-
-            retCommunity = new Community(dspaceCommunity, servletContext, "", context);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException(
-                "Could not add subcommunity into community(id=" + communityId + "), SQLException. Message:" + e,
-                context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not add subcommunity into community(id=" + communityId + "), AuthorizeException. Message:"
-                    + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not add subcommunity into community(id=" + communityId + "), ContextException. Message:" + e,
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Subcommunity was successfully added in community(id=" + communityId + ").");
-        return retCommunity;
-    }
-
-    /**
-     * Update community. Replace all information about community except: id,
-     * handle and expandle items.
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param community     Instance of community which will replace actual community in
-     *                      DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Response 200 if was all ok. Otherwise 400 if id was incorrect or
-     * 401 if logged user has no permission to delete community.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or writing. Or problem with writing to
-     *                                 community caused by authorization.
-     */
-    @PUT
-    @Path("/{community_id}")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response updateCommunity(@PathParam("community_id") String communityId, Community community,
-                                    @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                    @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                    @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Updating community(id=" + communityId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community dspaceCommunity = findCommunity(context, communityId,
-                                                                         org.dspace.core.Constants.WRITE);
-            writeStats(dspaceCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            // dspaceCommunity.setLogo(arg0); // TODO Add this option.
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_NAME, community.getName(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_COPYRIGHT_TEXT, community.getCopyrightText(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_INTRODUCTORY_TEXT, community.getIntroductoryText(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_SHORT_DESCRIPTION, community.getShortDescription(), null);
-            communityService.setMetadataSingleValue(context, dspaceCommunity,
-                    MD_SIDEBAR_TEXT, community.getSidebarText(), null);
-            communityService.update(context, dspaceCommunity);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not update community(id=" + communityId + "), AuthorizeException. Message:" + e,
-                             context);
-        } catch (ContextException e) {
-            processException("Could not update community(id=" + communityId + "), ContextException Message:" + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not update community(id=" + communityId + "), AuthorizeException Message:" + e,
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Community(id=" + communityId + ") has been successfully updated.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Delete community from DSpace. It delete it everything with community!
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response code OK(200) if was everything all right.
-     * Otherwise return NOT_FOUND(404) if was id of community incorrect.
-     * Or (UNAUTHORIZED)401 if was problem with permission to community.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or deleting. Or problem with deleting
-     *                                 community caused by IOException or authorization.
-     */
-    @DELETE
-    @Path("/{community_id}")
-    public Response deleteCommunity(@PathParam("community_id") String communityId, @QueryParam("userIP") String user_ip,
-                                    @QueryParam("userAgent") String user_agent,
-                                    @QueryParam("xforwardedfor") String xforwardedfor,
-                                    @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting community(id=" + communityId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community community = findCommunity(context, communityId,
-                                                                   org.dspace.core.Constants.DELETE);
-            writeStats(community, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            communityService.delete(context, community);
-            communityService.update(context, community);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not delete community(id=" + communityId + "), SQLException. Message:" + e, context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete community(id=" + communityId + "), AuthorizeException. Message:" + e,
-                             context);
-        } catch (IOException e) {
-            processException("Could not delete community(id=" + communityId + "), IOException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not delete community(id=" + communityId + "), ContextException. Message:" + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Community(id=" + communityId + ") was successfully deleted.");
-        return Response.status(Response.Status.OK).build();
-    }
-
-    /**
-     * Delete collection in community.
-     *
-     * @param communityId   Id of community in DSpace.
-     * @param collectionId  Id of collection which will be deleted.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response code OK(200) if was everything all right.
-     * Otherwise return NOT_FOUND(404) if was id of community or
-     * collection incorrect. Or (UNAUTHORIZED)401 if was problem with
-     * permission to community or collection.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or deleting. Or problem with deleting
-     *                                 collection caused by IOException or authorization.
-     */
-    @DELETE
-    @Path("/{community_id}/collections/{collection_id}")
-    public Response deleteCommunityCollection(@PathParam("community_id") String communityId,
-                                              @PathParam("collection_id") String collectionId,
-                                              @QueryParam("userIP") String user_ip,
-                                              @QueryParam("userAgent") String user_agent,
-                                              @QueryParam("xforwardedfor") String xforwardedfor,
-                                              @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting collection(id=" + collectionId + ") in community(id=" + communityId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community community = findCommunity(context, communityId,
-                                                                   org.dspace.core.Constants.WRITE);
-            org.dspace.content.Collection collection = collectionService.findByIdOrLegacyId(context, collectionId);
-
-            if (collection == null) {
-                context.abort();
-                log.warn("Collection(id=" + collectionId + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            } else if (!authorizeService
-                .authorizeActionBoolean(context, collection, org.dspace.core.Constants.REMOVE)) {
-                context.abort();
-                if (context.getCurrentUser() != null) {
-                    log.error(
-                        "User(" + context.getCurrentUser().getEmail() + ") has not permission to delete collection!");
-                } else {
-                    log.error("User(anonymous) has not permission to delete collection!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            communityService.removeCollection(context, community, collection);
-            communityService.update(context, community);
-            collectionService.update(context, collection);
-
-            writeStats(community, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-            writeStats(collection, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not delete collection(id=" + collectionId + ") in community(id=" + communityId
-                                 + "), SQLException. Message:" + e, context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete collection(id=" + collectionId + ") in community(id=" + communityId
-                                 + "), AuthorizeException. Message:" + e, context);
-        } catch (IOException e) {
-            processException("Could not delete collection(id=" + collectionId + ") in community(id=" + communityId
-                                 + "), IOException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not delete collection(id=" + collectionId + ") in community(id=" + communityId
-                                 + "), ContextExcpetion. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Collection(id=" + collectionId + ") in community(id=" + communityId + ") was successfully deleted.");
-        return Response.status(Response.Status.OK).build();
-    }
-
-    /**
-     * Delete subcommunity in community.
-     *
-     * @param parentCommunityId Id of community in DSpace.
-     * @param subcommunityId    Id of community which will be deleted.
-     * @param user_ip           User's IP address.
-     * @param user_agent        User agent string (specifies browser used and its version).
-     * @param xforwardedfor     When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                          source of the request. The proxy may be configured to add the
-     *                          "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                          so that the reverse-proxied application can get the client's IP.
-     * @param headers           If you want to access the community as the user logged into the
-     *                          context. The value of the "rest-dspace-token" header must be set
-     *                          to the token received from the login method response.
-     * @param request           Servlet's HTTP request object.
-     * @return Return response code OK(200) if was everything all right.
-     * Otherwise return NOT_FOUND(404) if was id of community or
-     * subcommunity incorrect. Or (UNAUTHORIZED)401 if was problem with
-     * permission to community or subcommunity.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or deleting. Or problem with deleting
-     *                                 subcommunity caused by IOException or authorization.
-     */
-    @DELETE
-    @Path("/{community_id}/communities/{community_id2}")
-    public Response deleteCommunityCommunity(@PathParam("community_id") String parentCommunityId,
-                                             @PathParam("community_id2") String subcommunityId,
-                                             @QueryParam("userIP") String user_ip,
-                                             @QueryParam("userAgent") String user_agent,
-                                             @QueryParam("xforwardedfor") String xforwardedfor,
-                                             @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting community(id=" + parentCommunityId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.Community parentCommunity = findCommunity(context, parentCommunityId,
-                                                                         org.dspace.core.Constants.WRITE);
-            org.dspace.content.Community subcommunity = communityService.findByIdOrLegacyId(context, subcommunityId);
-
-            if (subcommunity == null) {
-                context.abort();
-                log.warn("Subcommunity(id=" + subcommunityId + ") in community(id=" + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            } else if (!authorizeService
-                .authorizeActionBoolean(context, subcommunity, org.dspace.core.Constants.REMOVE)) {
-                context.abort();
-                if (context.getCurrentUser() != null) {
-                    log.error(
-                        "User(" + context.getCurrentUser().getEmail() + ") has not permission to delete community!");
-                } else {
-                    log.error("User(anonymous) has not permission to delete community!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            communityService.removeSubcommunity(context, parentCommunity, subcommunity);
-            communityService.update(context, parentCommunity);
-            communityService.update(context, subcommunity);
-
-            writeStats(parentCommunity, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-            writeStats(subcommunity, UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException(
-                "Could not delete subcommunity(id=" + subcommunityId + ") in community(id=" + parentCommunityId
-                    + "), SQLException. Message:" + e, context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not delete subcommunity(id=" + subcommunityId + ") in community(id=" + parentCommunityId
-                    + "), AuthorizeException. Message:" + e, context);
-        } catch (IOException e) {
-            processException(
-                "Could not delete subcommunity(id=" + subcommunityId + ") in community(id=" + parentCommunityId
-                    + "), IOException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not delete subcommunity(id=" + subcommunityId + ") in community(id=" + parentCommunityId
-                    + "), ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Subcommunity(id=" + subcommunityId + ") from community(id=" + parentCommunityId
-                     + ") was successfully deleted.");
-        return Response.status(Response.Status.OK).build();
-    }
-
-    /**
-     * Find community from DSpace database. It is encapsulation of method
-     * org.dspace.content.Community.find with checking if item exist and if user
-     * logged into context has permission to do passed action.
-     *
-     * @param context Context of actual logged user.
-     * @param id      Id of community in DSpace.
-     * @param action  Constant from org.dspace.core.Constants.
-     * @return It returns DSpace collection.
-     * @throws WebApplicationException Is thrown when item with passed id is not exists and if user
-     *                                 has no permission to do passed action.
-     */
-    private org.dspace.content.Community findCommunity(org.dspace.core.Context context, String id, int action)
-        throws WebApplicationException {
-        org.dspace.content.Community community = null;
-        try {
-            community = communityService.findByIdOrLegacyId(context, id);
-
-            if (community == null) {
-                context.abort();
-                log.warn("Community(id=" + id + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            } else if (!authorizeService.authorizeActionBoolean(context, community, action)) {
-                context.abort();
-                if (context.getCurrentUser() != null) {
-                    log.error("User(" + context.getCurrentUser().getEmail() + ") has not permission to "
-                                  + getActionString(action) + " community!");
-                } else {
-                    log.error("User(anonymous) has not permission to " + getActionString(action) + " community!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-        } catch (SQLException e) {
-            processException("Something get wrong while finding community(id=" + id + "). SQLException, Message:" + e,
-                             context);
-        }
-        return community;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/DSpaceRestApplication.java b/dspace-rest/src/main/java/org/dspace/rest/DSpaceRestApplication.java
deleted file mode 100644
index baa5c8555b..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/DSpaceRestApplication.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import org.glassfish.jersey.jackson.JacksonFeature;
-import org.glassfish.jersey.server.ResourceConfig;
-
-public class DSpaceRestApplication extends ResourceConfig {
-
-    public DSpaceRestApplication() {
-        register(JacksonFeature.class);
-        packages("org.dspace.rest");
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/FilteredCollectionsResource.java b/dspace-rest/src/main/java/org/dspace/rest/FilteredCollectionsResource.java
deleted file mode 100644
index 133ed50d9c..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/FilteredCollectionsResource.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.rest.common.FilteredCollection;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-import org.dspace.usage.UsageEvent;
-
-/*
- * This class provides the items within a collection evaluated against a set of Item Filters.
- *
- * @author Terry Brady, Georgetown University
- */
-@Path("/filtered-collections")
-public class FilteredCollectionsResource extends Resource {
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(FilteredCollectionsResource.class);
-
-    /**
-     * Return array of all collections in DSpace. You can add more properties
-     * through expand parameter.
-     *
-     * @param expand         String in which is what you want to add to returned instance
-     *                       of collection. Options are: "all", "parentCommunityList",
-     *                       "parentCommunity", "topCommunity", "items", "license" and "logo".
-     *                       If you want to use multiple options, it must be separated by commas.
-     * @param limit          Limit value for items in list in collection. Default value is
-     *                       100.
-     * @param offset         Offset of start index in list of items of collection. Default
-     *                       value is 0.
-     * @param user_ip        User's IP address.
-     * @param user_agent     User agent string (specifies browser used and its version).
-     * @param filters        Comma separated list of Item Filters to use to evaluate against
-     *                       the items in a collection
-     * @param xforwardedfor  When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                       source of the request. The proxy may be configured to add the
-     *                       "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                       so that the reverse-proxied application can get the client's IP.
-     * @param servletContext Context of the servlet container.
-     * @param headers        If you want to access the collections as the user logged into the
-     *                       context. The value of the "rest-dspace-token" header must be set
-     *                       to the token received from the login method response.
-     * @param request        Servlet's HTTP request object.
-     * @return Return array of collection, on which has logged user permission
-     * to view.
-     * @throws WebApplicationException It is thrown when was problem with database reading
-     *                                 (SQLException) or problem with creating
-     *                                 context(ContextException).
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.FilteredCollection[] getCollections(@QueryParam("expand") String expand,
-                                                                      @QueryParam("limit") @DefaultValue("100")
-                                                                          Integer limit,
-                                                                      @QueryParam("offset") @DefaultValue("0")
-                                                                              Integer offset,
-                                                                      @QueryParam("userIP") String user_ip,
-                                                                      @QueryParam("userAgent") String user_agent,
-                                                                      @QueryParam("filters") @DefaultValue("is_item")
-                                                                              String filters,
-                                                                      @QueryParam("xforwardedfor") String xforwardedfor,
-                                                                      @Context ServletContext servletContext,
-                                                                      @Context HttpHeaders headers,
-                                                                      @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading all filtered collections.(offset=" + offset + ",limit=" + limit + ")");
-        org.dspace.core.Context context = null;
-        List<FilteredCollection> collections = new ArrayList<FilteredCollection>();
-
-        try {
-            context = createContext();
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Paging was badly set.");
-                limit = 100;
-                offset = 0;
-            }
-
-            List<org.dspace.content.Collection> dspaceCollections = collectionService.findAll(context, limit, offset);
-            for (org.dspace.content.Collection dspaceCollection : dspaceCollections) {
-                if (authorizeService
-                    .authorizeActionBoolean(context, dspaceCollection, org.dspace.core.Constants.READ)) {
-                    FilteredCollection collection = new org.dspace.rest.common.FilteredCollection(dspaceCollection,
-                                                                                                  servletContext,
-                                                                                                  filters, expand,
-                                                                                                  context, limit,
-                                                                                                  offset);
-                    collections.add(collection);
-                    writeStats(dspaceCollection, UsageEvent.Action.VIEW, user_ip, user_agent,
-                               xforwardedfor, headers, request, context);
-                }
-            }
-            context.complete();
-        } catch (SQLException e) {
-            processException("Something went wrong while reading collections from database. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Something went wrong while reading collections, ContextError. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("All collections were successfully read.");
-        return collections.toArray(new org.dspace.rest.common.FilteredCollection[0]);
-    }
-
-    /**
-     * Return instance of collection with passed id. You can add more properties
-     * through expand parameter.
-     *
-     * @param collection_id  Id of collection in DSpace.
-     * @param expand         String in which is what you want to add to returned instance
-     *                       of collection. Options are: "all", "parentCommunityList",
-     *                       "parentCommunity", "topCommunity", "items", "license" and "logo".
-     *                       If you want to use multiple options, it must be separated by commas.
-     * @param limit          Limit value for items in list in collection. Default value is
-     *                       100.
-     * @param offset         Offset of start index in list of items of collection. Default
-     *                       value is 0.
-     * @param user_ip        User's IP address.
-     * @param user_agent     User agent string (specifies browser used and its version).
-     * @param xforwardedfor  When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                       source of the request. The proxy may be configured to add the
-     *                       "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                       so that the reverse-proxied application can get the client's IP.
-     * @param filters        Comma separated list of Item Filters to use to evaluate against
-     *                       the items in a collection
-     * @param headers        If you want to access the collection as the user logged into the
-     *                       context. The value of the "rest-dspace-token" header must be set
-     *                       to the token received from the login method response.
-     * @param request        Servlet's HTTP request object.
-     * @param servletContext Context of the servlet container.
-     * @return Return instance of collection. It can also return status code
-     * NOT_FOUND(404) if id of collection is incorrect or status code
-     * UNATHORIZED(401) if user has no permission to read collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading
-     *                                 (SQLException) or problem with creating
-     *                                 context(ContextException). It is thrown by NOT_FOUND and
-     *                                 UNATHORIZED status codes, too.
-     */
-    @GET
-    @Path("/{collection_id}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.FilteredCollection getCollection(@PathParam("collection_id") String collection_id,
-                                                                   @QueryParam("expand") String expand,
-                                                                   @QueryParam("limit") @DefaultValue("1000") Integer
-                                                                           limit,
-                                                                   @QueryParam("offset") @DefaultValue("0") Integer
-                                                                           offset,
-                                                                   @QueryParam("userIP") String user_ip,
-                                                                   @QueryParam("userAgent") String user_agent,
-                                                                   @QueryParam("xforwardedfor") String xforwardedfor,
-                                                                   @QueryParam("filters") @DefaultValue("is_item")
-                                                                           String filters,
-                                                                   @Context HttpHeaders headers,
-                                                                   @Context HttpServletRequest request,
-                                                                   @Context ServletContext servletContext) {
-        org.dspace.core.Context context = null;
-        FilteredCollection retColl = new org.dspace.rest.common.FilteredCollection();
-        try {
-            context = createContext();
-
-            org.dspace.content.Collection collection = collectionService.findByIdOrLegacyId(context, collection_id);
-            if (authorizeService.authorizeActionBoolean(context, collection, org.dspace.core.Constants.READ)) {
-                writeStats(collection, UsageEvent.Action.VIEW, user_ip,
-                           user_agent, xforwardedfor, headers, request, context);
-                retColl = new org.dspace.rest.common.FilteredCollection(
-                    collection, servletContext, filters, expand, context, limit, offset);
-            } else {
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-            context.complete();
-        } catch (SQLException e) {
-            processException(e.getMessage(), context);
-        } catch (ContextException e) {
-            processException(String.format("Could not read collection %s.  %s", collection_id, e.getMessage()),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-        return retColl;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/FilteredItemsResource.java b/dspace-rest/src/main/java/org/dspace/rest/FilteredItemsResource.java
deleted file mode 100644
index 0f4331adc5..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/FilteredItemsResource.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.UUID;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.content.Item;
-import org.dspace.content.MetadataField;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.ItemService;
-import org.dspace.content.service.MetadataFieldService;
-import org.dspace.content.service.MetadataSchemaService;
-import org.dspace.content.service.SiteService;
-import org.dspace.rest.common.ItemFilter;
-import org.dspace.rest.common.ItemFilterQuery;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.rest.filter.ItemFilterSet;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-import org.dspace.usage.UsageEvent;
-
-/*
- * This class retrieves items by a constructed metadata query evaluated against a set of Item Filters.
- *
- * @author Terry Brady, Georgetown University
- */
-@Path("/filtered-items")
-public class FilteredItemsResource extends Resource {
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    protected MetadataFieldService metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
-    protected MetadataSchemaService metadataSchemaService = ContentServiceFactory.getInstance()
-                                                                                 .getMetadataSchemaService();
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected SiteService siteService = ContentServiceFactory.getInstance().getSiteService();
-    protected ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(FilteredItemsResource.class);
-
-    /**
-     * Return instance of collection with passed id. You can add more properties
-     * through expand parameter.
-     *
-     * @param expand         String in which is what you want to add to returned instance
-     *                       of collection. Options are: "all", "parentCommunityList",
-     *                       "parentCommunity", "items", "license" and "logo". If you want
-     *                       to use multiple options, it must be separated by commas.
-     * @param limit          Limit value for items in list in collection. Default value is
-     *                       100.
-     * @param offset         Offset of start index in list of items of collection. Default
-     *                       value is 0.
-     * @param user_ip        User's IP address.
-     * @param user_agent     User agent string (specifies browser used and its version).
-     * @param xforwardedfor  When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                       source of the request. The proxy may be configured to add the
-     *                       "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                       so that the reverse-proxied application can get the client's IP.
-     * @param filters        Comma separated list of Item Filters to use to evaluate against
-     *                       the items in a collection
-     * @param query_field    List of metadata fields to evaluate in a metadata query.
-     *                       Each list value is used in conjunction with a query_op and query_field.
-     * @param query_op       List of metadata operators to use in a metadata query.
-     *                       Each list value is used in conjunction with a query_field and query_field.
-     * @param query_val      List of metadata values to evaluate in a metadata query.
-     *                       Each list value is used in conjunction with a query_value and query_op.
-     * @param collSel        List of collections to query.
-     * @param headers        If you want to access the collection as the user logged into the
-     *                       context. The value of the "rest-dspace-token" header must be set
-     *                       to the token received from the login method response.
-     * @param request        Servlet's HTTP request object.
-     * @param servletContext Context of the servlet container.
-     * @return Return instance of collection. It can also return status code
-     * NOT_FOUND(404) if id of collection is incorrect or status code
-     * UNATHORIZED(401) if user has no permission to read collection.
-     * @throws WebApplicationException It is thrown when was problem with database reading
-     *                                 (SQLException) or problem with creating
-     *                                 context(ContextException). It is thrown by NOT_FOUND and
-     *                                 UNATHORIZED status codes, too.
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.ItemFilter getItemQuery(@QueryParam("expand") String expand,
-                                                          @QueryParam("limit") @DefaultValue("100") Integer limit,
-                                                          @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                                          @QueryParam("userIP") String user_ip,
-                                                          @QueryParam("userAgent") String user_agent,
-                                                          @QueryParam("xforwardedfor") String xforwardedfor,
-                                                          @QueryParam("filters") @DefaultValue("is_item,all_filters")
-                                                                  String filters,
-                                                          @QueryParam("query_field[]") @DefaultValue("dc.title")
-                                                                  List<String> query_field,
-                                                          @QueryParam("query_op[]") @DefaultValue("exists")
-                                                                  List<String> query_op,
-                                                          @QueryParam("query_val[]") @DefaultValue("") List<String>
-                                                                  query_val,
-                                                          @QueryParam("collSel[]") @DefaultValue("") List<String>
-                                                                  collSel,
-                                                          @Context HttpHeaders headers,
-                                                          @Context HttpServletRequest request,
-                                                          @Context ServletContext servletContext) {
-        org.dspace.core.Context context = null;
-        ItemFilterSet itemFilterSet = new ItemFilterSet(filters, true);
-        ItemFilter result = itemFilterSet.getAllFiltersFilter();
-        try {
-            context = createContext();
-
-            int index = Math.min(query_field.size(), Math.min(query_op.size(), query_val.size()));
-            List<ItemFilterQuery> itemFilterQueries = new ArrayList<ItemFilterQuery>();
-            for (int i = 0; i < index; i++) {
-                itemFilterQueries.add(new ItemFilterQuery(query_field.get(i), query_op.get(i), query_val.get(i)));
-            }
-
-            String regexClause = configurationService.getProperty("rest.regex-clause");
-            if (regexClause == null) {
-                regexClause = "";
-            }
-
-            List<UUID> uuids = getUuidsFromStrings(collSel);
-            List<List<MetadataField>> listFieldList = getMetadataFieldsList(context, query_field);
-
-            Iterator<org.dspace.content.Item> childItems = itemService
-                .findByMetadataQuery(context, listFieldList, query_op, query_val, uuids, regexClause, offset, limit);
-
-            int count = itemFilterSet.processSaveItems(context, servletContext, childItems, true, expand);
-            writeStats(siteService.findSite(context), UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-            result.annotateQuery(query_field, query_op, query_val);
-            result.setUnfilteredItemCount(count);
-            context.complete();
-        } catch (IOException e) {
-            processException(e.getMessage(), context);
-        } catch (SQLException e) {
-            processException(e.getMessage(), context);
-        } catch (AuthorizeException e) {
-            processException(e.getMessage(), context);
-        } catch (ContextException e) {
-            processException("Unauthorized filtered item query. " + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-        return result;
-    }
-
-    private List<List<MetadataField>> getMetadataFieldsList(org.dspace.core.Context context, List<String> query_field)
-        throws SQLException {
-        List<List<MetadataField>> listFieldList = new ArrayList<List<MetadataField>>();
-        for (String s : query_field) {
-            ArrayList<MetadataField> fields = new ArrayList<MetadataField>();
-            listFieldList.add(fields);
-            if (s.equals("*")) {
-                continue;
-            }
-            String schema = "";
-            String element = "";
-            String qualifier = null;
-            String[] parts = s.split("\\.");
-            if (parts.length > 0) {
-                schema = parts[0];
-            }
-            if (parts.length > 1) {
-                element = parts[1];
-            }
-            if (parts.length > 2) {
-                qualifier = parts[2];
-            }
-
-            if (Item.ANY.equals(qualifier)) {
-                for (MetadataField mf : metadataFieldService
-                    .findFieldsByElementNameUnqualified(context, schema, element)) {
-                    fields.add(mf);
-                }
-            } else {
-                MetadataField mf = metadataFieldService.findByElement(context, schema, element, qualifier);
-                if (mf != null) {
-                    fields.add(mf);
-                }
-            }
-        }
-        return listFieldList;
-    }
-
-    private List<UUID> getUuidsFromStrings(List<String> collSel) {
-        List<UUID> uuids = new ArrayList<UUID>();
-        for (String s : collSel) {
-            try {
-                uuids.add(UUID.fromString(s));
-            } catch (IllegalArgumentException e) {
-                log.warn("Invalid collection UUID: " + s);
-            }
-        }
-        return uuids;
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/FiltersResource.java b/dspace-rest/src/main/java/org/dspace/rest/FiltersResource.java
deleted file mode 100644
index bff755f2de..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/FiltersResource.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.rest.common.ItemFilter;
-
-/**
- * Class which provides read methods over the metadata registry.
- *
- * @author Terry Brady, Georgetown University
- */
-@Path("/filters")
-public class FiltersResource {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(FiltersResource.class);
-
-    /**
-     * Return all Use Case Item Filters in DSpace.
-     *
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of metadata schemas.
-     * @throws WebApplicationException It can be caused by creating context or while was problem
-     *                                 with reading community from database(SQLException).
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public ItemFilter[] getFilters(@QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                   @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                   @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading all Item Filters.");
-        return ItemFilter.getItemFilters(ItemFilter.ALL, false).toArray(new ItemFilter[0]);
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/HandleResource.java b/dspace-rest/src/main/java/org/dspace/rest/HandleResource.java
deleted file mode 100644
index 51436a1c00..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/HandleResource.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.sql.SQLException;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.DSpaceObjectService;
-import org.dspace.core.Constants;
-import org.dspace.handle.factory.HandleServiceFactory;
-import org.dspace.handle.service.HandleService;
-import org.dspace.rest.common.Collection;
-import org.dspace.rest.common.Community;
-import org.dspace.rest.common.DSpaceObject;
-import org.dspace.rest.common.Item;
-import org.dspace.rest.exceptions.ContextException;
-
-/**
- * Created with IntelliJ IDEA.
- * User: peterdietz
- * Date: 10/7/13
- * Time: 1:54 PM
- * To change this template use File | Settings | File Templates.
- */
-@Path("/handle")
-public class HandleResource extends Resource {
-    protected HandleService handleService = HandleServiceFactory.getInstance().getHandleService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(HandleResource.class);
-
-    @GET
-    @Path("/{prefix}/{suffix}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public org.dspace.rest.common.DSpaceObject getObject(@PathParam("prefix") String prefix,
-                                                         @PathParam("suffix") String suffix,
-                                                         @QueryParam("expand") String expand,
-                                                         @javax.ws.rs.core.Context HttpHeaders headers) {
-        DSpaceObject dSpaceObject = new DSpaceObject();
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.DSpaceObject dso = handleService.resolveToObject(context, prefix + "/" + suffix);
-
-            if (dso == null) {
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            DSpaceObjectService dSpaceObjectService = ContentServiceFactory.getInstance().getDSpaceObjectService(dso);
-            log.info("DSO Lookup by handle: [" + prefix + "] / [" + suffix + "] got result of: " + dSpaceObjectService
-                .getTypeText(dso) + "_" + dso.getID());
-
-            if (authorizeService.authorizeActionBoolean(context, dso, org.dspace.core.Constants.READ)) {
-                switch (dso.getType()) {
-                    case Constants.COMMUNITY:
-                        dSpaceObject = new Community((org.dspace.content.Community) dso, servletContext, expand,
-                                                     context);
-                        break;
-                    case Constants.COLLECTION:
-                        dSpaceObject = new Collection((org.dspace.content.Collection) dso, servletContext, expand,
-                                                      context, null, null);
-                        break;
-                    case Constants.ITEM:
-                        dSpaceObject = new Item((org.dspace.content.Item) dso, servletContext, expand, context);
-                        break;
-                    default:
-                        dSpaceObject = new DSpaceObject(dso, servletContext);
-                        break;
-                }
-            } else {
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            context.complete();
-
-        } catch (SQLException e) {
-            log.error(e.getMessage());
-            throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
-        } catch (ContextException e) {
-            processException(
-                "Could not read handle(prefix=" + prefix + "), (suffix=" + suffix + ") ContextException. Message:" + e
-                    .getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        return dSpaceObject;
-
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/HierarchyResource.java b/dspace-rest/src/main/java/org/dspace/rest/HierarchyResource.java
deleted file mode 100644
index b2ffc559b0..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/HierarchyResource.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.io.UnsupportedEncodingException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.Collection;
-import org.dspace.content.Community;
-import org.dspace.content.Site;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CommunityService;
-import org.dspace.content.service.SiteService;
-import org.dspace.rest.common.HierarchyCollection;
-import org.dspace.rest.common.HierarchyCommunity;
-import org.dspace.rest.common.HierarchySite;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-
-/*
- * This class retrieves the community hierarchy in an optimized format.
- *
- * @author Terry Brady, Georgetown University
- */
-@Path("/hierarchy")
-@Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-public class HierarchyResource extends Resource {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(HierarchyResource.class);
-    protected SiteService siteService = ContentServiceFactory.getInstance().getSiteService();
-    protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    protected ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
-
-    /**
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the collection as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of collection. It can also return status code
-     * NOT_FOUND(404) if id of collection is incorrect or status code
-     * @throws UnsupportedEncodingException The Character Encoding is not supported.
-     * @throws WebApplicationException      It is thrown when was problem with database reading
-     *                                      (SQLException) or problem with creating
-     *                                      context(ContextException). It is thrown by NOT_FOUND and
-     *                                      UNATHORIZED status codes, too.
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public HierarchySite getHierarchy(
-        @QueryParam("userAgent") String user_agent, @QueryParam("xforwardedfor") String xforwardedfor,
-        @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws UnsupportedEncodingException, WebApplicationException {
-
-        org.dspace.core.Context context = null;
-        HierarchySite repo = new HierarchySite();
-
-        try {
-            context = createContext();
-
-            Site site = siteService.findSite(context);
-            repo.setId(site.getID().toString());
-            repo.setName(site.getName());
-            repo.setHandle(site.getHandle());
-            List<Community> dspaceCommunities = communityService.findAllTop(context);
-            processCommunity(context, repo, dspaceCommunities);
-        } catch (Exception e) {
-            processException(e.getMessage(), context);
-        } finally {
-            if (context != null) {
-                try {
-                    context.complete();
-                } catch (SQLException e) {
-                    log.error(e.getMessage() + " occurred while trying to close");
-                }
-            }
-        }
-        return repo;
-    }
-
-
-    private void processCommunity(org.dspace.core.Context context, HierarchyCommunity parent,
-                                  List<Community> communities) throws SQLException {
-        if (communities == null) {
-            return;
-        }
-        if (communities.size() == 0) {
-            return;
-        }
-        List<HierarchyCommunity> parentComms = new ArrayList<HierarchyCommunity>();
-        parent.setCommunities(parentComms);
-        for (Community comm : communities) {
-            if (!authorizeService.authorizeActionBoolean(context, comm, org.dspace.core.Constants.READ)) {
-                continue;
-            }
-            HierarchyCommunity mycomm = new HierarchyCommunity(comm.getID().toString(), comm.getName(),
-                                                               comm.getHandle());
-            parentComms.add(mycomm);
-            List<Collection> colls = comm.getCollections();
-            if (colls.size() > 0) {
-                List<HierarchyCollection> myColls = new ArrayList<HierarchyCollection>();
-                mycomm.setCollections(myColls);
-                for (Collection coll : colls) {
-                    if (!authorizeService.authorizeActionBoolean(context, coll, org.dspace.core.Constants.READ)) {
-                        continue;
-                    }
-                    HierarchyCollection mycoll = new HierarchyCollection(coll.getID().toString(), coll.getName(),
-                                                                         coll.getHandle());
-                    myColls.add(mycoll);
-                }
-            }
-            processCommunity(context, mycomm, comm.getSubcommunities());
-        }
-
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java b/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java
deleted file mode 100644
index 761d4dfc8a..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/ItemsResource.java
+++ /dev/null
@@ -1,1008 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.authorize.service.ResourcePolicyService;
-import org.dspace.content.Bundle;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.BitstreamFormatService;
-import org.dspace.content.service.BitstreamService;
-import org.dspace.content.service.BundleService;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.ItemService;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.GroupService;
-import org.dspace.rest.common.Bitstream;
-import org.dspace.rest.common.Item;
-import org.dspace.rest.common.MetadataEntry;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.usage.UsageEvent;
-
-/**
- * Class which provide all CRUD methods over items.
- *
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-// Every DSpace class used without namespace is from package org.dspace.rest.common.*. Otherwise namespace is defined.
-@SuppressWarnings("deprecation")
-@Path("/items")
-public class ItemsResource extends Resource {
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
-    protected BitstreamFormatService bitstreamFormatService = ContentServiceFactory.getInstance()
-                                                                                   .getBitstreamFormatService();
-    protected BundleService bundleService = ContentServiceFactory.getInstance().getBundleService();
-    protected ResourcePolicyService resourcePolicyService = AuthorizeServiceFactory.getInstance()
-                                                                                   .getResourcePolicyService();
-    protected GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemsResource.class);
-
-    /**
-     * Return item properties without metadata and bitstreams. You can add
-     * additional properties by parameter expand.
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param expand        String which define, what additional properties will be in
-     *                      returned item. Options are separeted by commas and are: "all",
-     *                      "metadata", "parentCollection", "parentCollectionList",
-     *                      "parentCommunityList" and "bitstreams".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return If user is allowed to read item, it returns item. Otherwise is
-     * thrown WebApplicationException with response status
-     * UNAUTHORIZED(401) or NOT_FOUND(404) if was id incorrect.
-     * @throws WebApplicationException This exception can be throw by NOT_FOUND(bad id of item),
-     *                                 UNAUTHORIZED, SQLException if wasproblem with reading from
-     *                                 database and ContextException, if there was problem with
-     *                                 creating context of DSpace.
-     */
-    @GET
-    @Path("/{item_id}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Item getItem(@PathParam("item_id") String itemId, @QueryParam("expand") String expand,
-                        @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                        @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                        @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-        Item item = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
-
-            writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            item = new Item(dspaceItem, servletContext, expand, context);
-            context.complete();
-            log.trace("Item(id=" + itemId + ") was successfully read.");
-
-        } catch (SQLException e) {
-            processException("Could not read item(id=" + itemId + "), SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not read item(id=" + itemId + "), ContextException. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        return item;
-    }
-
-    /**
-     * It returns an array of items in DSpace. You can define how many items in
-     * list will be and from which index will start. Items in list are sorted by
-     * handle, not by id.
-     *
-     * @param expand        String which define, what additional properties will be in
-     *                      returned item. Options are separeted by commas and are: "all",
-     *                      "metadata", "parentCollection", "parentCollectionList",
-     *                      "parentCommunityList" and "bitstreams".
-     * @param limit         How many items in array will be. Default value is 100.
-     * @param offset        On which index will array start. Default value is 0.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of items, on which has logged user into context
-     * permission.
-     * @throws WebApplicationException It can be thrown by SQLException, when was problem with
-     *                                 reading items from database or ContextException, when was
-     *                                 problem with creating context of DSpace.
-     */
-    @GET
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Item[] getItems(@QueryParam("expand") String expand, @QueryParam("limit") @DefaultValue("100") Integer limit,
-                           @QueryParam("offset") @DefaultValue("0") Integer offset,
-                           @QueryParam("userIP") String user_ip,
-                           @QueryParam("userAgent") String user_agent,
-                           @QueryParam("xforwardedfor") String xforwardedfor,
-                           @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading items.(offset=" + offset + ",limit=" + limit + ").");
-        org.dspace.core.Context context = null;
-        List<Item> items = null;
-
-        try {
-            context = createContext();
-
-            Iterator<org.dspace.content.Item> dspaceItems = itemService.findAllUnfiltered(context);
-            items = new ArrayList<Item>();
-
-            if (!((limit != null) && (limit >= 0) && (offset != null) && (offset >= 0))) {
-                log.warn("Paging was badly set, using default values.");
-                limit = 100;
-                offset = 0;
-            }
-
-            for (int i = 0; (dspaceItems.hasNext()) && (i < (limit + offset)); i++) {
-                org.dspace.content.Item dspaceItem = dspaceItems.next();
-                if (i >= offset) {
-                    if (itemService.isItemListedForUser(context, dspaceItem)) {
-                        items.add(new Item(dspaceItem, servletContext, expand, context));
-                        writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor,
-                                   headers, request, context);
-                    }
-                }
-            }
-            context.complete();
-        } catch (SQLException e) {
-            processException("Something went wrong while reading items from database. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Something went wrong while reading items, ContextException. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Items were successfully read.");
-        return items.toArray(new Item[0]);
-    }
-
-    /**
-     * Returns item metadata in list.
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return Return list of metadata fields if was everything ok. Otherwise it
-     * throw WebApplication exception with response code NOT_FOUND(404)
-     * or UNAUTHORIZED(401).
-     * @throws WebApplicationException It can be thrown by two exceptions: SQLException if was
-     *                                 problem wtih reading item from database and ContextException,
-     *                                 if was problem with creating context of DSpace. And can be
-     *                                 thrown by NOT_FOUND and UNAUTHORIZED too.
-     */
-    @GET
-    @Path("/{item_id}/metadata")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataEntry[] getItemMetadata(@PathParam("item_id") String itemId, @QueryParam("userIP") String user_ip,
-                                           @QueryParam("userAgent") String user_agent,
-                                           @QueryParam("xforwardedfor") String xforwardedfor,
-                                           @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading item(id=" + itemId + ") metadata.");
-        org.dspace.core.Context context = null;
-        List<MetadataEntry> metadata = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
-
-            writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            metadata = new org.dspace.rest.common.Item(dspaceItem, servletContext, "metadata", context).getMetadata();
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read item(id=" + itemId + "), SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not read item(id=" + itemId + "), ContextException. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Item(id=" + itemId + ") metadata were successfully read.");
-        return metadata.toArray(new MetadataEntry[0]);
-    }
-
-    /**
-     * Return array of bitstreams in item. It can be paged.
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param limit         How many items will be in array.
-     * @param offset        On which index will start array.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return Return paged array of bitstreams in item.
-     * @throws WebApplicationException It can be throw by NOT_FOUND, UNAUTHORIZED, SQLException if
-     *                                 was problem with reading from database and ContextException
-     *                                 if was problem with creating context of DSpace.
-     */
-    @GET
-    @Path("/{item_id}/bitstreams")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Bitstream[] getItemBitstreams(@PathParam("item_id") String itemId,
-                                         @QueryParam("limit") @DefaultValue("20") Integer limit,
-                                         @QueryParam("offset") @DefaultValue("0") Integer offset,
-                                         @QueryParam("userIP") String user_ip,
-                                         @QueryParam("userAgent") String user_agent,
-                                         @QueryParam("xforwardedfor") String xforwardedfor,
-                                         @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading item(id=" + itemId + ") bitstreams.(offset=" + offset + ",limit=" + limit + ")");
-        org.dspace.core.Context context = null;
-        List<Bitstream> bitstreams = null;
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.READ);
-
-            writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            List<Bitstream> itemBitstreams = new Item(dspaceItem, servletContext, "bitstreams", context)
-                .getBitstreams();
-
-            if ((offset + limit) > (itemBitstreams.size() - offset)) {
-                bitstreams = itemBitstreams.subList(offset, itemBitstreams.size());
-            } else {
-                bitstreams = itemBitstreams.subList(offset, offset + limit);
-            }
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read item(id=" + itemId + ") bitstreams, SQLExcpetion. Message: " + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not read item(id=" + itemId + ") bitstreams, ContextException. Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Item(id=" + itemId + ") bitstreams were successfully read.");
-        return bitstreams.toArray(new Bitstream[0]);
-    }
-
-    /**
-     * Adding metadata fields to item. If metadata key is in item, it will be
-     * added, NOT REPLACED!
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param metadata      List of metadata fields, which will be added into item.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return It returns status code OK(200) if all was ok. UNAUTHORIZED(401)
-     * if user is not allowed to write to item. NOT_FOUND(404) if id of
-     * item is incorrect.
-     * @throws WebApplicationException It is throw by these exceptions: SQLException, if was problem
-     *                                 with reading from database or writing to database.
-     *                                 AuthorizeException, if was problem with authorization to item
-     *                                 fields. ContextException, if was problem with creating
-     *                                 context of DSpace.
-     */
-    @POST
-    @Path("/{item_id}/metadata")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response addItemMetadata(@PathParam("item_id") String itemId,
-                                    List<org.dspace.rest.common.MetadataEntry> metadata,
-                                    @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                    @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                    @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Adding metadata to item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            for (MetadataEntry entry : metadata) {
-                // TODO Test with Java split
-                String data[] = mySplit(entry.getKey()); // Done by my split, because of java split was not function.
-                if ((data.length >= 2) && (data.length <= 3)) {
-                    itemService.addMetadata(context, dspaceItem, data[0], data[1], data[2], entry.getLanguage(),
-                                            entry.getValue());
-                }
-            }
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not write metadata to item(id=" + itemId + "), SQLException. Message: " + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not write metadata to item(id=" + itemId + "), ContextException. Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Metadata to item(id=" + itemId + ") were successfully added.");
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Create bitstream in item.
-     *
-     * @param name          Btstream name to set.
-     * @param description   Btstream description to set.
-     * @param groupId       ResourcePolicy group (allowed to READ).
-     * @param year          ResourcePolicy start date year.
-     * @param month         ResourcePolicy start date month.
-     * @param day           ResourcePolicy start date day.
-     * @param itemId        Id of item in DSpace.
-     * @param inputStream   Data of bitstream in inputStream.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return Returns bitstream with status code OK(200). If id of item is
-     * invalid , it returns status code NOT_FOUND(404). If user is not
-     * allowed to write to item, UNAUTHORIZED(401).
-     * @throws WebApplicationException It is thrown by these exceptions: SQLException, when was
-     *                                 problem with reading/writing from/to database.
-     *                                 AuthorizeException, when was problem with authorization to
-     *                                 item and add bitstream to item. IOException, when was problem
-     *                                 with creating file or reading from inpustream.
-     *                                 ContextException. When was problem with creating context of
-     *                                 DSpace.
-     */
-    // TODO Add option to add bitstream by URI.(for very big files)
-    @POST
-    @Path("/{item_id}/bitstreams")
-    public Bitstream addItemBitstream(@PathParam("item_id") String itemId, InputStream inputStream,
-                                      @QueryParam("name") String name, @QueryParam("description") String description,
-                                      @QueryParam("groupId") String groupId, @QueryParam("year") Integer year,
-                                      @QueryParam("month") Integer month,
-                                      @QueryParam("day") Integer day, @QueryParam("userIP") String user_ip,
-                                      @QueryParam("userAgent") String user_agent,
-                                      @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                      @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Adding bitstream to item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-        Bitstream bitstream = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            // Is better to add bitstream to ORIGINAL bundle or to item own?
-            log.trace("Creating bitstream in item.");
-            org.dspace.content.Bundle bundle = null;
-            org.dspace.content.Bitstream dspaceBitstream = null;
-            List<Bundle> bundles = itemService.getBundles(dspaceItem, org.dspace.core.Constants.CONTENT_BUNDLE_NAME);
-
-            if (bundles != null && bundles.size() != 0) {
-                bundle = bundles.get(0); // There should be only one bundle ORIGINAL.
-            }
-            if (bundle == null) {
-                log.trace("Creating bundle in item.");
-                dspaceBitstream = itemService.createSingleBitstream(context, inputStream, dspaceItem);
-            } else {
-                log.trace("Getting bundle from item.");
-                dspaceBitstream = bitstreamService.create(context, bundle, inputStream);
-            }
-
-            dspaceBitstream.setSource(context, "DSpace REST API");
-
-            // Set bitstream name and description
-            if (name != null) {
-                if (BitstreamResource.getMimeType(name) == null) {
-                    dspaceBitstream.setFormat(context, bitstreamFormatService.findUnknown(context));
-                } else {
-                    bitstreamService.setFormat(context, dspaceBitstream, bitstreamFormatService
-                        .findByMIMEType(context, BitstreamResource.getMimeType(name)));
-                }
-
-                dspaceBitstream.setName(context, name);
-            }
-            if (description != null) {
-                dspaceBitstream.setDescription(context, description);
-            }
-
-            // Create policy for bitstream
-            if (groupId != null) {
-                bundles = dspaceBitstream.getBundles();
-                for (Bundle dspaceBundle : bundles) {
-                    List<org.dspace.authorize.ResourcePolicy> bitstreamsPolicies = bundleService
-                        .getBitstreamPolicies(context, dspaceBundle);
-
-                    // Remove default bitstream policies
-                    List<org.dspace.authorize.ResourcePolicy> policiesToRemove = new ArrayList<org.dspace.authorize
-                        .ResourcePolicy>();
-                    for (org.dspace.authorize.ResourcePolicy policy : bitstreamsPolicies) {
-                        if (policy.getdSpaceObject().getID().equals(dspaceBitstream.getID())) {
-                            policiesToRemove.add(policy);
-                        }
-                    }
-                    for (org.dspace.authorize.ResourcePolicy policy : policiesToRemove) {
-                        bitstreamsPolicies.remove(policy);
-                    }
-
-                    org.dspace.authorize.ResourcePolicy dspacePolicy =
-                            resourcePolicyService.create(context,
-                                                         null, groupService.findByIdOrLegacyId(context, groupId));
-                    dspacePolicy.setAction(org.dspace.core.Constants.READ);
-                    dspacePolicy.setdSpaceObject(dspaceBitstream);
-                    if ((year != null) || (month != null) || (day != null)) {
-                        Date date = new Date();
-                        if (year != null) {
-                            date.setYear(year - 1900);
-                        }
-                        if (month != null) {
-                            date.setMonth(month - 1);
-                        }
-                        if (day != null) {
-                            date.setDate(day);
-                        }
-                        date.setHours(0);
-                        date.setMinutes(0);
-                        date.setSeconds(0);
-                        dspacePolicy.setStartDate(date);
-                    }
-
-                    resourcePolicyService.update(context, dspacePolicy);
-
-                    bitstreamService.updateLastModified(context, dspaceBitstream);
-                }
-            }
-
-            dspaceBitstream = bitstreamService.find(context, dspaceBitstream.getID());
-            bitstream = new Bitstream(dspaceBitstream, servletContext, "", context);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not create bitstream in item(id=" + itemId + "), SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not create bitstream in item(id=" + itemId + "), AuthorizeException. Message: " + e,
-                             context);
-        } catch (IOException e) {
-            processException("Could not create bitstream in item(id=" + itemId + "), IOException Message: " + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not create bitstream in item(id=" + itemId + "), ContextException Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Bitstream(id=" + bitstream.getUUID() + ") was successfully added into item(id=" + itemId + ").");
-        return bitstream;
-    }
-
-    /**
-     * Replace all metadata in item with new passed metadata.
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param metadata      List of metadata fields, which will replace old metadata in
-     *                      item.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return It returns status code: OK(200). NOT_FOUND(404) if item was not
-     * found, UNAUTHORIZED(401) if user is not allowed to write to item.
-     * @throws WebApplicationException It is thrown by: SQLException, when was problem with database
-     *                                 reading or writting, AuthorizeException when was problem with
-     *                                 authorization to item and metadata fields. And
-     *                                 ContextException, when was problem with creating context of
-     *                                 DSpace.
-     */
-    @PUT
-    @Path("/{item_id}/metadata")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response updateItemMetadata(@PathParam("item_id") String itemId, MetadataEntry[] metadata,
-                                       @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                       @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                       @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Updating metadata in item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            log.trace("Deleting original metadata from item.");
-            for (MetadataEntry entry : metadata) {
-                String data[] = mySplit(entry.getKey());
-                if ((data.length >= 2) && (data.length <= 3)) {
-                    itemService
-                        .clearMetadata(context, dspaceItem, data[0], data[1], data[2], org.dspace.content.Item.ANY);
-                }
-            }
-
-            log.trace("Adding new metadata to item.");
-            for (MetadataEntry entry : metadata) {
-                String data[] = mySplit(entry.getKey());
-                if ((data.length >= 2) && (data.length <= 3)) {
-                    itemService.addMetadata(context, dspaceItem, data[0], data[1], data[2], entry.getLanguage(),
-                                            entry.getValue());
-                }
-            }
-            //Update the item to ensure that all the events get fired.
-            itemService.update(context, dspaceItem);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not update metadata in item(id=" + itemId + "), SQLException. Message: " + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not update metadata in item(id=" + itemId + "), ContextException. Message: " + e.getMessage(),
-                context);
-        } catch (AuthorizeException e) {
-            processException(
-                "Could not update metadata in item(id=" + itemId + "), AuthorizeException. Message: " + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Metadata of item(id=" + itemId + ") were successfully updated.");
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Delete item from DSpace. It delete bitstreams only from item bundle.
-     *
-     * @param itemId        Id of item which will be deleted.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return It returns status code: OK(200). NOT_FOUND(404) if item was not
-     * found, UNAUTHORIZED(401) if user is not allowed to delete item
-     * metadata.
-     * @throws WebApplicationException It can be thrown by: SQLException, when was problem with
-     *                                 database reading. AuthorizeException, when was problem with
-     *                                 authorization to item.(read and delete) IOException, when was
-     *                                 problem with deleting bitstream file. ContextException, when
-     *                                 was problem with creating context of DSpace.
-     */
-    @DELETE
-    @Path("/{item_id}")
-    public Response deleteItem(@PathParam("item_id") String itemId, @QueryParam("userIP") String user_ip,
-                               @QueryParam("userAgent") String user_agent,
-                               @QueryParam("xforwardedfor") String xforwardedfor,
-                               @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.DELETE);
-
-            writeStats(dspaceItem, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            log.trace("Deleting item.");
-            itemService.delete(context, dspaceItem);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not delete item(id=" + itemId + "), SQLException. Message: " + e, context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete item(id=" + itemId + "), AuthorizeException. Message: " + e, context);
-            throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
-        } catch (IOException e) {
-            processException("Could not delete item(id=" + itemId + "), IOException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not delete item(id=" + itemId + "), ContextException. Message: " + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Item(id=" + itemId + ") was successfully deleted.");
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Delete all item metadata.
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return It returns status code: OK(200). NOT_FOUND(404) if item was not
-     * found, UNAUTHORIZED(401) if user is not allowed to delete item
-     * metadata.
-     * @throws WebApplicationException Thrown by three exceptions. SQLException, when there was
-     *                                 a problem reading item from database or editing metadata
-     *                                 fields. AuthorizeException, when there was a problem with
-     *                                 authorization to item. And ContextException, when there was a problem
-     *                                 with creating a DSpace context.
-     */
-    @DELETE
-    @Path("/{item_id}/metadata")
-    public Response deleteItemMetadata(@PathParam("item_id") String itemId, @QueryParam("userIP") String user_ip,
-                                       @QueryParam("userAgent") String user_agent,
-                                       @QueryParam("xforwardedfor") String xforwardedfor,
-                                       @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting metadata in item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item dspaceItem = findItem(context, itemId, org.dspace.core.Constants.WRITE);
-
-            writeStats(dspaceItem, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request,
-                       context);
-
-            log.trace("Deleting metadata.");
-            // TODO Rewrite without deprecated object. Leave there only generated metadata.
-
-            String valueAccessioned = itemService
-                .getMetadataFirstValue(dspaceItem, "dc", "date", "accessioned", org.dspace.content.Item.ANY);
-            String valueAvailable = itemService
-                .getMetadataFirstValue(dspaceItem, "dc", "date", "available", org.dspace.content.Item.ANY);
-            String valueURI = itemService
-                .getMetadataFirstValue(dspaceItem, "dc", "identifier", "uri", org.dspace.content.Item.ANY);
-            String valueProvenance = itemService
-                .getMetadataFirstValue(dspaceItem, "dc", "description", "provenance", org.dspace.content.Item.ANY);
-
-            itemService.clearMetadata(context, dspaceItem, org.dspace.content.Item.ANY, org.dspace.content.Item.ANY,
-                                      org.dspace.content.Item.ANY,
-                                      org.dspace.content.Item.ANY);
-
-            // Add their generated metadata
-            itemService.addMetadata(context, dspaceItem, "dc", "date", "accessioned", null, valueAccessioned);
-            itemService.addMetadata(context, dspaceItem, "dc", "date", "available", null, valueAvailable);
-            itemService.addMetadata(context, dspaceItem, "dc", "identifier", "uri", null, valueURI);
-            itemService.addMetadata(context, dspaceItem, "dc", "description", "provenance", null, valueProvenance);
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not delete item(id=" + itemId + "), SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not delete item(id=" + itemId + "), ContextException. Message:" + e.getMessage(),
-                             context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Item(id=" + itemId + ") metadata were successfully deleted.");
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Delete bitstream from item bundle.
-     *
-     * @param itemId        Id of item in DSpace.
-     * @param bitstreamId   Id of bitstream, which will be deleted from bundle.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the context.
-     *                      The value of the "rest-dspace-token" header must be set with passed
-     *                      token from login method.
-     * @param request       Servlet's HTTP request object.
-     * @return Return status code OK(200) if is all ok. NOT_FOUND(404) if item
-     * or bitstream was not found. UNAUTHORIZED(401) if user is not
-     * allowed to delete bitstream.
-     * @throws WebApplicationException It is thrown, when: Was problem with edditting database,
-     *                                 SQLException. Or problem with authorization to item, bundle
-     *                                 or bitstream, AuthorizeException. When was problem with
-     *                                 deleting file IOException. Or problem with creating context
-     *                                 of DSpace, ContextException.
-     */
-    @DELETE
-    @Path("/{item_id}/bitstreams/{bitstream_id}")
-    public Response deleteItemBitstream(@PathParam("item_id") String itemId,
-                                        @PathParam("bitstream_id") String bitstreamId,
-                                        @QueryParam("userIP") String user_ip,
-                                        @QueryParam("userAgent") String user_agent,
-                                        @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                        @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting bitstream in item(id=" + itemId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-            org.dspace.content.Item item = findItem(context, itemId, org.dspace.core.Constants.WRITE);
-
-            org.dspace.content.Bitstream bitstream = bitstreamService.findByIdOrLegacyId(context, bitstreamId);
-            if (bitstream == null) {
-                context.abort();
-                log.warn("Bitstream(id=" + bitstreamId + ") was not found.");
-                return Response.status(Status.NOT_FOUND).build();
-            } else if (!authorizeService.authorizeActionBoolean(context, bitstream, org.dspace.core.Constants.DELETE)) {
-                context.abort();
-                log.error("User(" + context.getCurrentUser()
-                                           .getEmail() + ") is not allowed to delete bitstream(id=" + bitstreamId +
-                              ").");
-                return Response.status(Status.UNAUTHORIZED).build();
-            }
-
-            writeStats(item, UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor, headers, request, context);
-            writeStats(bitstream, UsageEvent.Action.REMOVE, user_ip, user_agent, xforwardedfor, headers,
-                       request, context);
-
-            log.trace("Deleting bitstream...");
-            bitstreamService.delete(context, bitstream);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not delete bitstream(id=" + bitstreamId + "), SQLException. Message: " + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete bitstream(id=" + bitstreamId + "), AuthorizeException. Message: " + e,
-                             context);
-        } catch (IOException e) {
-            processException("Could not delete bitstream(id=" + bitstreamId + "), IOException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException(
-                "Could not delete bitstream(id=" + bitstreamId + "), ContextException. Message:" + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Bitstream(id=" + bitstreamId + ") from item(id=" + itemId + ") was successfuly deleted .");
-        return Response.status(Status.OK).build();
-    }
-
-    /**
-     * Find items by one metadata field.
-     *
-     * @param metadataEntry Metadata field to search by.
-     * @param expand        String which define, what additional properties will be in
-     *                      returned item. Options are separeted by commas and are: "all",
-     *                      "metadata", "parentCollection", "parentCollectionList",
-     *                      "parentCommunityList" and "bitstreams".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into context,
-     *                      header "rest-dspace-token" must be set to token value retrieved
-     *                      from the login method.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of found items.
-     * @throws WebApplicationException Can be thrown: SQLException - problem with
-     *                                 database reading. AuthorizeException - problem with
-     *                                 authorization to item. IOException - problem with
-     *                                 reading from metadata field. ContextException -
-     *                                 problem with creating DSpace context.
-     */
-    @POST
-    @Path("/find-by-metadata-field")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Item[] findItemsByMetadataField(MetadataEntry metadataEntry, @QueryParam("expand") String expand,
-                                           @QueryParam("userIP") String user_ip,
-                                           @QueryParam("userAgent") String user_agent,
-                                           @QueryParam("xforwardedfor") String xforwardedfor,
-                                           @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Looking for item with metadata(key=" + metadataEntry.getKey() + ",value=" + metadataEntry.getValue()
-                     + ", language=" + metadataEntry.getLanguage() + ").");
-        org.dspace.core.Context context = null;
-
-        List<Item> items = new ArrayList<Item>();
-        String[] metadata = mySplit(metadataEntry.getKey());
-
-        // Must used own style.
-        if ((metadata.length < 2) || (metadata.length > 3)) {
-            log.error("Finding failed, bad metadata key.");
-            throw new WebApplicationException(Response.Status.NOT_FOUND);
-        }
-
-        try {
-            context = createContext();
-
-            Iterator<org.dspace.content.Item> itemIterator = itemService
-                .findByMetadataField(context, metadataEntry.getSchema(),
-                                     metadataEntry.getElement(), metadataEntry.getQualifier(),
-                                     metadataEntry.getValue());
-
-            while (itemIterator.hasNext()) {
-                org.dspace.content.Item dspaceItem = itemIterator.next();
-                //Only return items that are available for the current user
-                if (itemService.isItemListedForUser(context, dspaceItem)) {
-                    Item item = new Item(dspaceItem, servletContext, expand, context);
-                    writeStats(dspaceItem, UsageEvent.Action.VIEW, user_ip, user_agent, xforwardedfor, headers,
-                               request, context);
-                    items.add(item);
-                }
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Something went wrong while finding item. SQLException, Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Context error:" + e.getMessage(), context);
-        } catch (AuthorizeException e) {
-            processException("Authorize error:" + e.getMessage(), context);
-        } catch (IOException e) {
-            processException("IO error:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        if (items.size() == 0) {
-            log.info("Items not found.");
-        } else {
-            log.info("Items were found.");
-        }
-
-        return items.toArray(new Item[0]);
-    }
-
-    /**
-     * Find item from DSpace database. It is encapsulation of method
-     * org.dspace.content.Item.find with checking if item exist and if user
-     * logged into context has permission to do passed action.
-     *
-     * @param context Context of actual logged user.
-     * @param id      Id of item in DSpace.
-     * @param action  Constant from org.dspace.core.Constants.
-     * @return It returns DSpace item.
-     * @throws WebApplicationException Is thrown when item with passed id is not exists and if user
-     *                                 has no permission to do passed action.
-     */
-    private org.dspace.content.Item findItem(org.dspace.core.Context context, String id, int action)
-        throws WebApplicationException {
-        org.dspace.content.Item item = null;
-        try {
-            item = itemService.findByIdOrLegacyId(context, id);
-
-            if (item == null) {
-                context.abort();
-                log.warn("Item(id=" + id + ") was not found!");
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            } else if (!authorizeService.authorizeActionBoolean(context, item, action)) {
-                context.abort();
-                if (context.getCurrentUser() != null) {
-                    log.error("User(" + context.getCurrentUser().getEmail() + ") has not permission to "
-                                  + getActionString(action) + " item!");
-                } else {
-                    log.error("User(anonymous) has not permission to " + getActionString(action) + " item!");
-                }
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-        } catch (SQLException e) {
-            processException("Something get wrong while finding item(id=" + id + "). SQLException, Message: " + e,
-                             context);
-        }
-        return item;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/MetadataRegistryResource.java b/dspace-rest/src/main/java/org/dspace/rest/MetadataRegistryResource.java
deleted file mode 100644
index 79e655e63d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/MetadataRegistryResource.java
+++ /dev/null
@@ -1,738 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.AuthorizeException;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.NonUniqueMetadataException;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.MetadataFieldService;
-import org.dspace.content.service.MetadataSchemaService;
-import org.dspace.content.service.SiteService;
-import org.dspace.rest.common.MetadataField;
-import org.dspace.rest.common.MetadataSchema;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.usage.UsageEvent;
-
-/**
- * Class which provides read methods over the metadata registry.
- *
- * @author Terry Brady, Georgetown University
- *
- * GET    /registries/schema - Return the list of schemas in the registry
- * GET    /registries/schema/{schema_prefix} - Returns the specified schema
- * GET    /registries/schema/{schema_prefix}/metadata-fields/{element} - Returns the metadata field within a schema
- * with an unqualified element name
- * GET    /registries/schema/{schema_prefix}/metadata-fields/{element}/{qualifier} - Returns the metadata field
- * within a schema with a qualified element name
- * POST   /registries/schema/ - Add a schema to the schema registry
- * POST   /registries/schema/{schema_prefix}/metadata-fields - Add a metadata field to the specified schema
- * GET    /registries/metadata-fields/{field_id} - Return the specified metadata field
- * PUT    /registries/metadata-fields/{field_id} - Update the specified metadata field
- * DELETE /registries/metadata-fields/{field_id} - Delete the specified metadata field from the metadata field registry
- * DELETE /registries/schema/{schema_id} - Delete the specified schema from the schema registry
- *
- * Note: intentionally not providing since there is no date to update other than the namespace
- * PUT    /registries/schema/{schema_id}
- */
-@Path("/registries")
-public class MetadataRegistryResource extends Resource {
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    protected MetadataFieldService metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
-    protected MetadataSchemaService metadataSchemaService = ContentServiceFactory.getInstance()
-                                                                                 .getMetadataSchemaService();
-    protected SiteService siteService = ContentServiceFactory.getInstance().getSiteService();
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(MetadataRegistryResource.class);
-
-    /**
-     * Return all metadata registry items in DSpace.
-     *
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of metadata schema. Options are: "all", "fields".  Default value "fields".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the metadata schema as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return array of metadata schemas.
-     * @throws WebApplicationException It can be caused by creating context or while was problem
-     *                                 with reading schema from database(SQLException).
-     */
-    @GET
-    @Path("/schema")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataSchema[] getSchemas(@QueryParam("expand") @DefaultValue("fields") String expand,
-                                       @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                       @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                       @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading all metadata schemas.");
-        org.dspace.core.Context context = null;
-        ArrayList<MetadataSchema> metadataSchemas = null;
-
-        try {
-            context = createContext();
-
-            List<org.dspace.content.MetadataSchema> schemas = metadataSchemaService.findAll(context);
-            metadataSchemas = new ArrayList<MetadataSchema>();
-            for (org.dspace.content.MetadataSchema schema : schemas) {
-                metadataSchemas.add(new MetadataSchema(schema, expand, context));
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read metadata schemas, SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not read metadata schemas, ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("All metadata schemas successfully read.");
-        return metadataSchemas.toArray(new MetadataSchema[0]);
-    }
-
-    /**
-     * Returns metadata schema with basic properties. If you want more, use expand
-     * parameter or method for metadata fields.
-     *
-     * @param schemaPrefix  Prefix for schema in DSpace.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of metadata schema. Options are: "all", "fields".  Default value "fields".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the metadata schema as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of org.dspace.rest.common.MetadataSchema.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading. Also if id/prefix of schema is incorrect
-     *                                 or logged user into context has no permission to read.
-     */
-    @GET
-    @Path("/schema/{schema_prefix}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataSchema getSchema(@PathParam("schema_prefix") String schemaPrefix,
-                                    @QueryParam("expand") @DefaultValue("fields") String expand,
-                                    @QueryParam("userIP") String user_ip, @QueryParam("userAgent") String user_agent,
-                                    @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                    @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading metadata schemas.");
-        org.dspace.core.Context context = null;
-        MetadataSchema metadataSchema = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.MetadataSchema schema = metadataSchemaService.find(context, schemaPrefix);
-            metadataSchema = new MetadataSchema(schema, expand, context);
-            if (schema == null) {
-                processException(String.format("Schema not found for index %s", schemaPrefix), context);
-            }
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read metadata schema, SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not read metadata schema, ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Metadata schemas successfully read.");
-        return metadataSchema;
-    }
-
-    /**
-     * Returns metadata field with basic properties.
-     *
-     * @param schemaPrefix  Prefix for schema in DSpace.
-     * @param element       Unqualified element name for field in the metadata registry.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of the metadata field. Options are: "all", "parentSchema".  Default value "".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of org.dspace.rest.common.MetadataField.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading. Also if id of field is incorrect
-     *                                 or logged user into context has no permission to read.
-     */
-    @GET
-    @Path("/schema/{schema_prefix}/metadata-fields/{element}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataField getMetadataFieldUnqualified(@PathParam("schema_prefix") String schemaPrefix,
-                                                     @PathParam("element") String element,
-                                                     @QueryParam("expand") String expand,
-                                                     @QueryParam("userIP") String user_ip,
-                                                     @QueryParam("userAgent") String user_agent,
-                                                     @QueryParam("xforwardedfor") String xforwardedfor,
-                                                     @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-        return getMetadataFieldQualified(schemaPrefix, element, "", expand, user_ip, user_agent, xforwardedfor, headers,
-                                         request);
-    }
-
-    /**
-     * Returns metadata field with basic properties.
-     *
-     * @param schemaPrefix  Prefix for schema in DSpace.
-     * @param element       Element name for field in the metadata registry.
-     * @param qualifier     Element name qualifier for field in the metadata registry.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of the metadata field. Options are: "all", "parentSchema".  Default value "".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of org.dspace.rest.common.MetadataField.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading. Also if id of field is incorrect
-     *                                 or logged user into context has no permission to read.
-     */
-    @GET
-    @Path("/schema/{schema_prefix}/metadata-fields/{element}/{qualifier}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataField getMetadataFieldQualified(@PathParam("schema_prefix") String schemaPrefix,
-                                                   @PathParam("element") String element,
-                                                   @PathParam("qualifier") @DefaultValue("") String qualifier,
-                                                   @QueryParam("expand") String expand,
-                                                   @QueryParam("userIP") String user_ip,
-                                                   @QueryParam("userAgent") String user_agent,
-                                                   @QueryParam("xforwardedfor") String xforwardedfor,
-                                                   @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading metadata field.");
-        org.dspace.core.Context context = null;
-        MetadataField metadataField = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.MetadataSchema schema = metadataSchemaService.find(context, schemaPrefix);
-
-            if (schema == null) {
-                log.error(String.format("Schema not found for prefix %s", schemaPrefix));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-
-            org.dspace.content.MetadataField field = metadataFieldService
-                .findByElement(context, schema, element, qualifier);
-            if (field == null) {
-                log.error(String.format("Field %s.%s.%s not found", schemaPrefix, element, qualifier));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            metadataField = new MetadataField(schema, field, expand, context);
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read metadata field, SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not read metadata field, ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Metadata field successfully read.");
-        return metadataField;
-    }
-
-    /**
-     * Returns metadata field with basic properties.
-     *
-     * @param fieldId       Id of metadata field in DSpace.
-     * @param expand        String in which is what you want to add to returned instance
-     *                      of the metadata field. Options are: "all", "parentSchema".  Default value "parentSchema".
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the community as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return instance of org.dspace.rest.common.MetadataField.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading. Also if id of field is incorrect
-     *                                 or logged user into context has no permission to read.
-     */
-    @GET
-    @Path("/metadata-fields/{field_id}")
-    @Produces( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataField getMetadataField(@PathParam("field_id") Integer fieldId,
-                                          @QueryParam("expand") @DefaultValue("parentSchema") String expand,
-                                          @QueryParam("userIP") String user_ip,
-                                          @QueryParam("userAgent") String user_agent,
-                                          @QueryParam("xforwardedfor") String xforwardedfor,
-                                          @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Reading metadata field.");
-        org.dspace.core.Context context = null;
-        MetadataField metadataField = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.MetadataField field = metadataFieldService.find(context, fieldId);
-            if (field == null) {
-                log.error(String.format("Metadata Field %d not found", fieldId));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            org.dspace.content.MetadataSchema schema = field.getMetadataSchema();
-            if (schema == null) {
-                log.error(String.format("Parent Schema not found for Metadata Field %d not found", fieldId));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            metadataField = new MetadataField(schema, field, expand, context);
-
-            context.complete();
-        } catch (SQLException e) {
-            processException("Could not read metadata field, SQLException. Message:" + e, context);
-        } catch (ContextException e) {
-            processException("Could not read metadata field, ContextException. Message:" + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.trace("Metadata field successfully read.");
-        return metadataField;
-    }
-
-    /**
-     * Create schema in the schema registry. Creating a schema is restricted to admin users.
-     *
-     * @param schema        Schema that will be added to the metadata registry.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the schema as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response 200 if was everything all right. Otherwise 400
-     * when id of community was incorrect or 401 if was problem with
-     * permission to write into collection.
-     * Returns the schema (schemaId), if was all ok.
-     * @throws WebApplicationException It can be thrown by SQLException, AuthorizeException and
-     *                                 ContextException.
-     */
-    @POST
-    @Path("/schema")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataSchema createSchema(MetadataSchema schema, @QueryParam("userIP") String user_ip,
-                                       @QueryParam("userAgent") String user_agent,
-                                       @QueryParam("xforwardedfor") String xforwardedfor,
-                                       @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Creating a schema.");
-        org.dspace.core.Context context = null;
-        MetadataSchema retSchema = null;
-
-        try {
-            context = createContext();
-
-            if (!authorizeService.isAdmin(context)) {
-                context.abort();
-                String user = "anonymous";
-                if (context.getCurrentUser() != null) {
-                    user = context.getCurrentUser().getEmail();
-                }
-                log.error("User(" + user + ") does not have permission to create a metadata schema!");
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            log.debug(String.format("Admin user creating schema with namespace %s and prefix %s", schema.getNamespace(),
-                                    schema.getPrefix()));
-
-            org.dspace.content.MetadataSchema dspaceSchema = metadataSchemaService
-                .create(context, schema.getPrefix(), schema.getNamespace());
-            log.debug("Creating return object.");
-            retSchema = new MetadataSchema(dspaceSchema, "", context);
-
-            writeStats(siteService.findSite(context), UsageEvent.Action.CREATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            context.complete();
-            log.info("Schema created" + retSchema.getPrefix());
-
-        } catch (SQLException e) {
-            processException("Could not create new metadata schema, SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not create new metadata schema, ContextException. Message: " + e.getMessage(),
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not create new metadata schema, AuthorizeException. Message: " + e.getMessage(),
-                             context);
-        } catch (NonUniqueMetadataException e) {
-            processException(
-                "Could not create new metadata schema, NonUniqueMetadataException. Message: " + e.getMessage(),
-                context);
-        } catch (Exception e) {
-            processException("Could not create new metadata schema, Exception. Class: " + e.getClass(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        return retSchema;
-    }
-
-
-    /**
-     * Create a new metadata field within a schema.
-     * Creating a metadata field is restricted to admin users.
-     *
-     * @param schemaPrefix  Prefix for schema in DSpace.
-     * @param field         Field that will be added to the metadata registry for a schema.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the schema as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response 200 if was everything all right. Otherwise 400
-     * when id of community was incorrect or 401 if was problem with
-     * permission to write into collection.
-     * Returns the field (with fieldId), if was all ok.
-     * @throws WebApplicationException It can be thrown by SQLException, AuthorizeException and
-     *                                 ContextException.
-     */
-    @POST
-    @Path("/schema/{schema_prefix}/metadata-fields")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public MetadataField createMetadataField(@PathParam("schema_prefix") String schemaPrefix,
-                                             MetadataField field, @QueryParam("userIP") String user_ip,
-                                             @QueryParam("userAgent") String user_agent,
-                                             @QueryParam("xforwardedfor") String xforwardedfor,
-                                             @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info(String.format("Creating metadataField within schema %s.", schemaPrefix));
-        org.dspace.core.Context context = null;
-        MetadataField retField = null;
-
-        try {
-            context = createContext();
-
-            if (!authorizeService.isAdmin(context)) {
-                context.abort();
-                String user = "anonymous";
-                if (context.getCurrentUser() != null) {
-                    user = context.getCurrentUser().getEmail();
-                }
-                log.error("User(" + user + ") does not have permission to create a metadata field!");
-                throw new WebApplicationException(Response.Status.UNAUTHORIZED);
-            }
-
-            org.dspace.content.MetadataSchema schema = metadataSchemaService.find(context, schemaPrefix);
-            if (schema == null) {
-                log.error(String.format("Schema not found for prefix %s", schemaPrefix));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            org.dspace.content.MetadataField dspaceField = metadataFieldService
-                .create(context, schema, field.getElement(), field.getQualifier(), field.getDescription());
-            writeStats(siteService.findSite(context), UsageEvent.Action.CREATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            retField = new MetadataField(schema, dspaceField, "", context);
-            context.complete();
-            log.info("Metadata field created within schema" + retField.getName());
-        } catch (SQLException e) {
-            processException("Could not create new metadata field, SQLException. Message: " + e, context);
-        } catch (ContextException e) {
-            processException("Could not create new metadata field, ContextException. Message: " + e.getMessage(),
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not create new metadata field, AuthorizeException. Message: " + e.getMessage(),
-                             context);
-        } catch (NonUniqueMetadataException e) {
-            processException(
-                "Could not create new metadata field, NonUniqueMetadataException. Message: " + e.getMessage(), context);
-        } catch (Exception e) {
-            processException("Could not create new metadata field, Exception. Message: " + e.getMessage(), context);
-        } finally {
-            processFinally(context);
-        }
-
-        return retField;
-    }
-
-    //@PUT
-    //@Path("/schema/{schema_prefix}")
-    //Assumption - there are no meaningful fields to update for a schema
-
-    /**
-     * Update metadata field. Replace all information about community except the id and the containing schema.
-     *
-     * @param fieldId       Id of the field in the DSpace metdata registry.
-     * @param field         Instance of the metadata field which will replace actual metadata field in
-     *                      DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the metadata field as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Response 200 if was all ok. Otherwise 400 if was id incorrect or
-     * 401 if logged user has no permission to update the metadata field.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or writing. Or problem with writing to
-     *                                 community caused by authorization.
-     */
-    @PUT
-    @Path("/metadata-fields/{field_id}")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response updateMetadataField(@PathParam("field_id") Integer fieldId, MetadataField field,
-                                        @QueryParam("userIP") String user_ip,
-                                        @QueryParam("userAgent") String user_agent,
-                                        @QueryParam("xforwardedfor") String xforwardedfor, @Context HttpHeaders headers,
-                                        @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Updating metadata field(id=" + fieldId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.MetadataField dspaceField = metadataFieldService.find(context, fieldId);
-            if (field == null) {
-                log.error(String.format("Metadata Field %d not found", fieldId));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-
-            writeStats(siteService.findSite(context), UsageEvent.Action.UPDATE, user_ip, user_agent, xforwardedfor,
-                       headers, request, context);
-
-            dspaceField.setElement(field.getElement());
-            dspaceField.setQualifier(field.getQualifier());
-            dspaceField.setScopeNote(field.getDescription());
-            metadataFieldService.update(context, dspaceField);
-
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not update metadata field(id=" + fieldId + "), AuthorizeException. Message:" + e,
-                             context);
-        } catch (ContextException e) {
-            processException("Could not update metadata field(id=" + fieldId + "), ContextException Message:" + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not update metadata field(id=" + fieldId + "), AuthorizeException. Message:" + e,
-                             context);
-        } catch (NonUniqueMetadataException e) {
-            processException(
-                "Could not update metadata field(id=" + fieldId + "), NonUniqueMetadataException. Message:" + e,
-                context);
-        } catch (IOException e) {
-            processException("Could not update metadata field(id=" + fieldId + "), IOException. Message:" + e, context);
-        } finally {
-            processFinally(context);
-        }
-
-        log.info("Metadata Field(id=" + fieldId + ") has been successfully updated.");
-        return Response.ok().build();
-    }
-
-    /**
-     * Delete metadata field from the DSpace metadata registry
-     *
-     * @param fieldId       Id of the metadata field in DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the metadata field as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response code OK(200) if was everything all right.
-     * Otherwise return NOT_FOUND(404) if was id of metadata field is incorrect.
-     * Or (UNAUTHORIZED)401 if was problem with permission to metadata field.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or deleting. Or problem with deleting
-     *                                 metadata field caused by IOException or authorization.
-     */
-    @DELETE
-    @Path("/metadata-fields/{field_id}")
-    public Response deleteMetadataField(@PathParam("field_id") Integer fieldId, @QueryParam("userIP") String user_ip,
-                                        @QueryParam("userAgent") String user_agent,
-                                        @QueryParam("xforwardedfor") String xforwardedfor,
-                                        @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting metadata field(id=" + fieldId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.MetadataField dspaceField = metadataFieldService.find(context, fieldId);
-            if (dspaceField == null) {
-                log.error(String.format("Metadata Field %d not found", fieldId));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            writeStats(siteService.findSite(context), UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor,
-                       headers,
-                       request, context);
-
-            metadataFieldService.delete(context, dspaceField);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not delete metadata field(id=" + fieldId + "), SQLException. Message:" + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete metadata field(id=" + fieldId + "), AuthorizeException. Message:" + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not delete metadata field(id=" + fieldId + "), ContextException. Message:" + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Metadata field(id=" + fieldId + ") was successfully deleted.");
-        return Response.status(Response.Status.OK).build();
-    }
-
-    /**
-     * Delete metadata schema from the DSpace metadata registry
-     *
-     * @param schemaId      Id of the metadata schema in DSpace.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the metadata schema as the user logged into the
-     *                      context. The value of the "rest-dspace-token" header must be set
-     *                      to the token received from the login method response.
-     * @param request       Servlet's HTTP request object.
-     * @return Return response code OK(200) if was everything all right.
-     * Otherwise return NOT_FOUND(404) if was id of metadata schema is incorrect.
-     * Or (UNAUTHORIZED)401 if was problem with permission to metadata schema.
-     * @throws WebApplicationException Thrown if there was a problem with creating context or problem
-     *                                 with database reading or deleting. Or problem with deleting
-     *                                 metadata schema caused by IOException or authorization.
-     */
-    @DELETE
-    @Path("/schema/{schema_id}")
-    public Response deleteSchema(@PathParam("schema_id") Integer schemaId, @QueryParam("userIP") String user_ip,
-                                 @QueryParam("userAgent") String user_agent,
-                                 @QueryParam("xforwardedfor") String xforwardedfor,
-                                 @Context HttpHeaders headers, @Context HttpServletRequest request)
-        throws WebApplicationException {
-
-        log.info("Deleting metadata schema(id=" + schemaId + ").");
-        org.dspace.core.Context context = null;
-
-        try {
-            context = createContext();
-
-            org.dspace.content.MetadataSchema dspaceSchema = metadataSchemaService.find(context, schemaId);
-            if (dspaceSchema == null) {
-                log.error(String.format("Metadata Schema %d not found", schemaId));
-                throw new WebApplicationException(Response.Status.NOT_FOUND);
-            }
-            writeStats(siteService.findSite(context), UsageEvent.Action.DELETE, user_ip, user_agent, xforwardedfor,
-                       headers,
-                       request, context);
-
-            metadataSchemaService.delete(context, dspaceSchema);
-            context.complete();
-
-        } catch (SQLException e) {
-            processException("Could not delete metadata schema(id=" + schemaId + "), SQLException. Message:" + e,
-                             context);
-        } catch (AuthorizeException e) {
-            processException("Could not delete metadata schema(id=" + schemaId + "), AuthorizeException. Message:" + e,
-                             context);
-        } catch (ContextException e) {
-            processException(
-                "Could not delete metadata schema(id=" + schemaId + "), ContextException. Message:" + e.getMessage(),
-                context);
-        } finally {
-            processFinally(context);
-        }
-
-
-        log.info("Metadata schema(id=" + schemaId + ") was successfully deleted.");
-        return Response.status(Response.Status.OK).build();
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/Resource.java b/dspace-rest/src/main/java/org/dspace/rest/Resource.java
deleted file mode 100644
index 7a7624fef0..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/Resource.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Collection;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.Response;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.DSpaceObject;
-import org.dspace.core.Context;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.services.factory.DSpaceServicesFactory;
-import org.dspace.usage.UsageEvent;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- * Superclass of all resource classes in REST API. It has methods for creating
- * context, write statistics, processsing exceptions, splitting a key of
- * metadata, string representation of action and method for getting the logged
- * in user from the token in request header.
- *
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-public class Resource {
-
-    @javax.ws.rs.core.Context
-    public ServletContext servletContext;
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(Resource.class);
-
-    private static final boolean writeStatistics;
-
-    static {
-        writeStatistics = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                               .getBooleanProperty("rest.stats", false);
-    }
-
-    /**
-     * Create context to work with DSpace database. It can create context
-     * with or without a logged in user (retrieved from SecurityContextHolder). Throws
-     * WebApplicationException caused by: SQLException if there was a problem
-     * with reading from database. Throws AuthorizeException if there was
-     * a problem with authorization to read from the database. Throws Exception
-     * if there was a problem creating context.
-     *
-     * @return Newly created context with the logged in user unless the specified user was null.
-     * If user is null, create the context without a logged in user.
-     * @throws ContextException Thrown in case of a problem creating context. Can be caused by
-     *                          SQLException error in creating context or finding the user to
-     *                          log in. Can be caused by AuthorizeException if there was a
-     *                          problem authorizing the found user.
-     * @throws SQLException     An exception that provides information on a database access error or other errors.
-     */
-    protected static org.dspace.core.Context createContext() throws ContextException, SQLException {
-        org.dspace.core.Context context = new org.dspace.core.Context();
-        //context.getDBConnection().setAutoCommit(false); // Disable autocommit.
-
-        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-        if (authentication != null) {
-            Collection<SimpleGrantedAuthority> specialGroups = (Collection<SimpleGrantedAuthority>) authentication
-                .getAuthorities();
-            for (SimpleGrantedAuthority grantedAuthority : specialGroups) {
-                context.setSpecialGroup(EPersonServiceFactory.getInstance().getGroupService()
-                                                             .findByName(context, grantedAuthority.getAuthority())
-                                                             .getID());
-            }
-            context.setCurrentUser(
-                EPersonServiceFactory.getInstance().getEPersonService().findByEmail(context, authentication.getName()));
-        }
-
-        return context;
-    }
-
-    /**
-     * Records a statistics event about an object used via REST API.
-     *
-     * @param dspaceObject  DSpace object on which a request was performed.
-     * @param action        Action that was performed.
-     * @param user_ip       User's IP address.
-     * @param user_agent    User agent string (specifies browser used and its version).
-     * @param xforwardedfor When accessed via a reverse proxy, the application sees the proxy's IP as the
-     *                      source of the request. The proxy may be configured to add the
-     *                      "X-Forwarded-For" HTTP header containing the original IP of the client
-     *                      so that the reverse-proxied application can get the client's IP.
-     * @param headers       If you want to access the item as the user logged into the
-     *                      context. The header "rest-dspace-token" with the token passed
-     *                      from the login method must be set.
-     * @param request       Servlet's HTTP request object.
-     * @param context       Context which must be aborted.
-     */
-    protected void writeStats(DSpaceObject dspaceObject, UsageEvent.Action action,
-                              String user_ip, String user_agent, String xforwardedfor, HttpHeaders headers,
-                              HttpServletRequest request, Context context) {
-        if (!writeStatistics) {
-            return;
-        }
-
-        if ((user_ip == null) || (user_ip.length() == 0)) {
-            DSpaceServicesFactory.getInstance().getEventService()
-                                 .fireEvent(new UsageEvent(action, request, context, dspaceObject));
-        } else {
-            DSpaceServicesFactory.getInstance().getEventService().fireEvent(
-                new UsageEvent(action, user_ip, user_agent, xforwardedfor, context, dspaceObject));
-        }
-
-        log.debug("fired event");
-    }
-
-    /**
-     * Process exception, print message to logger error stream and abort DSpace
-     * context.
-     *
-     * @param message Message, which will be printed to error stream.
-     * @param context Context which must be aborted.
-     * @throws WebApplicationException This exception is throw for user of REST api.
-     */
-    protected static void processException(String message, org.dspace.core.Context context)
-        throws WebApplicationException {
-        if ((context != null) && (context.isValid())) {
-            context.abort();
-        }
-        log.error(message);
-        throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
-    }
-
-    /**
-     * Process finally statement. It will print message to logger error stream
-     * and abort DSpace context, if was not properly ended.
-     *
-     * @param context Context which must be aborted.
-     * @throws WebApplicationException This exception is thrown for user of REST API.
-     */
-    protected void processFinally(org.dspace.core.Context context) throws WebApplicationException {
-        if ((context != null) && (context.isValid())) {
-            context.abort();
-            log.error("Something get wrong. Aborting context in finally statement.");
-            throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR);
-        }
-    }
-
-    /**
-     * Split string with regex ".".
-     *
-     * @param key String which will be splitted.
-     * @return String array filed with separated string.
-     */
-    protected String[] mySplit(String key) {
-        ArrayList<String> list = new ArrayList<String>();
-        int prev = 0;
-        for (int i = 0; i < key.length(); i++) {
-            if (key.charAt(i) == '.') {
-                list.add(key.substring(prev, i));
-                prev = i + 1;
-            } else if (i + 1 == key.length()) {
-                list.add(key.substring(prev, i + 1));
-            }
-        }
-
-        if (list.size() == 2) {
-            list.add(null);
-        }
-
-        return list.toArray(new String[0]);
-    }
-
-    /**
-     * Return string representation of values
-     * org.dspace.core.Constants.{READ,WRITE,DELETE}.
-     *
-     * @param action Constant from org.dspace.core.Constants.*
-     * @return String representation. read or write or delete.
-     */
-    protected String getActionString(int action) {
-        String actionStr;
-        switch (action) {
-            case org.dspace.core.Constants.READ:
-                actionStr = "read";
-                break;
-            case org.dspace.core.Constants.WRITE:
-                actionStr = "write";
-                break;
-            case org.dspace.core.Constants.DELETE:
-                actionStr = "delete";
-                break;
-            case org.dspace.core.Constants.REMOVE:
-                actionStr = "remove";
-                break;
-            case org.dspace.core.Constants.ADD:
-                actionStr = "add";
-                break;
-            default:
-                actionStr = "(?action?)";
-                break;
-        }
-        return actionStr;
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/RestIndex.java b/dspace-rest/src/main/java/org/dspace/rest/RestIndex.java
deleted file mode 100644
index 26b1150229..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/RestIndex.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.sql.SQLException;
-import java.util.Iterator;
-import javax.servlet.ServletContext;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.dspace.authenticate.AuthenticationMethod;
-import org.dspace.authenticate.ShibAuthentication;
-import org.dspace.authenticate.factory.AuthenticateServiceFactory;
-import org.dspace.authenticate.service.AuthenticationService;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.EPersonService;
-import org.dspace.rest.common.Status;
-import org.dspace.rest.exceptions.ContextException;
-import org.dspace.utils.DSpace;
-
-/**
- * Root of RESTful api. It provides login and logout. Also have method for
- * printing every method which is provides by RESTful api.
- *
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-@Path("/")
-public class RestIndex {
-    protected EPersonService epersonService = EPersonServiceFactory.getInstance().getEPersonService();
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(RestIndex.class);
-
-    /**
-     * Return html page with information about REST api. It contains methods all
-     * methods provide by REST api.
-     *
-     * @param servletContext Context of the servlet container.
-     * @return HTML page which has information about all methods of REST API.
-     */
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    public String sayHtmlHello(@Context ServletContext servletContext) {
-        // TODO Better graphics, add arguments to all methods. (limit, offset, item and so on)
-        return "<html><title>DSpace REST - index</title>" +
-            "<body>"
-            + "<h1>DSpace REST API (Deprecated)</h1>" +
-            "<em>This REST API is deprecated and will be removed in v8." +
-            " Please use the new Server API webapp instead.</em><br/>" +
-            "Server path: " + servletContext.getContextPath() +
-            "<h2>Index</h2>" +
-            "<ul>" +
-            "<li>GET / - Return this page.</li>" +
-            "<li>GET /test - Return the string \"REST api is running\" for testing purposes.</li>" +
-            "<li>POST /login - Method for logging into the DSpace RESTful API. You must post the parameters \"email\"" +
-            " and \"password\". Example: \"email=test@dspace&password=pass\". Returns a JSESSIONID cookie which can " +
-            "be used for future authenticated requests.</li>" +
-            "<li>POST /logout - Method for logging out of the DSpace RESTful API. The request must include the " +
-            "\"rest-dspace-token\" token</li> header." +
-            "</ul>" +
-            "<h2>Communities</h2>" +
-            "<ul>" +
-            "<li>GET /communities - Return an array of all communities in DSpace.</li>" +
-            "<li>GET /communities/top-communities - Returns an array of all top-leve communities in DSpace.</li>" +
-            "<li>GET /communities/{communityId} - Returns a community with the specified ID.</li>" +
-            "<li>GET /communities/{communityId}/collections - Returns an array of collections of the specified " +
-            "community.</li>" +
-            "<li>GET /communities/{communityId}/communities - Returns an array of subcommunities of the specified " +
-            "community.</li>" +
-            "<li>POST /communities - Create a new top-level community. You must post a community.</li>" +
-            "<li>POST /communities/{communityId}/collections - Create a new collection in the specified community. " +
-            "You must post a collection.</li>" +
-            "<li>POST /communities/{communityId}/communities - Create a new subcommunity in the specified community. " +
-            "You must post a community.</li>" +
-            "<li>PUT /communities/{communityId} - Update the specified community.</li>" +
-            "<li>DELETE /communities/{communityId} - Delete the specified community.</li>" +
-            "<li>DELETE /communities/{communityId}/collections/{collectionId} - Delete the specified collection in " +
-            "the specified community.</li>" +
-            "<li>DELETE /communities/{communityId}/communities/{communityId2} - Delete the specified subcommunity " +
-            "(communityId2) in the specified community (communityId).</li>" +
-            "</ul>" +
-            "<h2>Collections</h2>" +
-            "<ul>" +
-            "<li>GET /collections - Return all DSpace collections in array.</li>" +
-            "<li>GET /collections/{collectionId} - Return a collection with the specified ID.</li>" +
-            "<li>GET /collections/{collectionId}/items - Return all items of the specified collection.</li>" +
-            "<li>POST /collections/{collectionId}/items - Create an item in the specified collection. You must post " +
-            "an item.</li>" +
-            "<li>POST /collections/find-collection - Find a collection by name.</li>" +
-            "<li>PUT /collections/{collectionId} </li> - Update the specified collection. You must post a collection." +
-            "<li>DELETE /collections/{collectionId} - Delete the specified collection from DSpace.</li>" +
-            "<li>DELETE /collections/{collectionId}/items/{itemId} - Delete the specified item (itemId) in the " +
-            "specified collection (collectionId). </li>" +
-            "</ul>" +
-            "<h2>Items</h2>" +
-            "<ul>" +
-            "<li>GET /items - Return a list of items.</li>" +
-            "<li>GET /items/{item id} - Return the specified item.</li>" +
-            "<li>GET /items/{item id}/metadata - Return metadata of the specified item.</li>" +
-            "<li>GET /items/{item id}/bitstreams - Return bitstreams of the specified item.</li>" +
-            "<li>POST /items/find-by-metadata-field - Find items by the specified metadata value.</li>" +
-            "<li>POST /items/{item id}/metadata - Add metadata to the specified item.</li>" +
-            "<li>POST /items/{item id}/bitstreams - Add a bitstream to the specified item.</li>" +
-            "<li>PUT /items/{item id}/metadata - Update metadata in the specified item.</li>" +
-            "<li>DELETE /items/{item id} - Delete the specified item.</li>" +
-            "<li>DELETE /items/{item id}/metadata - Clear metadata of the specified item.</li>" +
-            "<li>DELETE /items/{item id}/bitstreams/{bitstream id} - Delete the specified bitstream of the specified " +
-            "item.</li>" +
-            "</ul>" +
-            "<h2>Bitstreams</h2>" +
-            "<ul>" +
-            "<li>GET /bitstreams - Return all bitstreams in DSpace.</li>" +
-            "<li>GET /bitstreams/{bitstream id} - Return the specified bitstream.</li>" +
-            "<li>GET /bitstreams/{bitstream id}/policy - Return policies of the specified bitstream.</li>" +
-            "<li>GET /bitstreams/{bitstream id}/retrieve - Return the contents of the specified bitstream.</li>" +
-            "<li>POST /bitstreams/{bitstream id}/policy - Add a policy to the specified bitstream.</li>" +
-            "<li>PUT /bitstreams/{bitstream id}/data - Update the contents of the specified bitstream.</li>" +
-            "<li>PUT /bitstreams/{bitstream id} - Update metadata of the specified bitstream.</li>" +
-            "<li>DELETE /bitstreams/{bitstream id} - Delete the specified bitstream from DSpace.</li>" +
-            "<li>DELETE /bitstreams/{bitstream id}/policy/{policy_id} - Delete the specified bitstream policy.</li>" +
-            "</ul>" +
-            "<h2>Hierarchy</h2>" +
-            "<ul>" +
-            "<li>GET /hierarchy - Return hierarchy of communities and collections in tree form. Each object is " +
-            "minimally populated (name, handle, id) for efficient retrieval.</li>" +
-            "</ul>" +
-            "<h2>Metadata and Schema Registry</h2>" +
-            "<ul>" +
-            "<li>GET /registries/schema - Return the list of metadata schemas in the registry</li>" +
-            "<li>GET /registries/schema/{schema_prefix} - Returns the specified metadata schema</li>" +
-            "<li>GET /registries/schema/{schema_prefix}/metadata-fields/{element} - Returns the metadata field within" +
-            " a schema with an unqualified element name</li>" +
-            "<li>GET /registries/schema/{schema_prefix}/metadata-fields/{element}/{qualifier} - Returns the metadata " +
-            "field within a schema with a qualified element name</li>" +
-            "<li>POST /registries/schema/ - Add a schema to the schema registry</li>" +
-            "<li>POST /registries/schema/{schema_prefix}/metadata-fields - Add a metadata field to the specified " +
-            "schema</li>" +
-            "<li>GET /registries/metadata-fields/{field_id} - Return the specified metadata field</li>" +
-            "<li>PUT /registries/metadata-fields/{field_id} - Update the specified metadata field</li>" +
-            "<li>DELETE /registries/metadata-fields/{field_id} - Delete the specified metadata field from the " +
-            "metadata field registry</li>" +
-            "<li>DELETE /registries/schema/{schema_id} - Delete the specified schema from the schema registry</li>" +
-            "</ul>" +
-            "<h2>Query/Reporting Tools</h2>" +
-            "<ul>" +
-            "<li>GET /reports - Return a list of report tools built on the rest api</li>" +
-            "<li>GET /reports/{nickname} - Return a redirect to a specific report</li>" +
-            "<li>GET /filters - Return a list of use case filters available for quality control reporting</li>" +
-            "<li>GET /filtered-collections - Return collections and item counts based on pre-defined filters</li>" +
-            "<li>GET /filtered-collections/{collection_id} - Return items and item counts for a collection based on " +
-            "pre-defined filters</li>" +
-            "<li>GET /filtered-items - Retrieve a set of items based on a metadata query and a set of filters</li>" +
-            "</ul>" +
-            "</body></html> ";
-    }
-
-    /**
-     * Method only for testing whether the REST API is running.
-     *
-     * @return String "REST api is running."
-     */
-    @GET
-    @Path("/test")
-    public String test() {
-        return "REST api is running.";
-    }
-
-    /**
-     * Method to login a user into REST API.
-     *
-     * @return Returns response code OK and a token. Otherwise returns response
-     * code FORBIDDEN(403).
-     */
-    @POST
-    @Path("/login")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response login() {
-        //If you can get here, you are authenticated, the actual login is handled by spring security
-        return Response.ok().build();
-    }
-
-    @GET
-    @Path("/shibboleth-login")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response shibbolethLogin() {
-        //If you can get here, you are authenticated, the actual login is handled by spring security
-        return Response.ok().build();
-    }
-
-    @GET
-    @Path("/login-shibboleth")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response shibbolethLoginEndPoint() {
-        org.dspace.core.Context context = null;
-        try {
-            context = Resource.createContext();
-            AuthenticationService authenticationService = AuthenticateServiceFactory.getInstance()
-                                                                                    .getAuthenticationService();
-            Iterator<AuthenticationMethod> authenticationMethodIterator = authenticationService
-                .authenticationMethodIterator();
-            while (authenticationMethodIterator.hasNext()) {
-                AuthenticationMethod authenticationMethod = authenticationMethodIterator.next();
-                if (authenticationMethod instanceof ShibAuthentication) {
-                    //TODO: Perhaps look for a better way of handling this ?
-                    org.dspace.services.model.Request currentRequest = new DSpace().getRequestService()
-                                                                                   .getCurrentRequest();
-                    String loginPageURL = authenticationMethod
-                        .loginPageURL(context, currentRequest.getHttpServletRequest(),
-                                      currentRequest.getHttpServletResponse());
-                    if (StringUtils.isNotBlank(loginPageURL)) {
-                        currentRequest.getHttpServletResponse().sendRedirect(loginPageURL);
-                    }
-                }
-            }
-            context.abort();
-        } catch (ContextException | SQLException | IOException e) {
-            Resource.processException("Shibboleth endpoint error:  " + e.getMessage(), context);
-        } finally {
-            if (context != null && context.isValid()) {
-                context.abort();
-            }
-
-        }
-        return Response.ok().build();
-    }
-
-    /**
-     * Method to logout a user from DSpace REST API. Removes the token and user from
-     * TokenHolder.
-     *
-     * @param headers Request header which contains the header named
-     *                "rest-dspace-token" containing the token as value.
-     * @return Return response OK, otherwise BAD_REQUEST, if there was a problem with
-     * logout or the token is incorrect.
-     */
-    @POST
-    @Path("/logout")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Response logout(@Context HttpHeaders headers) {
-        //If you can get here, you are logged out, this actual logout is handled by spring security
-        return Response.ok().build();
-    }
-
-    /**
-     * Method to check current status of the service and logged in user.
-     *
-     * okay: true | false
-     * authenticated: true | false
-     * epersonEMAIL: user@example.com
-     * epersonNAME: John Doe
-     *
-     * @param headers Request header which contains the header named
-     *                "rest-dspace-token" containing the token as value.
-     * @return status the Status object with information about REST API
-     * @throws UnsupportedEncodingException The Character Encoding is not supported.
-     */
-    @GET
-    @Path("/status")
-    @Consumes( {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML})
-    public Status status(@Context HttpHeaders headers)
-        throws UnsupportedEncodingException {
-        org.dspace.core.Context context = null;
-
-        try {
-            context = Resource.createContext();
-            EPerson ePerson = context.getCurrentUser();
-
-            if (ePerson != null) {
-                //DB EPerson needed since token won't have full info, need context
-                EPerson dbEPerson = epersonService.findByEmail(context, ePerson.getEmail());
-
-                Status status = new Status(dbEPerson.getEmail(), dbEPerson.getFullName());
-                return status;
-            }
-        } catch (ContextException e) {
-            Resource.processException("Status context error: " + e.getMessage(), context);
-        } catch (SQLException e) {
-            Resource.processException("Status eperson db lookup error: " + e.getMessage(), context);
-        } finally {
-            context.abort();
-        }
-
-        //fallback status, unauth
-        return new Status();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/RestReports.java b/dspace-rest/src/main/java/org/dspace/rest/RestReports.java
deleted file mode 100644
index 4af556b6f8..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/RestReports.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.WebApplicationException;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriInfo;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.rest.common.Report;
-import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-
-/**
- * Root of RESTful api. It provides login and logout. Also have method for
- * printing every method which is provides by RESTful api.
- *
- * @author Terry Brady, Georgetown University
- */
-@Path("/reports")
-public class RestReports {
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(RestReports.class);
-
-    protected ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
-    public static final String REST_RPT_URL = "rest.report-url.";
-
-    /**
-     * Return html page with information about REST api. It contains methods all
-     * methods provide by REST api.
-     *
-     * @return HTML page which has information about all methods of REST api.
-     */
-    @GET
-    @Produces(MediaType.APPLICATION_XML)
-    public Report[] reportIndex()
-        throws WebApplicationException {
-        ArrayList<Report> reports = new ArrayList<Report>();
-        List<String> propNames = configurationService.getPropertyKeys("rest");
-        for (String propName : propNames) {
-            if (propName.startsWith(REST_RPT_URL)) {
-                String nickname = propName.substring(REST_RPT_URL.length());
-                String url = configurationService.getProperty(propName);
-                reports.add(new Report(nickname, url));
-            }
-        }
-        return reports.toArray(new Report[0]);
-    }
-
-    @Path("/{report_nickname}")
-    @GET
-    public Response customReport(@PathParam("report_nickname") String report_nickname, @Context UriInfo uriInfo)
-        throws WebApplicationException {
-        URI uri = null;
-        if (!report_nickname.isEmpty()) {
-            log.info(String.format("Seeking report %s", report_nickname));
-            String url = configurationService.getProperty(REST_RPT_URL + report_nickname);
-
-            log.info(String.format("URL for report %s found: [%s]", report_nickname, url));
-            if (!url.isEmpty()) {
-                uri = uriInfo.getBaseUriBuilder().path(url).build("");
-                log.info(String.format("URI for report %s", uri));
-            }
-        }
-
-        if (uri != null) {
-            return Response.temporaryRedirect(uri).build();
-        }
-
-        return Response.noContent().build();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/authentication/DSpaceAuthenticationProvider.java b/dspace-rest/src/main/java/org/dspace/rest/authentication/DSpaceAuthenticationProvider.java
deleted file mode 100644
index eac4c40111..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/authentication/DSpaceAuthenticationProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.authentication;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.dspace.authenticate.AuthenticationMethod;
-import org.dspace.authenticate.factory.AuthenticateServiceFactory;
-import org.dspace.authenticate.service.AuthenticationService;
-import org.dspace.core.Context;
-import org.dspace.core.LogHelper;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.Group;
-import org.dspace.utils.DSpace;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.authentication.BadCredentialsException;
-import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.AuthenticationException;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-
-/**
- * The core authentication & authorization provider, this provider is called when logging in & will process
- *
- * @author Roeland Dillen (roeland at atmire dot com)
- * @author kevinvandevelde at atmire.com
- *
- * FIXME This provider handles both the authorization as well as the authentication,
- * due to the way that the DSpace authentication is implemented there is currently no other way to do this.
- */
-public class DSpaceAuthenticationProvider implements AuthenticationProvider {
-
-    private static final Logger log = LogManager.getLogger();
-
-    protected AuthenticationService authenticationService = AuthenticateServiceFactory.getInstance()
-                                                                                      .getAuthenticationService();
-
-    @Override
-    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
-        Context context = null;
-
-        try {
-            context = new Context();
-            String name = authentication.getName();
-            String password = authentication.getCredentials().toString();
-            HttpServletRequest httpServletRequest = new DSpace().getRequestService().getCurrentRequest()
-                                                                .getHttpServletRequest();
-            List<SimpleGrantedAuthority> grantedAuthorities = new ArrayList<>();
-
-
-            int implicitStatus = authenticationService
-                .authenticateImplicit(context, null, null, null, httpServletRequest);
-
-            if (implicitStatus == AuthenticationMethod.SUCCESS) {
-                log.info(LogHelper.getHeader(context, "login", "type=implicit"));
-                addSpecialGroupsToGrantedAuthorityList(context, httpServletRequest, grantedAuthorities);
-                return createAuthenticationToken(password, context, grantedAuthorities);
-
-            } else {
-                int authenticateResult = authenticationService
-                    .authenticate(context, name, password, null, httpServletRequest);
-                if (AuthenticationMethod.SUCCESS == authenticateResult) {
-                    addSpecialGroupsToGrantedAuthorityList(context, httpServletRequest, grantedAuthorities);
-
-                    log.info(LogHelper.getHeader(context, "login", "type=explicit"));
-
-                    return createAuthenticationToken(password, context, grantedAuthorities);
-
-                } else {
-                    log.info(LogHelper.getHeader(context, "failed_login",
-                            "email=" + name + ", result=" + authenticateResult));
-                    throw new BadCredentialsException("Login failed");
-                }
-            }
-        } catch (BadCredentialsException e) {
-            throw e;
-        } catch (Exception e) {
-            log.error("Error while authenticating in the rest api", e);
-        } finally {
-            if (context != null && context.isValid()) {
-                try {
-                    context.complete();
-                } catch (SQLException e) {
-                    log.error(e.getMessage() + " occurred while trying to close", e);
-                }
-            }
-        }
-
-        return null;
-    }
-
-    protected void addSpecialGroupsToGrantedAuthorityList(Context context, HttpServletRequest httpServletRequest,
-                                                          List<SimpleGrantedAuthority> grantedAuthorities)
-        throws SQLException {
-        List<Group> groups = authenticationService.getSpecialGroups(context, httpServletRequest);
-        for (Group group : groups) {
-            grantedAuthorities.add(new SimpleGrantedAuthority(group.getName()));
-        }
-    }
-
-    private Authentication createAuthenticationToken(final String password, final Context context,
-                                                     final List<SimpleGrantedAuthority> grantedAuthorities) {
-        EPerson ePerson = context.getCurrentUser();
-        if (ePerson != null && StringUtils.isNotBlank(ePerson.getEmail())) {
-            return new UsernamePasswordAuthenticationToken(ePerson.getEmail(), password, grantedAuthorities);
-
-        } else {
-            log.info(LogHelper.getHeader(context, "failed_login",
-                    "No eperson with an non-blank e-mail address found"));
-            throw new BadCredentialsException("Login failed");
-        }
-    }
-
-    @Override
-    public boolean supports(Class<?> authentication) {
-        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
-    }
-}
\ No newline at end of file
diff --git a/dspace-rest/src/main/java/org/dspace/rest/authentication/NoRedirectAuthenticationLoginSuccessHandler.java b/dspace-rest/src/main/java/org/dspace/rest/authentication/NoRedirectAuthenticationLoginSuccessHandler.java
deleted file mode 100644
index af146f27b7..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/authentication/NoRedirectAuthenticationLoginSuccessHandler.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.authentication;
-
-import java.io.IOException;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.web.RedirectStrategy;
-import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
-
-/**
- * @author kevinvandevelde at atmire.com
- *
- * Spring redirects to the home page after a successfull login. This success handles ensures that this is NOT the case.
- */
-public class NoRedirectAuthenticationLoginSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
-
-    @PostConstruct
-    public void afterPropertiesSet() {
-        setRedirectStrategy(new NoRedirectStrategy());
-    }
-
-    protected class NoRedirectStrategy implements RedirectStrategy {
-
-        @Override
-        public void sendRedirect(HttpServletRequest request,
-                                 HttpServletResponse response, String url) throws IOException {
-            // no redirect
-
-        }
-
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/authentication/NoRedirectAuthenticationLogoutSuccessHandler.java b/dspace-rest/src/main/java/org/dspace/rest/authentication/NoRedirectAuthenticationLogoutSuccessHandler.java
deleted file mode 100644
index db28f2e388..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/authentication/NoRedirectAuthenticationLogoutSuccessHandler.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.authentication;
-
-import java.io.IOException;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.security.web.RedirectStrategy;
-import org.springframework.security.web.authentication.logout.SimpleUrlLogoutSuccessHandler;
-
-/**
- * @author kevinvandevelde at atmire.com
- *
- * Spring redirects to the home page after a successfull logout. This success handles ensures that this is NOT the case.
- */
-public class NoRedirectAuthenticationLogoutSuccessHandler extends SimpleUrlLogoutSuccessHandler {
-    @PostConstruct
-    public void afterPropertiesSet() {
-        setRedirectStrategy(new NoRedirectStrategy());
-    }
-
-    protected class NoRedirectStrategy implements RedirectStrategy {
-
-        @Override
-        public void sendRedirect(HttpServletRequest request,
-                                 HttpServletResponse response, String url) throws IOException {
-            // no redirect
-
-        }
-
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/Bitstream.java b/dspace-rest/src/main/java/org/dspace/rest/common/Bitstream.java
deleted file mode 100644
index 7eb198990e..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/Bitstream.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.Bundle;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.BitstreamService;
-import org.dspace.content.service.BundleService;
-import org.dspace.core.Constants;
-import org.dspace.core.Context;
-import org.dspace.utils.DSpace;
-
-/**
- * Created with IntelliJ IDEA.
- * User: peterdietz
- * Date: 9/21/13
- * Time: 12:54 AM
- * To change this template use File | Settings | File Templates.
- */
-@XmlRootElement(name = "bitstream")
-public class Bitstream extends DSpaceObject {
-    protected BitstreamService bitstreamService = ContentServiceFactory.getInstance().getBitstreamService();
-    protected BundleService bundleService = ContentServiceFactory.getInstance().getBundleService();
-
-    Logger log = org.apache.logging.log4j.LogManager.getLogger(Bitstream.class);
-
-    private String bundleName;
-    private String description;
-    private String format;
-    private String mimeType;
-    private Long sizeBytes;
-    private DSpaceObject parentObject;
-    private String retrieveLink;
-    private CheckSum checkSum;
-    private Integer sequenceId;
-
-    private ResourcePolicy[] policies = null;
-
-    public Bitstream() {
-
-    }
-
-    public Bitstream(org.dspace.content.Bitstream bitstream, ServletContext servletContext, String expand,
-                     Context context)
-        throws SQLException {
-        super(bitstream, servletContext);
-        setup(bitstream, servletContext, expand, context);
-    }
-
-    public void setup(org.dspace.content.Bitstream bitstream, ServletContext servletContext, String expand,
-                      Context context)
-        throws SQLException {
-        List<String> expandFields = new ArrayList<String>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-
-        //A logo bitstream might not have a bundle...
-        if (bitstream.getBundles() != null && !bitstream.getBundles().isEmpty()) {
-            if (bitstreamService.getParentObject(context, bitstream).getType() == Constants.ITEM) {
-                bundleName = bitstream.getBundles().get(0).getName();
-            }
-        }
-
-        description = bitstream.getDescription();
-        format = bitstreamService.getFormatDescription(context, bitstream);
-        sizeBytes = bitstream.getSizeBytes();
-        String path = new DSpace().getRequestService().getCurrentRequest().getHttpServletRequest().getContextPath();
-        retrieveLink = path + "/bitstreams/" + bitstream.getID() + "/retrieve";
-        mimeType = bitstreamService.getFormat(context, bitstream).getMIMEType();
-        sequenceId = bitstream.getSequenceID();
-        CheckSum checkSum = new CheckSum();
-        checkSum.setCheckSumAlgorith(bitstream.getChecksumAlgorithm());
-        checkSum.setValue(bitstream.getChecksum());
-        this.setCheckSum(checkSum);
-
-        if (expandFields.contains("parent") || expandFields.contains("all")) {
-            parentObject = new DSpaceObject(bitstreamService.getParentObject(context, bitstream), servletContext);
-        } else {
-            this.addExpand("parent");
-        }
-
-        if (expandFields.contains("policies") || expandFields.contains("all")) {
-            // Find policies without context.
-            List<ResourcePolicy> tempPolicies = new ArrayList<ResourcePolicy>();
-            List<Bundle> bundles = bitstream.getBundles();
-            for (Bundle bundle : bundles) {
-                List<org.dspace.authorize.ResourcePolicy> bitstreamsPolicies = bundleService
-                    .getBitstreamPolicies(context, bundle);
-                for (org.dspace.authorize.ResourcePolicy policy : bitstreamsPolicies) {
-                    if (policy.getdSpaceObject().equals(bitstream)) {
-                        tempPolicies.add(new ResourcePolicy(policy));
-                    }
-                }
-            }
-
-            policies = tempPolicies.toArray(new ResourcePolicy[0]);
-        } else {
-            this.addExpand("policies");
-        }
-
-        if (!expandFields.contains("all")) {
-            this.addExpand("all");
-        }
-    }
-
-    public Integer getSequenceId() {
-        return sequenceId;
-    }
-
-    public void setSequenceId(Integer sequenceId) {
-        this.sequenceId = sequenceId;
-    }
-
-    public String getBundleName() {
-        return bundleName;
-    }
-
-    public void setBundleName(String bundleName) {
-        this.bundleName = bundleName;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setFormat(String format) {
-        this.format = format;
-    }
-
-    public void setMimeType(String mimeType) {
-        this.mimeType = mimeType;
-    }
-
-    public void setSizeBytes(Long sizeBytes) {
-        this.sizeBytes = sizeBytes;
-    }
-
-    public void setParentObject(DSpaceObject parentObject) {
-        this.parentObject = parentObject;
-    }
-
-    public void setRetrieveLink(String retrieveLink) {
-        this.retrieveLink = retrieveLink;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public String getFormat() {
-        return format;
-    }
-
-    public String getMimeType() {
-        return mimeType;
-    }
-
-    public Long getSizeBytes() {
-        return sizeBytes;
-    }
-
-    public String getRetrieveLink() {
-        return retrieveLink;
-    }
-
-    public DSpaceObject getParentObject() {
-        return parentObject;
-    }
-
-    public CheckSum getCheckSum() {
-        return checkSum;
-    }
-
-    public void setCheckSum(CheckSum checkSum) {
-        this.checkSum = checkSum;
-    }
-
-    public ResourcePolicy[] getPolicies() {
-        return policies;
-    }
-
-    public void setPolicies(ResourcePolicy[] policies) {
-        this.policies = policies;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/CheckSum.java b/dspace-rest/src/main/java/org/dspace/rest/common/CheckSum.java
deleted file mode 100644
index 2db36ae9a0..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/CheckSum.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-
-package org.dspace.rest.common;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.XmlValue;
-
-@XmlType
-public class CheckSum {
-    String checkSumAlgorithm;
-    String value;
-
-    public CheckSum() {
-    }
-
-    @XmlAttribute(name = "checkSumAlgorithm")
-    public String getCheckSumAlgorith() {
-        return checkSumAlgorithm;
-    }
-
-    public void setCheckSumAlgorith(String checkSumAlgorith) {
-        this.checkSumAlgorithm = checkSumAlgorith;
-    }
-
-    @XmlValue
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/Collection.java b/dspace-rest/src/main/java/org/dspace/rest/common/Collection.java
deleted file mode 100644
index be6e698b4d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/Collection.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import static org.dspace.content.service.DSpaceObjectService.MD_COPYRIGHT_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_INTRODUCTORY_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_SHORT_DESCRIPTION;
-import static org.dspace.content.service.DSpaceObjectService.MD_SIDEBAR_TEXT;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.CommunityService;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-
-/**
- * Created with IntelliJ IDEA.
- * User: peterdietz
- * Date: 5/22/13
- * Time: 9:41 AM
- */
-@XmlRootElement(name = "collection")
-public class Collection extends DSpaceObject {
-    protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-
-    Logger log = org.apache.logging.log4j.LogManager.getLogger(Collection.class);
-
-    //Relationships
-    private Bitstream logo;
-    private Community parentCommunity;
-    private List<Community> parentCommunityList = new ArrayList<>();
-
-    private List<Item> items = new ArrayList<>();
-
-    //Collection-Metadata
-    private String license;
-    private String copyrightText;
-    private String introductoryText;
-    private String shortDescription;
-    private String sidebarText;
-
-    //Calculated
-    private Integer numberItems;
-
-    public Collection() {
-    }
-
-    public Collection(org.dspace.content.Collection collection, ServletContext servletContext, String expand,
-                      Context context, Integer limit, Integer offset)
-        throws SQLException, WebApplicationException {
-        super(collection, servletContext);
-        setup(collection, servletContext, expand, context, limit, offset);
-    }
-
-    private void setup(org.dspace.content.Collection collection, ServletContext servletContext, String expand,
-                       Context context, Integer limit, Integer offset)
-        throws SQLException {
-        List<String> expandFields = new ArrayList<>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-
-        this.setCopyrightText(collectionService.getMetadataFirstValue(collection,
-                MD_COPYRIGHT_TEXT, org.dspace.content.Item.ANY));
-        this.setIntroductoryText(collectionService.getMetadataFirstValue(collection,
-                MD_INTRODUCTORY_TEXT, org.dspace.content.Item.ANY));
-        this.setShortDescription(collectionService.getMetadataFirstValue(collection,
-                MD_SHORT_DESCRIPTION, org.dspace.content.Item.ANY));
-        this.setSidebarText(collectionService.getMetadataFirstValue(collection,
-                MD_SIDEBAR_TEXT, org.dspace.content.Item.ANY));
-
-        if (expandFields.contains("parentCommunityList") || expandFields.contains("all")) {
-            List<org.dspace.content.Community> parentCommunities = communityService.getAllParents(context, collection);
-            for (org.dspace.content.Community parentCommunity : parentCommunities) {
-                this.addParentCommunityList(new Community(parentCommunity, servletContext, null, context));
-            }
-        } else {
-            this.addExpand("parentCommunityList");
-        }
-
-        if (expandFields.contains("parentCommunity") | expandFields.contains("all")) {
-            org.dspace.content.Community parentCommunity =
-                (org.dspace.content.Community) collectionService
-                    .getParentObject(context, collection);
-            this.setParentCommunity(new Community(
-                parentCommunity, servletContext, null, context));
-        } else {
-            this.addExpand("parentCommunity");
-        }
-
-        //TODO: Item paging. limit, offset/page
-        if (expandFields.contains("items") || expandFields.contains("all")) {
-            Iterator<org.dspace.content.Item> childItems =
-                itemService.findByCollection(context, collection, limit, offset);
-
-            items = new ArrayList<>();
-            while (childItems.hasNext()) {
-                org.dspace.content.Item item = childItems.next();
-
-                if (itemService.isItemListedForUser(context, item)) {
-                    items.add(new Item(item, servletContext, null, context));
-                }
-            }
-        } else {
-            this.addExpand("items");
-        }
-
-        if (expandFields.contains("license") || expandFields.contains("all")) {
-            setLicense(collectionService.getLicense(collection));
-        } else {
-            this.addExpand("license");
-        }
-
-        if (expandFields.contains("logo") || expandFields.contains("all")) {
-            if (collection.getLogo() != null) {
-                this.logo = new Bitstream(collection.getLogo(), servletContext, null, context);
-            }
-        } else {
-            this.addExpand("logo");
-        }
-
-        if (!expandFields.contains("all")) {
-            this.addExpand("all");
-        }
-
-        this.setNumberItems(itemService.countItems(context, collection));
-    }
-
-    public Bitstream getLogo() {
-        return logo;
-    }
-
-    public Integer getNumberItems() {
-        return numberItems;
-    }
-
-    public void setNumberItems(Integer numberItems) {
-        this.numberItems = numberItems;
-    }
-
-    public Community getParentCommunity() {
-        return parentCommunity;
-    }
-
-    public void setParentCommunity(Community parentCommunity) {
-        this.parentCommunity = parentCommunity;
-    }
-
-    public List<Item> getItems() {
-        return items;
-    }
-
-    public void setItems(List<Item> items) {
-        this.items = items;
-    }
-
-    public void setParentCommunityList(List<Community> parentCommunityList) {
-        this.parentCommunityList = parentCommunityList;
-    }
-
-    public List<Community> getParentCommunityList() {
-        return parentCommunityList;
-    }
-
-    public void addParentCommunityList(Community parentCommunity) {
-        this.parentCommunityList.add(parentCommunity);
-    }
-
-    public String getLicense() {
-        return license;
-    }
-
-    public void setLicense(String license) {
-        this.license = license;
-    }
-
-    public String getCopyrightText() {
-        return copyrightText;
-    }
-
-    public void setCopyrightText(String copyrightText) {
-        this.copyrightText = copyrightText;
-    }
-
-    public String getIntroductoryText() {
-        return introductoryText;
-    }
-
-    public void setIntroductoryText(String introductoryText) {
-        this.introductoryText = introductoryText;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public String getSidebarText() {
-        return sidebarText;
-    }
-
-    public void setSidebarText(String sidebarText) {
-        this.sidebarText = sidebarText;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/Community.java b/dspace-rest/src/main/java/org/dspace/rest/common/Community.java
deleted file mode 100644
index e6e4716eab..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/Community.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import static org.dspace.content.service.DSpaceObjectService.MD_COPYRIGHT_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_INTRODUCTORY_TEXT;
-import static org.dspace.content.service.DSpaceObjectService.MD_SHORT_DESCRIPTION;
-import static org.dspace.content.service.DSpaceObjectService.MD_SIDEBAR_TEXT;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CommunityService;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-
-/**
- * Created with IntelliJ IDEA.
- * User: peterdietz
- * Date: 5/22/13
- * Time: 9:41 AM
- * To change this template use File | Settings | File Templates.
- */
-@XmlRootElement(name = "community")
-public class Community extends DSpaceObject {
-    protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(Community.class);
-
-    //Exandable relationships
-    private Bitstream logo;
-
-    private Community parentCommunity;
-
-    private String copyrightText;
-    private String introductoryText;
-    private String shortDescription;
-    private String sidebarText;
-    private Integer countItems;
-
-    private List<Community> subcommunities = new ArrayList<>();
-
-    private List<Collection> collections = new ArrayList<>();
-
-    public Community() {
-    }
-
-    public Community(org.dspace.content.Community community, ServletContext servletContext, String expand,
-                     Context context)
-        throws SQLException, WebApplicationException {
-        super(community, servletContext);
-        setup(community, servletContext, expand, context);
-    }
-
-    private void setup(org.dspace.content.Community community, ServletContext servletContext, String expand,
-                       Context context)
-        throws SQLException {
-        List<String> expandFields = new ArrayList<>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-
-        this.setCopyrightText(communityService.getMetadataFirstValue(community,
-                MD_COPYRIGHT_TEXT, org.dspace.content.Item.ANY));
-        this.setIntroductoryText(communityService.getMetadataFirstValue(community,
-                MD_INTRODUCTORY_TEXT, org.dspace.content.Item.ANY));
-        this.setShortDescription(communityService.getMetadataFirstValue(community,
-                MD_SHORT_DESCRIPTION, org.dspace.content.Item.ANY));
-        this.setSidebarText(communityService.getMetadataFirstValue(community,
-                MD_SIDEBAR_TEXT, org.dspace.content.Item.ANY));
-        this.setCountItems(itemService.countItems(context, community));
-
-        if (expandFields.contains("parentCommunity") || expandFields.contains("all")) {
-            org.dspace.content.Community parentCommunity = (org.dspace.content.Community) communityService
-                .getParentObject(context, community);
-            if (parentCommunity != null) {
-                setParentCommunity(new Community(parentCommunity, servletContext, null, context));
-            }
-        } else {
-            this.addExpand("parentCommunity");
-        }
-
-        if (expandFields.contains("collections") || expandFields.contains("all")) {
-            List<org.dspace.content.Collection> collections = community.getCollections();
-            List<org.dspace.rest.common.Collection> restCollections = new ArrayList<>();
-
-            for (org.dspace.content.Collection collection : collections) {
-                if (authorizeService.authorizeActionBoolean(context, collection, org.dspace.core.Constants.READ)) {
-                    restCollections.add(new Collection(collection, servletContext, null, context, null, null));
-                } else {
-                    log.info("Omitted restricted collection: " + collection.getID() + " _ " + collection.getName());
-                }
-            }
-            setCollections(restCollections);
-        } else {
-            this.addExpand("collections");
-        }
-
-        if (expandFields.contains("subCommunities") || expandFields.contains("all")) {
-            List<org.dspace.content.Community> communities = community.getSubcommunities();
-            subcommunities = new ArrayList<>();
-            for (org.dspace.content.Community subCommunity : communities) {
-                if (authorizeService.authorizeActionBoolean(context, subCommunity, org.dspace.core.Constants.READ)) {
-                    subcommunities.add(new Community(subCommunity, servletContext, null, context));
-                } else {
-                    log.info(
-                        "Omitted restricted subCommunity: " + subCommunity.getID() + " _ " + subCommunity.getName());
-                }
-            }
-        } else {
-            this.addExpand("subCommunities");
-        }
-
-        if (expandFields.contains("logo") || expandFields.contains("all")) {
-            if (community.getLogo() != null) {
-                logo = new Bitstream(community.getLogo(), servletContext, null, context);
-            }
-        } else {
-            this.addExpand("logo");
-        }
-
-        if (!expandFields.contains("all")) {
-            this.addExpand("all");
-        }
-    }
-
-    public List<Collection> getCollections() {
-        return collections;
-    }
-
-    public void setCollections(List<Collection> collections) {
-        this.collections = collections;
-    }
-
-    public Integer getCountItems() {
-        return countItems;
-    }
-
-    public void setCountItems(Integer countItems) {
-        this.countItems = countItems;
-    }
-
-    public String getSidebarText() {
-        return sidebarText;
-    }
-
-    public void setSidebarText(String sidebarText) {
-        this.sidebarText = sidebarText;
-    }
-
-    public String getShortDescription() {
-        return shortDescription;
-    }
-
-    public void setShortDescription(String shortDescription) {
-        this.shortDescription = shortDescription;
-    }
-
-    public String getIntroductoryText() {
-        return introductoryText;
-    }
-
-    public void setIntroductoryText(String introductoryText) {
-        this.introductoryText = introductoryText;
-    }
-
-    public String getCopyrightText() {
-        return copyrightText;
-    }
-
-    public void setCopyrightText(String copyrightText) {
-        this.copyrightText = copyrightText;
-    }
-
-    public Community getParentCommunity() {
-        return parentCommunity;
-    }
-
-    public void setParentCommunity(Community parentCommunity) {
-        this.parentCommunity = parentCommunity;
-    }
-
-    public Bitstream getLogo() {
-        return logo;
-    }
-
-    public void setLogo(Bitstream logo) {
-        this.logo = logo;
-    }
-
-    // Renamed because of xml annotation exception with this attribute and getSubCommunities.
-    @XmlElement(name = "subcommunities", required = true)
-    public List<Community> getSubcommunities() {
-        return subcommunities;
-    }
-
-    public void setSubcommunities(List<Community> subcommunities) {
-        this.subcommunities = subcommunities;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/DSpaceObject.java b/dspace-rest/src/main/java/org/dspace/rest/common/DSpaceObject.java
deleted file mode 100644
index 08df254336..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/DSpaceObject.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.atteo.evo.inflector.English;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.DSpaceObjectService;
-
-/**
- * Created with IntelliJ IDEA.
- * User: peterdietz
- * Date: 10/7/13
- * Time: 12:11 PM
- * To change this template use File | Settings | File Templates.
- */
-@XmlRootElement(name = "dspaceobject")
-public class DSpaceObject {
-
-    private String uuid;
-
-    private String name;
-    private String handle;
-    private String type;
-
-    @XmlElement(name = "link", required = true)
-    private String link;
-
-    @XmlElement(required = true)
-    private ArrayList<String> expand = new ArrayList<String>();
-
-    public DSpaceObject() {
-
-    }
-
-    public DSpaceObject(org.dspace.content.DSpaceObject dso, ServletContext servletContext) {
-        setUUID(dso.getID().toString());
-        setName(dso.getName());
-        setHandle(dso.getHandle());
-        DSpaceObjectService dspaceObjectService = ContentServiceFactory.getInstance().getDSpaceObjectService(dso);
-        setType(dspaceObjectService.getTypeText(dso).toLowerCase());
-        link = createLink(servletContext);
-    }
-
-    public String getName() {
-        return this.name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getHandle() {
-        return handle;
-    }
-
-    public void setHandle(String handle) {
-        this.handle = handle;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public String getType() {
-        return this.type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-
-    public List<String> getExpand() {
-        return expand;
-    }
-
-    public void setExpand(ArrayList<String> expand) {
-        this.expand = expand;
-    }
-
-    public void addExpand(String expandableAttribute) {
-        this.expand.add(expandableAttribute);
-    }
-
-    public String getUUID() {
-        return uuid;
-    }
-
-    public void setUUID(String uuid) {
-        this.uuid = uuid;
-    }
-
-    private String createLink(ServletContext context) {
-        return context.getContextPath() + "/" + English.plural(getType()) + "/" + getUUID();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/FilteredCollection.java b/dspace-rest/src/main/java/org/dspace/rest/common/FilteredCollection.java
deleted file mode 100644
index c7ff0ef9b3..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/FilteredCollection.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.CommunityService;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-import org.dspace.rest.filter.ItemFilterSet;
-
-/**
- * Retrieve items within a collection that match a specific set of Item Filters of interest
- *
- * @author Terry Brady, Georgetown University
- */
-@XmlRootElement(name = "filtered-collection")
-public class FilteredCollection extends DSpaceObject {
-    protected CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
-    protected CollectionService collectionService = ContentServiceFactory.getInstance().getCollectionService();
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    Logger log = org.apache.logging.log4j.LogManager.getLogger(FilteredCollection.class);
-
-    //Relationships
-    private Community parentCommunity;
-    private Community topCommunity;
-    private List<Community> parentCommunityList = new ArrayList<Community>();
-
-    private List<Item> items = new ArrayList<Item>();
-
-    private List<ItemFilter> itemFilters = new ArrayList<ItemFilter>();
-
-    //Calculated
-    private Integer numberItems;
-    private Integer numberItemsProcessed;
-
-    public FilteredCollection() {
-    }
-
-    /**
-     * Evaluate a collection against of set of Item Filters
-     *
-     * @param collection     DSpace Collection to evaluate
-     * @param servletContext Context of the servlet container.
-     * @param filters        String representing a list of filters
-     * @param expand         String in which is what you want to add to returned instance
-     *                       of collection. Options are: "all", "parentCommunityList",
-     *                       "parentCommunity", "items", "license" and "logo". If you want
-     *                       to use multiple options, it must be separated by commas.
-     * @param context        The relevant DSpace Context.
-     * @param limit          Limit value for items in list in collection. Default value is 100.
-     * @param offset         Offset of start index in list of items of collection. Default
-     *                       value is 0.
-     * @throws SQLException            An exception that provides information on a database access error or other
-     * errors.
-     * @throws WebApplicationException Runtime exception for applications.
-     */
-    public FilteredCollection(org.dspace.content.Collection collection, ServletContext servletContext, String filters,
-                              String expand, Context context, Integer limit, Integer offset)
-        throws SQLException, WebApplicationException {
-        super(collection, servletContext);
-        setup(collection, servletContext, expand, context, limit, offset, filters);
-    }
-
-    private void setup(org.dspace.content.Collection collection, ServletContext servletContext, String expand,
-                       Context context, Integer limit, Integer offset, String filters) throws SQLException {
-        List<String> expandFields = new ArrayList<String>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-
-        if (expandFields.contains("parentCommunityList") || expandFields.contains("all")) {
-            List<org.dspace.content.Community> parentCommunities = communityService.getAllParents(context, collection);
-            List<Community> parentCommunityList = new ArrayList<Community>();
-            for (org.dspace.content.Community parentCommunity : parentCommunities) {
-                parentCommunityList.add(new Community(parentCommunity, servletContext, null, context));
-            }
-            this.setParentCommunityList(parentCommunityList);
-        } else {
-            this.addExpand("parentCommunityList");
-        }
-
-        if (expandFields.contains("parentCommunity") | expandFields.contains("all")) {
-            org.dspace.content.Community parentCommunity = collection.getCommunities().get(0);
-            this.setParentCommunity(new Community(parentCommunity, servletContext, null, context));
-        } else {
-            this.addExpand("parentCommunity");
-        }
-
-        if (expandFields.contains("topCommunity") | expandFields.contains("all")) {
-            List<org.dspace.content.Community> parentCommunities = communityService.getAllParents(context, collection);
-            if (parentCommunities.size() > 0) {
-                org.dspace.content.Community topCommunity = parentCommunities.get(parentCommunities.size() - 1);
-                this.setTopCommunity(new Community(topCommunity, servletContext, null, context));
-            }
-        } else {
-            this.addExpand("topCommunity");
-        }
-
-
-        boolean reportItems = expandFields.contains("items") || expandFields.contains("all");
-        ItemFilterSet itemFilterSet = new ItemFilterSet(filters, reportItems);
-        this.setItemFilters(itemFilterSet.getItemFilters());
-
-        this.setNumberItemsProcessed(0);
-        if (itemFilters.size() > 0) {
-            Iterator<org.dspace.content.Item> childItems = itemService
-                .findAllByCollection(context, collection, limit, offset);
-            int numProc = itemFilterSet
-                .processSaveItems(context, servletContext, childItems, items, reportItems, expand);
-            this.setNumberItemsProcessed(numProc);
-        }
-
-        if (!expandFields.contains("all")) {
-            this.addExpand("all");
-        }
-        this.setNumberItems(itemService.countAllItems(context, collection));
-    }
-
-    public Integer getNumberItems() {
-        return numberItems;
-    }
-
-    public void setNumberItems(Integer numberItems) {
-        this.numberItems = numberItems;
-    }
-
-    public Integer getNumberItemsProcessed() {
-        return numberItemsProcessed;
-    }
-
-    public void setNumberItemsProcessed(Integer numberItemsProcessed) {
-        this.numberItemsProcessed = numberItemsProcessed;
-    }
-
-    public Community getParentCommunity() {
-        return parentCommunity;
-    }
-
-    public void setParentCommunity(Community parentCommunity) {
-        this.parentCommunity = parentCommunity;
-    }
-
-    public Community getTopCommunity() {
-        return topCommunity;
-    }
-
-    public void setTopCommunity(Community topCommunity) {
-        this.topCommunity = topCommunity;
-    }
-
-
-    public List<Item> getItems() {
-        return items;
-    }
-
-    public void setItems(List<Item> items) {
-        this.items = items;
-    }
-
-    public void setParentCommunityList(List<Community> parentCommunityList) {
-        this.parentCommunityList = parentCommunityList;
-    }
-
-    public List<Community> getParentCommunityList() {
-        return parentCommunityList;
-    }
-
-    public List<ItemFilter> getItemFilters() {
-        return itemFilters;
-    }
-
-    public void setItemFilters(List<ItemFilter> itemFilters) {
-        this.itemFilters = itemFilters;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyCollection.java b/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyCollection.java
deleted file mode 100644
index 6c40faf62b..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyCollection.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Used to handle/determine status of REST API.
- * Mainly to know your authentication status
- */
-@XmlRootElement(name = "collection")
-public class HierarchyCollection extends HierarchyObject {
-    public HierarchyCollection() {
-    }
-
-    public HierarchyCollection(String id, String name, String handle) {
-        super(id, name, handle);
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyCommunity.java b/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyCommunity.java
deleted file mode 100644
index 3618608e3e..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyCommunity.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "community")
-public class HierarchyCommunity extends HierarchyObject {
-    private List<HierarchyCommunity> communities = new ArrayList<HierarchyCommunity>();
-    private List<HierarchyCollection> collections = new ArrayList<HierarchyCollection>();
-
-    public HierarchyCommunity() {
-    }
-
-    public HierarchyCommunity(String id, String name, String handle) {
-        super(id, name, handle);
-    }
-
-    @XmlElement(name = "community")
-    public List<HierarchyCommunity> getCommunities() {
-        return communities;
-    }
-
-    public void setCommunities(List<HierarchyCommunity> communities) {
-        this.communities = communities;
-    }
-
-    @XmlElement(name = "collection")
-    public List<HierarchyCollection> getCollections() {
-        return collections;
-    }
-
-    public void setCollections(List<HierarchyCollection> collections) {
-        this.collections = collections;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyObject.java b/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyObject.java
deleted file mode 100644
index 0074eeea6a..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchyObject.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "object")
-public class HierarchyObject {
-    //id may be a numeric id or a uuid depending on the version of DSpace
-    private String id;
-    private String name;
-    private String handle;
-
-    public HierarchyObject() {
-    }
-
-    public HierarchyObject(String id, String name, String handle) {
-        setId(id);
-        setName(name);
-        setHandle(handle);
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getHandle() {
-        return handle;
-    }
-
-    public void setHandle(String handle) {
-        this.handle = handle;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchySite.java b/dspace-rest/src/main/java/org/dspace/rest/common/HierarchySite.java
deleted file mode 100644
index 5eb2cc523c..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/HierarchySite.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Used to handle/determine status of REST API.
- * Mainly to know your authentication status
- */
-@XmlRootElement(name = "site")
-public class HierarchySite extends HierarchyCommunity {
-    public HierarchySite() {
-    }
-
-    public HierarchySite(String id, String name, String handle) {
-        super(id, name, handle);
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/Item.java b/dspace-rest/src/main/java/org/dspace/rest/common/Item.java
deleted file mode 100644
index 3794153b7d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/Item.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.app.util.factory.UtilServiceFactory;
-import org.dspace.app.util.service.MetadataExposureService;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.Bundle;
-import org.dspace.content.MetadataField;
-import org.dspace.content.MetadataValue;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-
-/**
- * Created with IntelliJ IDEA.
- * User: peterdietz
- * Date: 9/19/13
- * Time: 4:50 PM
- * To change this template use File | Settings | File Templates.
- */
-@SuppressWarnings("deprecation")
-@XmlRootElement(name = "item")
-public class Item extends DSpaceObject {
-    protected ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    protected MetadataExposureService metadataExposureService = UtilServiceFactory.getInstance()
-                                                                                  .getMetadataExposureService();
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-
-    Logger log = org.apache.logging.log4j.LogManager.getLogger(Item.class);
-
-    String isArchived;
-    String isWithdrawn;
-    String lastModified;
-
-    Collection parentCollection;
-    List<Collection> parentCollectionList;
-    List<Community> parentCommunityList;
-    List<MetadataEntry> metadata;
-    List<Bitstream> bitstreams;
-
-    public Item() {
-    }
-
-    public Item(org.dspace.content.Item item, ServletContext servletContext, String expand, Context context)
-        throws SQLException, WebApplicationException {
-        super(item, servletContext);
-        setup(item, servletContext, expand, context);
-    }
-
-    private void setup(org.dspace.content.Item item, ServletContext servletContext, String expand, Context context)
-        throws SQLException {
-        List<String> expandFields = new ArrayList<String>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-
-        if (expandFields.contains("metadata") || expandFields.contains("all")) {
-            metadata = new ArrayList<MetadataEntry>();
-            List<MetadataValue> metadataValues = itemService.getMetadata(
-                item, org.dspace.content.Item.ANY, org.dspace.content.Item.ANY,
-                org.dspace.content.Item.ANY, org.dspace.content.Item.ANY);
-
-            for (MetadataValue metadataValue : metadataValues) {
-                MetadataField metadataField = metadataValue.getMetadataField();
-                if (!metadataExposureService.isHidden(context,
-                                                      metadataField.getMetadataSchema().getName(),
-                                                      metadataField.getElement(),
-                                                      metadataField.getQualifier())) {
-                    metadata.add(new MetadataEntry(metadataField.toString('.'),
-                                                   metadataValue.getValue(), metadataValue.getLanguage()));
-                }
-            }
-        } else {
-            this.addExpand("metadata");
-        }
-
-        this.setArchived(Boolean.toString(item.isArchived()));
-        this.setWithdrawn(Boolean.toString(item.isWithdrawn()));
-        this.setLastModified(item.getLastModified().toString());
-
-        if (expandFields.contains("parentCollection") || expandFields.contains("all")) {
-            if (item.getOwningCollection() != null) {
-                this.parentCollection = new Collection(item.getOwningCollection(),
-                                                       servletContext, null, context, null, null);
-            } else {
-                this.addExpand("parentCollection");
-            }
-        } else {
-            this.addExpand("parentCollection");
-        }
-
-        if (expandFields.contains("parentCollectionList") || expandFields.contains("all")) {
-            this.parentCollectionList = new ArrayList<Collection>();
-            List<org.dspace.content.Collection> collections = item.getCollections();
-            for (org.dspace.content.Collection collection : collections) {
-                this.parentCollectionList.add(new Collection(collection,
-                                                             servletContext, null, context, null, null));
-            }
-        } else {
-            this.addExpand("parentCollectionList");
-        }
-
-        if (expandFields.contains("parentCommunityList") || expandFields.contains("all")) {
-            this.parentCommunityList = new ArrayList<Community>();
-            List<org.dspace.content.Community> communities = itemService.getCommunities(context, item);
-
-            for (org.dspace.content.Community community : communities) {
-                this.parentCommunityList.add(new Community(community, servletContext, null, context));
-            }
-        } else {
-            this.addExpand("parentCommunityList");
-        }
-
-        //TODO: paging - offset, limit
-        if (expandFields.contains("bitstreams") || expandFields.contains("all")) {
-            bitstreams = new ArrayList<Bitstream>();
-
-            List<Bundle> bundles = item.getBundles();
-            for (Bundle bundle : bundles) {
-
-                List<org.dspace.content.Bitstream> itemBitstreams = bundle.getBitstreams();
-                for (org.dspace.content.Bitstream itemBitstream : itemBitstreams) {
-                    if (authorizeService
-                        .authorizeActionBoolean(context, itemBitstream, org.dspace.core.Constants.READ)) {
-                        bitstreams.add(new Bitstream(itemBitstream, servletContext, null, context));
-                    }
-                }
-            }
-        } else {
-            this.addExpand("bitstreams");
-        }
-
-        if (!expandFields.contains("all")) {
-            this.addExpand("all");
-        }
-    }
-
-    public String getArchived() {
-        return isArchived;
-    }
-
-    public void setArchived(String archived) {
-        isArchived = archived;
-    }
-
-    public String getWithdrawn() {
-        return isWithdrawn;
-    }
-
-    public void setWithdrawn(String withdrawn) {
-        isWithdrawn = withdrawn;
-    }
-
-    public String getLastModified() {
-        return lastModified;
-    }
-
-    public void setLastModified(String lastModified) {
-        this.lastModified = lastModified;
-    }
-
-    public Collection getParentCollection() {
-        return parentCollection;
-    }
-
-    public List<Collection> getParentCollectionList() {
-        return parentCollectionList;
-    }
-
-    public List<MetadataEntry> getMetadata() {
-        return metadata;
-    }
-
-    public List<Bitstream> getBitstreams() {
-        return bitstreams;
-    }
-
-    public List<Community> getParentCommunityList() {
-        return parentCommunityList;
-    }
-
-    public void setParentCollection(Collection parentCollection) {
-        this.parentCollection = parentCollection;
-    }
-
-    public void setParentCollectionList(List<Collection> parentCollectionList) {
-        this.parentCollectionList = parentCollectionList;
-    }
-
-    public void setParentCommunityList(List<Community> parentCommunityList) {
-        this.parentCommunityList = parentCommunityList;
-    }
-
-    @XmlElement(required = true)
-    public void setMetadata(List<MetadataEntry> metadata) {
-        this.metadata = metadata;
-    }
-
-    public void setBitstreams(List<Bitstream> bitstreams) {
-        this.bitstreams = bitstreams;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/ItemFilter.java b/dspace-rest/src/main/java/org/dspace/rest/common/ItemFilter.java
deleted file mode 100644
index bc5bd13134..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/ItemFilter.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.core.Context;
-import org.dspace.core.factory.CoreServiceFactory;
-import org.dspace.rest.filter.ItemFilterDefs;
-import org.dspace.rest.filter.ItemFilterList;
-import org.dspace.rest.filter.ItemFilterTest;
-
-
-/**
- * Use Case Item Filters that match a specific set of criteria.
- *
- * @author Terry Brady, Georgetown University
- */
-@XmlRootElement(name = "item-filter")
-public class ItemFilter {
-    static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemFilter.class);
-
-    private ItemFilterTest itemFilterTest = null;
-    private String filterName = "";
-    private String title;
-    private String description;
-    private String category;
-    private String queryAnnotation;
-    private List<org.dspace.rest.common.Item> items = new ArrayList<org.dspace.rest.common.Item>();
-    private List<ItemFilterQuery> itemFilterQueries = new ArrayList<ItemFilterQuery>();
-    private List<MetadataEntry> metadata = new ArrayList<MetadataEntry>();
-    private Integer itemCount;
-    private Integer unfilteredItemCount;
-    private boolean saveItems = false;
-
-    public ItemFilter() {
-    }
-
-    public static final String ALL_FILTERS = "all_filters";
-    public static final String ALL = "all";
-
-    public static List<ItemFilter> getItemFilters(String filters, boolean saveItems) {
-        LinkedHashMap<String, ItemFilterTest> availableTests = new LinkedHashMap<String, ItemFilterTest>();
-        for (ItemFilterList plugobj :
-            (ItemFilterList[]) CoreServiceFactory.getInstance()
-                                                 .getPluginService().getPluginSequence(ItemFilterList.class)) {
-            for (ItemFilterTest defFilter : plugobj.getFilters()) {
-                availableTests.put(defFilter.getName(), defFilter);
-            }
-        }
-        List<ItemFilter> itemFilters = new ArrayList<ItemFilter>();
-        ItemFilter allFilters = new ItemFilter(ItemFilter.ALL_FILTERS, "Matches all specified filters",
-                                               "This filter includes all items that matched ALL specified filters",
-                                               ItemFilterDefs.CAT_ITEM, saveItems);
-
-        if (filters.equals(ALL)) {
-            for (ItemFilterTest itemFilterDef : availableTests.values()) {
-                itemFilters.add(new ItemFilter(itemFilterDef, saveItems));
-            }
-            itemFilters.add(allFilters);
-        } else {
-            for (String filter : Arrays.asList(filters.split(","))) {
-                if (filter.equals(ItemFilter.ALL_FILTERS)) {
-                    continue;
-                }
-
-                ItemFilterTest itemFilterDef;
-                itemFilterDef = availableTests.get(filter);
-                if (itemFilterDef == null) {
-                    continue;
-                }
-                itemFilters.add(new ItemFilter(itemFilterDef, saveItems));
-            }
-            itemFilters.add(allFilters);
-        }
-        return itemFilters;
-    }
-
-    public static ItemFilter getAllFiltersFilter(List<ItemFilter> itemFilters) {
-        for (ItemFilter itemFilter : itemFilters) {
-            if (itemFilter.getFilterName().equals(ALL_FILTERS)) {
-                itemFilter.initCount();
-                return itemFilter;
-            }
-        }
-        return null;
-    }
-
-    public ItemFilter(ItemFilterTest itemFilterTest, boolean saveItems)
-        throws WebApplicationException {
-        this.itemFilterTest = itemFilterTest;
-        this.saveItems = saveItems;
-        setup(itemFilterTest.getName(), itemFilterTest.getTitle(),
-              itemFilterTest.getDescription(), itemFilterTest.getCategory());
-    }
-
-    public ItemFilter(String name, String title, String description, String category, boolean saveItems)
-        throws WebApplicationException {
-        this.saveItems = saveItems;
-        setup(name, title, description, category);
-    }
-
-    private void setup(String name, String title, String description, String category) {
-        this.setFilterName(name);
-        this.setTitle(title);
-        this.setDescription(description);
-        this.setCategory(category);
-    }
-
-    private void initCount() {
-        if (itemCount == null) {
-            itemCount = 0;
-        }
-        if (unfilteredItemCount == null) {
-            unfilteredItemCount = 0;
-        }
-    }
-
-    public boolean hasItemTest() {
-        return itemFilterTest != null;
-    }
-
-    public void addItem(org.dspace.rest.common.Item restItem) {
-        initCount();
-        if (saveItems) {
-            items.add(restItem);
-        }
-        itemCount++;
-    }
-
-    public boolean testItem(Context context, org.dspace.content.Item item, org.dspace.rest.common.Item restItem) {
-        initCount();
-        if (itemFilterTest == null) {
-            return false;
-        }
-        if (itemFilterTest.testItem(context, item)) {
-            addItem(restItem);
-            return true;
-        }
-        return false;
-    }
-
-    @XmlAttribute(name = "filter-name")
-    public String getFilterName() {
-        return filterName;
-    }
-
-    public void setFilterName(String name) {
-        this.filterName = name;
-    }
-
-    @XmlAttribute(name = "title")
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    @XmlAttribute(name = "category")
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    @XmlAttribute(name = "description")
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    @XmlAttribute(name = "query-annotation")
-    public String getQueryAnnotation() {
-        return queryAnnotation;
-    }
-
-    public void annotateQuery(List<String> query_field, List<String> query_op, List<String> query_val)
-        throws SQLException {
-        int index = Math.min(query_field.size(), Math.min(query_op.size(), query_val.size()));
-        StringBuilder sb = new StringBuilder();
-
-        for (int i = 0; i < index; i++) {
-            if (!sb.toString().isEmpty()) {
-                sb.append(" and ");
-            }
-            sb.append("(");
-            sb.append(query_field.get(i));
-            sb.append(" ");
-            sb.append(query_op.get(i));
-            sb.append(" ");
-            sb.append(query_val.get(i));
-            sb.append(")");
-        }
-        setQueryAnnotation(sb.toString());
-    }
-
-    public void setQueryAnnotation(String queryAnnotation) {
-        this.queryAnnotation = queryAnnotation;
-    }
-
-    @XmlAttribute(name = "item-count")
-    public Integer getItemCount() {
-        return itemCount;
-    }
-
-    public void setItemCount(Integer itemCount) {
-        this.itemCount = itemCount;
-    }
-
-    @XmlAttribute(name = "unfiltered-item-count")
-    public Integer getUnfilteredItemCount() {
-        return unfilteredItemCount;
-    }
-
-    public void setUnfilteredItemCount(Integer unfilteredItemCount) {
-        this.unfilteredItemCount = unfilteredItemCount;
-    }
-
-    public List<org.dspace.rest.common.Item> getItems() {
-        return items;
-    }
-
-    public void setItems(List<org.dspace.rest.common.Item> items) {
-        this.items = items;
-    }
-
-    public List<ItemFilterQuery> getItemFilterQueries() {
-        return itemFilterQueries;
-    }
-
-    public void setItemFilterQueries(List<ItemFilterQuery> itemFilterQueries) {
-        this.itemFilterQueries = itemFilterQueries;
-    }
-
-    public void initMetadataList(List<String> show_fields) {
-        if (show_fields != null) {
-            List<MetadataEntry> returnFields = new ArrayList<MetadataEntry>();
-            for (String field : show_fields) {
-                returnFields.add(new MetadataEntry(field, null, null));
-            }
-            setMetadata(returnFields);
-        }
-    }
-
-    public List<MetadataEntry> getMetadata() {
-        return metadata;
-    }
-
-    @XmlElement(required = true)
-    public void setMetadata(List<MetadataEntry> metadata) {
-        this.metadata = metadata;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/ItemFilterQuery.java b/dspace-rest/src/main/java/org/dspace/rest/common/ItemFilterQuery.java
deleted file mode 100644
index 6f56e2b44c..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/ItemFilterQuery.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.apache.logging.log4j.Logger;
-
-/**
- * Metadata Query for DSpace Items using the REST API
- *
- * @author Terry Brady, Georgetown University
- */
-@XmlRootElement(name = "item-filter-query")
-public class ItemFilterQuery {
-    Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemFilterQuery.class);
-
-    private String field = "";
-    private String operation = "";
-    private String value = "";
-
-    public ItemFilterQuery() {
-    }
-
-    /**
-     * Construct a metadata query for DSpace items
-     *
-     * @param field     Name of the metadata field to query
-     * @param operation Operation to perform on a metadata field
-     * @param value     Query value.
-     * @throws WebApplicationException Runtime exception for applications.
-     */
-    public ItemFilterQuery(String field, String operation, String value) throws WebApplicationException {
-        setup(field, operation, value);
-    }
-
-    private void setup(String field, String operation, String value) {
-        this.setField(field);
-        this.setOperation(operation);
-        this.setValue(value);
-    }
-
-    @XmlAttribute(name = "field")
-    public String getField() {
-        return field;
-    }
-
-    public void setField(String field) {
-        this.field = field;
-    }
-
-    @XmlAttribute(name = "operation")
-    public String getOperation() {
-        return operation;
-    }
-
-    public void setOperation(String operation) {
-        this.operation = operation;
-    }
-
-    @XmlAttribute(name = "value")
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/MetadataEntry.java b/dspace-rest/src/main/java/org/dspace/rest/common/MetadataEntry.java
deleted file mode 100644
index 27f31cec9c..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/MetadataEntry.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.util.regex.Pattern;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * @author peterdietz, Rostislav Novak (Computing and Information Centre, CTU in
- * Prague)
- */
-@XmlRootElement(name = "metadataentry")
-public class MetadataEntry {
-    String key;
-
-    String value;
-
-    String language;
-
-    public MetadataEntry() {
-    }
-
-    public MetadataEntry(String key, String value, String language) {
-        this.key = key;
-        this.value = value;
-        this.language = language;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getKey() {
-        return key;
-    }
-
-    public void setKey(String key) {
-        this.key = key;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public String getSchema() {
-        String[] fieldPieces = key.split(Pattern.quote("."));
-        return fieldPieces[0];
-    }
-
-    public String getElement() {
-        String[] fieldPieces = key.split(Pattern.quote("."));
-        return fieldPieces[1];
-    }
-
-    public String getQualifier() {
-        String[] fieldPieces = key.split(Pattern.quote("."));
-        if (fieldPieces.length == 3) {
-            return fieldPieces[2];
-        } else {
-            return null;
-        }
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/MetadataField.java b/dspace-rest/src/main/java/org/dspace/rest/common/MetadataField.java
deleted file mode 100644
index 3688b5b8ca..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/MetadataField.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.dspace.core.Context;
-
-/**
- * Metadata field representation
- *
- * @author Terry Brady, Georgetown University.
- */
-@XmlRootElement(name = "field")
-public class MetadataField {
-    private int fieldId;
-    private String name;
-    private String element;
-    private String qualifier;
-    private String description;
-
-    private MetadataSchema parentSchema;
-
-    @XmlElement(required = true)
-    private ArrayList<String> expand = new ArrayList<String>();
-
-    public MetadataField() {
-    }
-
-    public MetadataField(org.dspace.content.MetadataSchema schema, org.dspace.content.MetadataField field,
-                         String expand, Context context) throws SQLException, WebApplicationException {
-        setup(schema, field, expand, context);
-    }
-
-    private void setup(org.dspace.content.MetadataSchema schema, org.dspace.content.MetadataField field, String expand,
-                       Context context) throws SQLException {
-        List<String> expandFields = new ArrayList<String>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-        StringBuilder sb = new StringBuilder();
-        sb.append(schema.getName());
-        sb.append(".");
-        sb.append(field.getElement());
-        if (field.getQualifier() != null) {
-            sb.append(".");
-            sb.append(field.getQualifier());
-        }
-
-        this.setName(sb.toString());
-        this.setFieldId(field.getID());
-        this.setElement(field.getElement());
-        this.setQualifier(field.getQualifier());
-        this.setDescription(field.getScopeNote());
-
-        if (expandFields.contains("parentSchema") || expandFields.contains("all")) {
-            this.addExpand("parentSchema");
-            parentSchema = new MetadataSchema(schema, "", context);
-        }
-    }
-
-    public void setParentSchema(MetadataSchema schema) {
-        this.parentSchema = schema;
-    }
-
-    public MetadataSchema getParentSchema() {
-        return this.parentSchema;
-    }
-
-    public void setFieldId(int fieldId) {
-        this.fieldId = fieldId;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setElement(String element) {
-        this.element = element;
-    }
-
-    public void setQualifier(String qualifier) {
-        this.qualifier = qualifier;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public int getFieldId() {
-        return fieldId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getQualifier() {
-        return qualifier;
-    }
-
-    public String getElement() {
-        return element;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public List<String> getExpand() {
-        return expand;
-    }
-
-    public void setExpand(ArrayList<String> expand) {
-        this.expand = expand;
-    }
-
-    public void addExpand(String expandableAttribute) {
-        this.expand.add(expandableAttribute);
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/MetadataSchema.java b/dspace-rest/src/main/java/org/dspace/rest/common/MetadataSchema.java
deleted file mode 100644
index 4b1e29fea2..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/MetadataSchema.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.ws.rs.WebApplicationException;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.MetadataFieldService;
-import org.dspace.core.Context;
-
-/**
- * Metadata schema representation
- *
- * @author Terry Brady, Georgetown University.
- */
-@XmlRootElement(name = "schema")
-public class MetadataSchema {
-    protected MetadataFieldService metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
-
-    private int schemaID;
-    private String prefix;
-    private String namespace;
-
-    @XmlElement(required = true)
-    private ArrayList<String> expand = new ArrayList<String>();
-
-    @XmlElement(name = "fields", required = true)
-    private List<MetadataField> fields = new ArrayList<MetadataField>();
-
-    public MetadataSchema() {
-    }
-
-    public MetadataSchema(org.dspace.content.MetadataSchema schema, String expand, Context context)
-        throws SQLException, WebApplicationException {
-        setup(schema, expand, context);
-    }
-
-    private void setup(org.dspace.content.MetadataSchema schema, String expand, Context context) throws SQLException {
-        List<String> expandFields = new ArrayList<String>();
-        if (expand != null) {
-            expandFields = Arrays.asList(expand.split(","));
-        }
-        this.setSchemaID(schema.getID());
-        this.setPrefix(schema.getName());
-        this.setNamespace(schema.getNamespace());
-        if (expandFields.contains("fields") || expandFields.contains("all")) {
-            List<org.dspace.content.MetadataField> fields = metadataFieldService.findAllInSchema(context, schema);
-            this.addExpand("fields");
-            for (org.dspace.content.MetadataField field : fields) {
-                this.fields.add(new MetadataField(schema, field, "", context));
-            }
-        }
-    }
-
-    public void setPrefix(String prefix) {
-        this.prefix = prefix;
-    }
-
-    public void setNamespace(String namespace) {
-        this.namespace = namespace;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-
-    public String getNamespace() {
-        return namespace;
-    }
-
-    public int getSchemaID() {
-        return this.schemaID;
-    }
-
-    public void setSchemaID(int schemaID) {
-        this.schemaID = schemaID;
-    }
-
-    public List<MetadataField> getMetadataFields() {
-        return fields;
-    }
-
-    public List<String> getExpand() {
-        return expand;
-    }
-
-    public void setExpand(ArrayList<String> expand) {
-        this.expand = expand;
-    }
-
-    public void addExpand(String expandableAttribute) {
-        this.expand.add(expandableAttribute);
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/Report.java b/dspace-rest/src/main/java/org/dspace/rest/common/Report.java
deleted file mode 100644
index dcaf7d269e..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/Report.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- * Used to handle/determine status of REST API.
- * Mainly to know your authentication status
- */
-@XmlRootElement(name = "report")
-public class Report {
-    private String nickname;
-    private String url;
-
-    public Report() {
-        setNickname("na");
-        setUrl("");
-    }
-
-
-    public Report(String nickname, String url) {
-        setNickname(nickname);
-        setUrl(url);
-    }
-
-    public String getUrl() {
-        return this.url;
-    }
-
-    public String getNickname() {
-        return this.nickname;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public void setNickname(String nickname) {
-        this.nickname = nickname;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/ResourcePolicy.java b/dspace-rest/src/main/java/org/dspace/rest/common/ResourcePolicy.java
deleted file mode 100644
index 366bd5fc3a..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/ResourcePolicy.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import java.util.Date;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.dspace.eperson.EPerson;
-import org.dspace.eperson.Group;
-
-@XmlRootElement(name = "resourcepolicy")
-public class ResourcePolicy {
-
-    public enum Action {
-        READ, WRITE, DELETE;
-    }
-
-    private Integer id;
-    private Action action;
-    private String epersonId;   //UUID
-    private String groupId;     //UUID
-    private String resourceId;  //UUID
-    private String resourceType;
-    private String rpDescription;
-    private String rpName;
-    private String rpType;
-    private Date startDate;
-    private Date endDate;
-
-    public ResourcePolicy() {
-    }
-
-    public ResourcePolicy(org.dspace.authorize.ResourcePolicy dspacePolicy) {
-        this.id = dspacePolicy.getID();
-
-        switch (dspacePolicy.getAction()) {
-            case org.dspace.core.Constants.READ:
-                this.action = Action.READ;
-                break;
-            case org.dspace.core.Constants.WRITE:
-                this.action = Action.WRITE;
-                break;
-            case org.dspace.core.Constants.DELETE:
-                this.action = Action.DELETE;
-                break;
-            default:
-                break;
-        }
-
-        EPerson ePerson = dspacePolicy.getEPerson();
-        if (ePerson != null) {
-            this.epersonId = ePerson.getID().toString();
-        }
-
-        Group group = dspacePolicy.getGroup();
-        if (group != null) {
-            this.groupId = group.getID().toString();
-        }
-
-        this.resourceId = dspacePolicy.getdSpaceObject().getID().toString();
-        this.rpDescription = dspacePolicy.getRpDescription();
-        this.rpName = dspacePolicy.getRpName();
-        this.rpType = dspacePolicy.getRpType();
-        this.startDate = dspacePolicy.getStartDate();
-        this.endDate = dspacePolicy.getEndDate();
-        switch (dspacePolicy.getdSpaceObject().getType()) {
-            case org.dspace.core.Constants.BITSTREAM:
-                this.resourceType = "bitstream";
-                break;
-            case org.dspace.core.Constants.ITEM:
-                this.resourceType = "item";
-                break;
-            case org.dspace.core.Constants.COLLECTION:
-                this.resourceType = "collection";
-                break;
-            case org.dspace.core.Constants.COMMUNITY:
-                this.resourceType = "community";
-                break;
-            case org.dspace.core.Constants.BUNDLE:
-                this.resourceType = "bundle";
-                break;
-            default:
-                this.resourceType = "";
-                break;
-        }
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Action getAction() {
-        return action;
-    }
-
-    @JsonIgnore
-    public int getActionInt() {
-        switch (action) {
-            case READ:
-                return org.dspace.core.Constants.READ;
-            case WRITE:
-                return org.dspace.core.Constants.WRITE;
-            case DELETE:
-                return org.dspace.core.Constants.DELETE;
-            default:
-                return org.dspace.core.Constants.READ;
-        }
-    }
-
-    public void setAction(Action action) {
-        this.action = action;
-    }
-
-    public String getEpersonId() {
-        return epersonId;
-    }
-
-    public void setEpersonId(String epersonId) {
-        this.epersonId = epersonId;
-    }
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getResourceId() {
-        return resourceId;
-    }
-
-    public void setResourceId(String resourceId) {
-        this.resourceId = resourceId;
-    }
-
-    public String getResourceType() {
-        return resourceType;
-    }
-
-    public void setResourceType(String resourceType) {
-        this.resourceType = resourceType;
-    }
-
-    public String getRpDescription() {
-        return rpDescription;
-    }
-
-    public void setRpDescription(String rpDescription) {
-        this.rpDescription = rpDescription;
-    }
-
-    public String getRpName() {
-        return rpName;
-    }
-
-    public void setRpName(String rpName) {
-        this.rpName = rpName;
-    }
-
-    public String getRpType() {
-        return rpType;
-    }
-
-    public void setRpType(String rpType) {
-        this.rpType = rpType;
-    }
-
-    public Date getStartDate() {
-        return startDate;
-    }
-
-    public void setStartDate(Date startDate) {
-        this.startDate = startDate;
-    }
-
-    public Date getEndDate() {
-        return endDate;
-    }
-
-    public void setEndDate(Date endDate) {
-        this.endDate = endDate;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/common/Status.java b/dspace-rest/src/main/java/org/dspace/rest/common/Status.java
deleted file mode 100644
index cdbb8210b9..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/common/Status.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.dspace.app.util.Util;
-import org.dspace.eperson.EPerson;
-
-/**
- * Determine status of REST API - is it running, accessible and without errors?.
- * Find out API version (DSpace major version) and DSpace source version.
- * Find out your authentication status.
- */
-@XmlRootElement(name = "status")
-public class Status {
-    private boolean okay;
-    private boolean authenticated;
-    private String email;
-    private String fullname;
-    private String sourceVersion;
-    private String apiVersion;
-
-    public Status() {
-        setOkay(true);
-
-        setSourceVersion(Util.getSourceVersion());
-        String[] version = Util.getSourceVersion().split("\\.");
-        setApiVersion(version[0]); // major version
-
-        setAuthenticated(false);
-    }
-
-    public Status(String email, String fullname) {
-        setOkay(true);
-        setAuthenticated(true);
-        setEmail(email);
-        setFullname(fullname);
-    }
-
-    public Status(EPerson eperson) {
-        setOkay(true);
-        if (eperson != null) {
-            setAuthenticated(true);
-            setEmail(eperson.getEmail());
-            setFullname(eperson.getFullName());
-        } else {
-            setAuthenticated(false);
-        }
-    }
-
-    @JsonProperty("okay")
-    public boolean isOkay() {
-        return this.okay;
-    }
-
-    public void setOkay(boolean okay) {
-        this.okay = okay;
-    }
-
-    @JsonProperty("authenticated")
-    public boolean isAuthenticated() {
-        return authenticated;
-    }
-
-    public void setAuthenticated(boolean authenticated) {
-        this.authenticated = authenticated;
-    }
-
-    @JsonProperty("email")
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    @JsonProperty("fullname")
-    public String getFullname() {
-        return fullname;
-    }
-
-    public void setFullname(String fullname) {
-        this.fullname = fullname;
-    }
-
-    @JsonProperty("sourceVersion")
-    public String getSourceVersion() {
-        return this.sourceVersion;
-    }
-
-    public void setSourceVersion(String sourceVersion) {
-        this.sourceVersion = sourceVersion;
-    }
-
-    @JsonProperty("apiVersion")
-    public String getApiVersion() {
-        return this.apiVersion;
-    }
-
-    public void setApiVersion(String apiVersion) {
-        this.apiVersion = apiVersion;
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/exceptions/ContextException.java b/dspace-rest/src/main/java/org/dspace/rest/exceptions/ContextException.java
deleted file mode 100644
index 817b662f73..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/exceptions/ContextException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.exceptions;
-
-/**
- * Simple exception which only encapsulate classic exception. This exception is
- * only for exceptions caused by creating context.
- *
- * @author Rostislav Novak (Computing and Information Centre, CTU in Prague)
- */
-public class ContextException extends Exception {
-
-    private static final long serialVersionUID = 1L;
-
-    Exception causedBy;
-
-    public ContextException(String message, Exception causedBy) {
-        super(message);
-        this.causedBy = causedBy;
-    }
-
-    public Exception getCausedBy() {
-        return causedBy;
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefs.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefs.java
deleted file mode 100644
index 0712ec546d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefs.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import org.dspace.content.Item;
-import org.dspace.core.Context;
-
-/**
- * Define the set of use cases for filtering items of interest through the REST API.
- *
- * @author Terry Brady, Georgetown University
- */
-
-public class ItemFilterDefs implements ItemFilterList {
-    public static final String CAT_ITEM = "Item Property Filters";
-    public static final String CAT_BASIC = "Basic Bitstream Filters";
-    public static final String CAT_MIME = "Bitstream Filters by MIME Type";
-
-    public static final String[] MIMES_PDF = {"application/pdf"};
-    public static final String[] MIMES_JPG = {"image/jpeg"};
-
-
-    private enum EnumItemFilterDefs implements ItemFilterTest {
-        is_item("Is Item - always true", null, CAT_ITEM) {
-            public boolean testItem(Context context, Item item) {
-                return true;
-            }
-        },
-        is_withdrawn("Withdrawn Items", null, CAT_ITEM) {
-            public boolean testItem(Context context, Item item) {
-                return item.isWithdrawn();
-            }
-        },
-        is_not_withdrawn("Available Items - Not Withdrawn", null, CAT_ITEM) {
-            public boolean testItem(Context context, Item item) {
-                return !item.isWithdrawn();
-            }
-        },
-        is_discoverable("Discoverable Items - Not Private", null, CAT_ITEM) {
-            public boolean testItem(Context context, Item item) {
-                return item.isDiscoverable();
-            }
-        },
-        is_not_discoverable("Not Discoverable - Private Item", null, CAT_ITEM) {
-            public boolean testItem(Context context, Item item) {
-                return !item.isDiscoverable();
-            }
-        },
-        has_multiple_originals("Item has Multiple Original Bitstreams", null, CAT_BASIC) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countOriginalBitstream(item) > 1;
-            }
-        },
-        has_no_originals("Item has No Original Bitstreams", null, CAT_BASIC) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countOriginalBitstream(item) == 0;
-            }
-        },
-        has_one_original("Item has One Original Bitstream", null, CAT_BASIC) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countOriginalBitstream(item) == 1;
-            }
-        },
-        has_doc_original("Item has a Doc Original Bitstream (PDF, Office, Text, HTML, XML, etc)", null, CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes()) > 0;
-            }
-        },
-        has_image_original("Item has an Image Original Bitstream", null, CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image") > 0;
-            }
-        },
-        has_unsupp_type("Has Other Bitstream Types (not Doc or Image)", null, ItemFilterDefs.CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                int bitCount = ItemFilterUtil.countOriginalBitstream(item);
-                if (bitCount == 0) {
-                    return false;
-                }
-                int docCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
-                int imgCount = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image");
-                return (bitCount - docCount - imgCount) > 0;
-            }
-        },
-        has_mixed_original("Item has multiple types of Original Bitstreams (Doc, Image, Other)", null, CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                int countBit = ItemFilterUtil.countOriginalBitstream(item);
-                if (countBit <= 1) {
-                    return false;
-                }
-                int countDoc = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
-                if (countDoc > 0) {
-                    return countDoc != countBit;
-                }
-                int countImg = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image");
-                if (countImg > 0) {
-                    return countImg != countBit;
-                }
-                return false;
-            }
-        },
-        has_pdf_original("Item has a PDF Original Bitstream", null, CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countOriginalBitstreamMime(context, item, MIMES_PDF) > 0;
-            }
-        },
-        has_jpg_original("Item has JPG Original Bitstream", null, CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countOriginalBitstreamMime(context, item, MIMES_JPG) > 0;
-            }
-        },;
-
-        private String title = null;
-        private String description = null;
-
-        private EnumItemFilterDefs(String title, String description, String category) {
-            this.title = title;
-            this.description = description;
-            this.category = category;
-        }
-
-        private EnumItemFilterDefs() {
-            this(null, null, null);
-        }
-
-        public String getName() {
-            return name();
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        private String category = null;
-
-        public String getCategory() {
-            return category;
-        }
-    }
-
-    public ItemFilterDefs() {
-    }
-
-    public ItemFilterTest[] getFilters() {
-        return EnumItemFilterDefs.values();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsMeta.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsMeta.java
deleted file mode 100644
index 96a866357d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsMeta.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import java.util.regex.Pattern;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.Item;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-/**
- * Define the set of use cases for filtering items of interest through the REST API.
- *
- * @author Terry Brady, Georgetown University
- */
-
-public class ItemFilterDefsMeta implements ItemFilterList {
-    protected static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemFilterDefsMeta.class);
-
-    public static final String CAT_META_GEN = "General Metadata Filters";
-    public static final String CAT_META_SPEC = "Specific Metadata Filters";
-    public static final String CAT_MOD = "Recently Modified";
-
-    private enum EnumItemFilterDefs implements ItemFilterTest {
-        has_no_title("Has no dc.title", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                return itemService.getMetadataByMetadataString(item, "dc.title").size() == 0;
-            }
-        },
-        has_no_uri("Has no dc.identifier.uri", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                return itemService.getMetadataByMetadataString(item, "dc.identifier.uri").size() == 0;
-            }
-        },
-        has_mult_uri("Has multiple dc.identifier.uri", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                return itemService.getMetadataByMetadataString(item, "dc.identifier.uri").size() > 1;
-            }
-        },
-        has_compound_subject("Has compound subject", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-compound-subject");
-                return ItemFilterUtil.hasMetadataMatch(item, "dc.subject.*", Pattern.compile(regex));
-            }
-        },
-        has_compound_author("Has compound author", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-compound-author");
-                return ItemFilterUtil
-                    .hasMetadataMatch(item, "dc.creator,dc.contributor.author", Pattern.compile(regex));
-            }
-        },
-        has_empty_metadata("Has empty metadata", null, CAT_META_GEN) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.hasMetadataMatch(item, "*", Pattern.compile("^\\s*$"));
-            }
-        },
-        has_unbreaking_metadata("Has unbreaking metadata", null, CAT_META_GEN) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-unbreaking");
-                return ItemFilterUtil.hasMetadataMatch(item, "*", Pattern.compile(regex));
-            }
-        },
-        has_long_metadata("Has long metadata field", null, CAT_META_GEN) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-long");
-                return ItemFilterUtil.hasMetadataMatch(item, "*", Pattern.compile(regex));
-            }
-        },
-        has_xml_entity("Has XML entity in metadata", null, CAT_META_GEN) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-xml-entity");
-                return ItemFilterUtil.hasMetadataMatch(item, "*", Pattern.compile(regex));
-            }
-        },
-        has_non_ascii("Has non-ascii in metadata", null, CAT_META_GEN) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-non-ascii");
-                return ItemFilterUtil.hasMetadataMatch(item, "*", Pattern.compile(regex));
-            }
-        },
-        has_desc_url("Has url in description", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-url");
-                return ItemFilterUtil.hasMetadataMatch(item, "dc.description.*", Pattern.compile(regex));
-            }
-        },
-        has_fulltext_provenance("Has fulltext in provenance", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-fulltext");
-                return ItemFilterUtil.hasMetadataMatch(item, "dc.description.provenance", Pattern.compile(regex));
-            }
-        },
-        no_fulltext_provenance("Doesn't have fulltext in provenance", null, CAT_META_SPEC) {
-            public boolean testItem(Context context, Item item) {
-                String regex = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                    .getProperty("rest.report-regex-fulltext");
-                return !ItemFilterUtil.hasMetadataMatch(item, "dc.description.provenance", Pattern.compile(regex));
-            }
-        },
-        mod_last_day("Modified in last 1 day", null, CAT_MOD) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.recentlyModified(item, 1);
-            }
-        },
-        mod_last_7_days("Modified in last 7 days", null, CAT_MOD) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.recentlyModified(item, 7);
-            }
-        },
-        mod_last_30_days("Modified in last 30 days", null, CAT_MOD) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.recentlyModified(item, 30);
-            }
-        },
-        mod_last_90_days("Modified in last 60 days", null, CAT_MOD) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.recentlyModified(item, 60);
-            }
-        },;
-
-        private String title = null;
-        private String description = null;
-
-        private EnumItemFilterDefs(String title, String description, String category) {
-            this.title = title;
-            this.description = description;
-            this.category = category;
-        }
-
-        private EnumItemFilterDefs() {
-            this(null, null, null);
-        }
-
-        public String getName() {
-            return name();
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        private String category = null;
-
-        public String getCategory() {
-            return category;
-        }
-    }
-
-    public ItemFilterDefsMeta() {
-    }
-
-    public ItemFilterTest[] getFilters() {
-        return EnumItemFilterDefs.values();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsMisc.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsMisc.java
deleted file mode 100644
index 5b5cc4b12d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsMisc.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import java.util.List;
-
-import org.dspace.content.Item;
-import org.dspace.core.Context;
-import org.dspace.rest.filter.ItemFilterUtil.BundleName;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-/**
- * Define the set of use cases for filtering items of interest through the REST API.
- *
- * @author Terry Brady, Georgetown University
- */
-
-public class ItemFilterDefsMisc implements ItemFilterList {
-    public static final String CAT_MISC = "Bitstream Bundle Filters";
-    public static final String CAT_MIME_SUPP = "Supported MIME Type Filters";
-
-    private enum EnumItemFilterDefs implements ItemFilterTest {
-        has_only_supp_image_type("Item Image Bitstreams are Supported", null, CAT_MIME_SUPP) {
-            public boolean testItem(Context context, Item item) {
-                int imageCount = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image/");
-                if (imageCount == 0) {
-                    return false;
-                }
-                int suppImageCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getSupportedImageMimeTypes());
-                return (imageCount == suppImageCount);
-            }
-        },
-        has_unsupp_image_type("Item has Image Bitstream that is Unsupported", null, CAT_MIME_SUPP) {
-            public boolean testItem(Context context, Item item) {
-                int imageCount = ItemFilterUtil.countOriginalBitstreamMimeStartsWith(context, item, "image/");
-                if (imageCount == 0) {
-                    return false;
-                }
-                int suppImageCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getSupportedImageMimeTypes());
-                return (imageCount - suppImageCount) > 0;
-            }
-        },
-        has_only_supp_doc_type("Item Document Bitstreams are Supported", null, CAT_MIME_SUPP) {
-            public boolean testItem(Context context, Item item) {
-                int docCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
-                if (docCount == 0) {
-                    return false;
-                }
-                int suppDocCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getSupportedDocumentMimeTypes());
-                return docCount == suppDocCount;
-            }
-        },
-        has_unsupp_doc_type("Item has Document Bitstream that is Unsupported", null, CAT_MIME_SUPP) {
-            public boolean testItem(Context context, Item item) {
-                int docCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
-                if (docCount == 0) {
-                    return false;
-                }
-                int suppDocCount = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getSupportedDocumentMimeTypes());
-                return (docCount - suppDocCount) > 0;
-            }
-        },
-        has_small_pdf("Has unusually small PDF", null, ItemFilterDefs.CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil
-                    .countBitstreamSmallerThanMinSize(context, BundleName.ORIGINAL, item, ItemFilterDefs.MIMES_PDF,
-                                                      "rest.report-pdf-min-size") > 0;
-            }
-        },
-        has_large_pdf("Has unusually large PDF", null, ItemFilterDefs.CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil
-                    .countBitstreamLargerThanMaxSize(context, BundleName.ORIGINAL, item, ItemFilterDefs.MIMES_PDF,
-                                                     "rest.report-pdf-max-size") > 0;
-            }
-        },
-        has_unsupported_bundle("Has bitstream in an unsuppored bundle", null, CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                String[] bundleList = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                           .getArrayProperty("rest.report-supp-bundles");
-                return ItemFilterUtil.hasUnsupportedBundle(item, bundleList);
-            }
-        },
-        has_small_thumbnail("Has unusually small thumbnail", null, CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil
-                    .countBitstreamSmallerThanMinSize(context, BundleName.THUMBNAIL, item, ItemFilterDefs.MIMES_JPG,
-                                                      "rest.report-thumbnail-min-size") > 0;
-            }
-        },
-        has_doc_without_text("Has document bitstream without TEXT item", null, ItemFilterDefs.CAT_MIME) {
-            public boolean testItem(Context context, Item item) {
-                int countDoc = ItemFilterUtil
-                    .countOriginalBitstreamMime(context, item, ItemFilterUtil.getDocumentMimeTypes());
-                if (countDoc == 0) {
-                    return false;
-                }
-                int countText = ItemFilterUtil.countBitstream(BundleName.TEXT, item);
-                return countDoc > countText;
-            }
-        },
-        has_original_without_thumbnail("Has original bitstream without thumbnail", null, CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                int countBit = ItemFilterUtil.countOriginalBitstream(item);
-                if (countBit == 0) {
-                    return false;
-                }
-                int countThumb = ItemFilterUtil.countBitstream(BundleName.THUMBNAIL, item);
-                return countBit > countThumb;
-            }
-        },
-        has_invalid_thumbnail_name("Has invalid thumbnail name (assumes one thumbnail for each original)", null,
-                                   CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                List<String> originalNames = ItemFilterUtil.getBitstreamNames(BundleName.ORIGINAL, item);
-                List<String> thumbNames = ItemFilterUtil.getBitstreamNames(BundleName.THUMBNAIL, item);
-                if (thumbNames.size() != originalNames.size()) {
-                    return false;
-                }
-                for (String name : originalNames) {
-                    if (!thumbNames.contains(name + ".jpg")) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        },
-        has_non_generated_thumb("Has non generated thumbnail", null, CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                String[] generatedThumbDesc = DSpaceServicesFactory.getInstance().getConfigurationService()
-                                                                   .getArrayProperty("rest.report-gen-thumbnail-desc");
-                int countThumb = ItemFilterUtil.countBitstream(BundleName.THUMBNAIL, item);
-                if (countThumb == 0) {
-                    return false;
-                }
-                int countGen = ItemFilterUtil.countBitstreamByDesc(BundleName.THUMBNAIL, item, generatedThumbDesc);
-                return (countThumb > countGen);
-            }
-        },
-        no_license("Doesn't have a license", null, CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                return ItemFilterUtil.countBitstream(BundleName.LICENSE, item) == 0;
-            }
-        },
-        has_license_documentation("Has documentation in the license bundle", null, CAT_MISC) {
-            public boolean testItem(Context context, Item item) {
-                List<String> names = ItemFilterUtil.getBitstreamNames(BundleName.LICENSE, item);
-                for (String name : names) {
-                    if (!name.equals("license.txt")) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        },;
-
-        private String title = null;
-        private String description = null;
-
-        private EnumItemFilterDefs(String title, String description, String category) {
-            this.title = title;
-            this.description = description;
-            this.category = category;
-        }
-
-        private EnumItemFilterDefs() {
-            this(null, null, null);
-        }
-
-        public String getName() {
-            return name();
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        private String category = null;
-
-        public String getCategory() {
-            return category;
-        }
-    }
-
-    public ItemFilterDefsMisc() {
-    }
-
-    public ItemFilterTest[] getFilters() {
-        return EnumItemFilterDefs.values();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsPerm.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsPerm.java
deleted file mode 100644
index 9e80f31196..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterDefsPerm.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import java.sql.SQLException;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.content.Bitstream;
-import org.dspace.content.Bundle;
-import org.dspace.content.Item;
-import org.dspace.core.Context;
-import org.dspace.rest.filter.ItemFilterUtil.BundleName;
-
-/**
- * Define the set of use cases for filtering items of interest through the REST API.
- *
- * @author Terry Brady, Georgetown University
- */
-public class ItemFilterDefsPerm implements ItemFilterList {
-    protected static AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    public static final String CAT_PERM = "Perimission Filters";
-    private static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemFilterDefsPerm.class);
-
-    public ItemFilterDefsPerm() {
-    }
-
-    public enum EnumItemFilterPermissionDefs implements ItemFilterTest {
-        has_restricted_original("Item has Restricted Original Bitstream",
-                                "Item has at least one original bitstream that is not accessible to Anonymous user",
-                                CAT_PERM) {
-            public boolean testItem(Context context, Item item) {
-                try {
-                    for (Bundle bundle : item.getBundles()) {
-                        if (!bundle.getName().equals(BundleName.ORIGINAL.name())) {
-                            continue;
-                        }
-                        for (Bitstream bit : bundle.getBitstreams()) {
-                            if (!authorizeService
-                                .authorizeActionBoolean(getAnonContext(), bit, org.dspace.core.Constants.READ)) {
-                                return true;
-                            }
-                        }
-                    }
-                } catch (SQLException e) {
-                    ItemFilterDefsPerm.log.warn("SQL Exception testing original bitstream access " + e.getMessage(), e);
-                }
-                return false;
-            }
-        },
-        has_restricted_thumbnail("Item has Restricted Thumbnail",
-                                 "Item has at least one thumbnail that is not accessible to Anonymous user", CAT_PERM) {
-            public boolean testItem(Context context, Item item) {
-                try {
-                    for (Bundle bundle : item.getBundles()) {
-                        if (!bundle.getName().equals(BundleName.THUMBNAIL.name())) {
-                            continue;
-                        }
-                        for (Bitstream bit : bundle.getBitstreams()) {
-                            if (!authorizeService
-                                .authorizeActionBoolean(getAnonContext(), bit, org.dspace.core.Constants.READ)) {
-                                return true;
-                            }
-                        }
-                    }
-                } catch (SQLException e) {
-                    ItemFilterDefsPerm.log
-                        .warn("SQL Exception testing thumbnail bitstream access " + e.getMessage(), e);
-                }
-                return false;
-            }
-        },
-        has_restricted_metadata("Item has Restricted Metadata",
-                                "Item has metadata that is not accessible to Anonymous user", CAT_PERM) {
-            public boolean testItem(Context context, Item item) {
-                try {
-                    return !authorizeService
-                        .authorizeActionBoolean(getAnonContext(), item, org.dspace.core.Constants.READ);
-                } catch (SQLException e) {
-                    ItemFilterDefsPerm.log.warn("SQL Exception testing item metadata access " + e.getMessage(), e);
-                    return false;
-                }
-            }
-        },;
-
-        private static Context anonContext;
-
-        private static Context getAnonContext() {
-            if (anonContext == null) {
-                anonContext = new Context();
-            }
-            return anonContext;
-        }
-
-
-        private String title = null;
-        private String description = null;
-
-        private EnumItemFilterPermissionDefs(String title, String description, String category) {
-            this.title = title;
-            this.description = description;
-            this.category = category;
-        }
-
-        private EnumItemFilterPermissionDefs() {
-            this(null, null, null);
-        }
-
-        public String getName() {
-            return name();
-        }
-
-        public String getTitle() {
-            return title;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        private String category = null;
-
-        public String getCategory() {
-            return category;
-        }
-    }
-
-    @Override
-    public ItemFilterTest[] getFilters() {
-        return EnumItemFilterPermissionDefs.values();
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterSet.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterSet.java
deleted file mode 100644
index f70bc9664d..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterSet.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.ServletContext;
-import javax.ws.rs.WebApplicationException;
-
-import org.apache.logging.log4j.Logger;
-import org.dspace.authorize.factory.AuthorizeServiceFactory;
-import org.dspace.authorize.service.AuthorizeService;
-import org.dspace.core.Context;
-import org.dspace.rest.common.Item;
-import org.dspace.rest.common.ItemFilter;
-
-/**
- * The set of Item Filter Use Cases to apply to a collection of items.
- *
- * @author Terry Brady, Georgetown University
- */
-public class ItemFilterSet {
-    protected AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
-    static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemFilterSet.class);
-
-    private List<ItemFilter> itemFilters;
-    private ItemFilter allFiltersFilter;
-
-    /**
-     * Construct a set of Item Filters identified by a list string.
-     *
-     * @param filterList  Comma separated list of filter names to include.
-     *                    Use {@link org.dspace.rest.common.ItemFilter#ALL} to retrieve all filters.
-     * @param reportItems If true, return item details.  If false, return only counts of items.
-     */
-    public ItemFilterSet(String filterList, boolean reportItems) {
-        log.debug(String.format("Create ItemFilterSet: %s", filterList));
-        itemFilters = ItemFilter.getItemFilters(filterList, reportItems);
-        allFiltersFilter = ItemFilter.getAllFiltersFilter(itemFilters);
-    }
-
-    /**
-     * Get the special filter that represents the intersection of all items in the Item Filter Set.
-     *
-     * @return the special Item Filter that contains items that satisfied every other Item Filter in the Item Filter Set
-     */
-    public ItemFilter getAllFiltersFilter() {
-        return allFiltersFilter;
-    }
-
-    /**
-     * Evaluate an item against the use cases in the Item Filter Set.
-     *
-     * If an item satisfies all items in the Item Filter Set, it should also ve added to the special all items filter.
-     *
-     * @param context  Active DSpace Context
-     * @param item     DSpace Object to evaluate
-     * @param restItem REST representation of the DSpace Object being evaluated
-     */
-    public void testItem(Context context, org.dspace.content.Item item, Item restItem) {
-        boolean bAllTrue = true;
-        for (ItemFilter itemFilter : itemFilters) {
-            if (itemFilter.hasItemTest()) {
-                bAllTrue &= itemFilter.testItem(context, item, restItem);
-            }
-        }
-        if (bAllTrue && allFiltersFilter != null) {
-            allFiltersFilter.addItem(restItem);
-        }
-    }
-
-    /**
-     * Get all of the Item Filters initialized into the Item Filter Set
-     *
-     * @return a list of Item Filters initialized into the Item Filter Set
-     */
-    public List<ItemFilter> getItemFilters() {
-        return itemFilters;
-    }
-
-    /**
-     * Evaluate a set of Items against the Item Filters in the Item Filter Set
-     * Current DSpace Context
-     *
-     * @param context        Current DSpace Context
-     * @param servletContext Context of the servlet container.
-     * @param childItems     Collection of Items to Evaluate
-     * @param save           If true, save the details of each item that is evaluated
-     * @param expand         List of item details to include in the results
-     * @return The number of items evaluated
-     * @throws WebApplicationException Runtime exception for applications.
-     * @throws SQLException            An exception that provides information on a database access error or other
-     * errors.
-     */
-    public int processSaveItems(Context context, ServletContext servletContext,
-                                Iterator<org.dspace.content.Item> childItems, boolean save, String expand)
-        throws WebApplicationException, SQLException {
-        return processSaveItems(context, servletContext, childItems, new ArrayList<Item>(), save, expand);
-    }
-
-    /**
-     * Evaluate a set of Items against the Item Filters in the Item Filter Set
-     *
-     * @param context        Current DSpace Context
-     * @param servletContext Context of the servlet container.
-     * @param childItems     Collection of Items to Evaluate
-     * @param items          List of items to contain saved results
-     * @param save           If true, save the details of each item that is evaluated
-     * @param expand         List of item details to include in the results
-     * @return The number of items evaluated
-     * @throws WebApplicationException Runtime exception for applications.
-     * @throws SQLException            An exception that provides information on a database access error or other
-     * errors.
-     */
-    public int processSaveItems(Context context, ServletContext servletContext,
-                                Iterator<org.dspace.content.Item> childItems, List<Item> items, boolean save,
-                                String expand) throws WebApplicationException, SQLException {
-        int count = 0;
-        while (childItems.hasNext()) {
-            count++;
-            org.dspace.content.Item item = childItems.next();
-            log.debug(item.getHandle() + " evaluate.");
-            if (authorizeService.authorizeActionBoolean(context, item, org.dspace.core.Constants.READ)) {
-                Item restItem = new Item(item, servletContext, expand, context);
-                if (save) {
-                    items.add(restItem);
-                }
-                testItem(context, item, restItem);
-            } else {
-                log.debug(item.getHandle() + " not authorized - not included in result set.");
-            }
-        }
-        return count;
-    }
-
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterTest.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterTest.java
deleted file mode 100644
index 4ef2998e16..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterTest.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import org.dspace.content.Item;
-import org.dspace.core.Context;
-
-/**
- * Item Filter Use Case Interface.
- * Items will be evaluated against a set of filters.
- *
- * @author Terry Brady, Georgetown University
- */
-public interface ItemFilterTest {
-    public String getName();
-
-    public String getTitle();
-
-    public String getDescription();
-
-    public String getCategory();
-
-    public boolean testItem(Context context, Item i);
-}
diff --git a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterUtil.java b/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterUtil.java
deleted file mode 100644
index ddb75f0db8..0000000000
--- a/dspace-rest/src/main/java/org/dspace/rest/filter/ItemFilterUtil.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.filter;
-
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-import com.ibm.icu.util.Calendar;
-import org.apache.logging.log4j.Logger;
-import org.dspace.content.Bitstream;
-import org.dspace.content.Bundle;
-import org.dspace.content.Item;
-import org.dspace.content.MetadataValue;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.ItemService;
-import org.dspace.core.Context;
-import org.dspace.services.factory.DSpaceServicesFactory;
-
-public class ItemFilterUtil {
-    protected static ItemService itemService = ContentServiceFactory.getInstance().getItemService();
-    static Logger log = org.apache.logging.log4j.LogManager.getLogger(ItemFilterUtil.class);
-
-    public enum BundleName { ORIGINAL, TEXT, LICENSE, THUMBNAIL }
-
-    /**
-     * Default constructor
-     */
-    private ItemFilterUtil() { }
-
-    static String[] getDocumentMimeTypes() {
-        return DSpaceServicesFactory.getInstance().getConfigurationService()
-                                    .getArrayProperty("rest.report-mime-document");
-    }
-
-    static String[] getSupportedDocumentMimeTypes() {
-        return DSpaceServicesFactory.getInstance().getConfigurationService()
-                                    .getArrayProperty("rest.report-mime-document-supported");
-    }
-
-    static String[] getSupportedImageMimeTypes() {
-        return DSpaceServicesFactory.getInstance().getConfigurationService()
-                                    .getArrayProperty("rest.report-mime-document-image");
-    }
-
-    static int countOriginalBitstream(Item item) {
-        return countBitstream(BundleName.ORIGINAL, item);
-    }
-
-    static int countBitstream(BundleName bundleName, Item item) {
-        int count = 0;
-        for (Bundle bundle : item.getBundles()) {
-            if (!bundle.getName().equals(bundleName.name())) {
-                continue;
-            }
-            count += bundle.getBitstreams().size();
-        }
-
-        return count;
-    }
-
-    static List<String> getBitstreamNames(BundleName bundleName, Item item) {
-        ArrayList<String> names = new ArrayList<String>();
-        for (Bundle bundle : item.getBundles()) {
-            if (!bundle.getName().equals(bundleName.name())) {
-                continue;
-            }
-            for (Bitstream bit : bundle.getBitstreams()) {
-                names.add(bit.getName());
-            }
-        }
-        return names;
-    }
-
-
-    static int countOriginalBitstreamMime(Context context, Item item, String[] mimeList) {
-        return countBitstreamMime(context, BundleName.ORIGINAL, item, mimeList);
-    }
-
-    static int countBitstreamMime(Context context, BundleName bundleName, Item item, String[] mimeList) {
-        int count = 0;
-        for (Bundle bundle : item.getBundles()) {
-            if (!bundle.getName().equals(bundleName.name())) {
-                continue;
-            }
-            for (Bitstream bit : bundle.getBitstreams()) {
-                for (String mime : mimeList) {
-                    try {
-                        if (bit.getFormat(context).getMIMEType().equals(mime.trim())) {
-                            count++;
-                        }
-                    } catch (SQLException e) {
-                        log.error("Get format error for bitstream " + bit.getName());
-                    }
-                }
-            }
-        }
-        return count;
-    }
-
-    static int countBitstreamByDesc(BundleName bundleName, Item item, String[] descList) {
-        int count = 0;
-        for (Bundle bundle : item.getBundles()) {
-            if (!bundle.getName().equals(bundleName.name())) {
-                continue;
-            }
-            for (Bitstream bit : bundle.getBitstreams()) {
-                for (String desc : descList) {
-                    String bitDesc = bit.getDescription();
-                    if (bitDesc == null) {
-                        continue;
-                    }
-                    if (bitDesc.equals(desc.trim())) {
-                        count++;
-                    }
-                }
-            }
-        }
-        return count;
-    }
-
-    static int countBitstreamSmallerThanMinSize(Context context, BundleName bundleName, Item item, String[] mimeList,
-                                                String prop) {
-        long size = DSpaceServicesFactory.getInstance().getConfigurationService().getLongProperty(prop);
-        int count = 0;
-        try {
-            for (Bundle bundle : item.getBundles()) {
-                if (!bundle.getName().equals(bundleName.name())) {
-                    continue;
-                }
-                for (Bitstream bit : bundle.getBitstreams()) {
-                    for (String mime : mimeList) {
-                        if (bit.getFormat(context).getMIMEType().equals(mime.trim())) {
-                            if (bit.getSizeBytes() < size) {
-                                count++;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (SQLException e) {
-            // ignore
-        }
-        return count;
-    }
-
-    static int countBitstreamLargerThanMaxSize(Context context, BundleName bundleName, Item item, String[] mimeList,
-                                               String prop) {
-        long size = DSpaceServicesFactory.getInstance().getConfigurationService().getLongProperty(prop);
-        int count = 0;
-        try {
-            for (Bundle bundle : item.getBundles()) {
-                if (!bundle.getName().equals(bundleName.name())) {
-                    continue;
-                }
-                for (Bitstream bit : bundle.getBitstreams()) {
-                    for (String mime : mimeList) {
-                        if (bit.getFormat(context).getMIMEType().equals(mime.trim())) {
-                            if (bit.getSizeBytes() > size) {
-                                count++;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (SQLException e) {
-            // ignore
-        }
-        return count;
-    }
-
-    static int countOriginalBitstreamMimeStartsWith(Context context, Item item, String prefix) {
-        return countBitstreamMimeStartsWith(context, BundleName.ORIGINAL, item, prefix);
-    }
-
-    static int countBitstreamMimeStartsWith(Context context, BundleName bundleName, Item item, String prefix) {
-        int count = 0;
-        try {
-            for (Bundle bundle : item.getBundles()) {
-                if (!bundle.getName().equals(bundleName.name())) {
-                    continue;
-                }
-                for (Bitstream bit : bundle.getBitstreams()) {
-                    if (bit.getFormat(context).getMIMEType().startsWith(prefix)) {
-                        count++;
-                    }
-                }
-            }
-        } catch (SQLException e) {
-            // ignore
-        }
-        return count;
-    }
-
-    static boolean hasUnsupportedBundle(Item item, String[] bundleList) {
-        if (bundleList == null) {
-            return false;
-        }
-        ArrayList<String> bundles = new ArrayList<String>();
-        for (String bundleName : bundleList) {
-            bundles.add(bundleName.trim());
-        }
-        for (Bundle bundle : item.getBundles()) {
-            if (!bundles.contains(bundle.getName())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    static boolean hasOriginalBitstreamMime(Context context, Item item, String[] mimeList) {
-        return hasBitstreamMime(context, BundleName.ORIGINAL, item, mimeList);
-    }
-
-    static boolean hasBitstreamMime(Context context, BundleName bundleName, Item item, String[] mimeList) {
-        return countBitstreamMime(context, bundleName, item, mimeList) > 0;
-    }
-
-    static boolean hasMetadataMatch(Item item, String fieldList, Pattern regex) {
-        if (fieldList.equals("*")) {
-            for (MetadataValue md : itemService
-                .getMetadata(item, org.dspace.content.Item.ANY, org.dspace.content.Item.ANY,
-                             org.dspace.content.Item.ANY, org.dspace.content.Item.ANY)) {
-                if (regex.matcher(md.getValue()).matches()) {
-                    return true;
-                }
-            }
-        } else {
-            for (String field : fieldList.split(",")) {
-                for (MetadataValue md : itemService.getMetadataByMetadataString(item, field.trim())) {
-                    if (regex.matcher(md.getValue()).matches()) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
-    static boolean hasOnlyMetadataMatch(Item item, String fieldList, Pattern regex) {
-        boolean matches = false;
-        if (fieldList.equals("*")) {
-            for (MetadataValue md : itemService
-                .getMetadata(item, org.dspace.content.Item.ANY, org.dspace.content.Item.ANY,
-                             org.dspace.content.Item.ANY, org.dspace.content.Item.ANY)) {
-                if (regex.matcher(md.getValue()).matches()) {
-                    matches = true;
-                } else {
-                    return false;
-                }
-            }
-        } else {
-            for (String field : fieldList.split(",")) {
-                for (MetadataValue md : itemService.getMetadataByMetadataString(item, field.trim())) {
-                    if (regex.matcher(md.getValue()).matches()) {
-                        matches = true;
-                    } else {
-                        return false;
-                    }
-                }
-            }
-        }
-        return matches;
-    }
-
-    static boolean recentlyModified(Item item, int days) {
-        Calendar cal = Calendar.getInstance();
-        cal.add(Calendar.DATE, -days);
-        return cal.getTime().before(item.getLastModified());
-    }
-}
diff --git a/dspace-rest/src/main/java/org/dspace/utils/DSpaceWebapp.java b/dspace-rest/src/main/java/org/dspace/utils/DSpaceWebapp.java
deleted file mode 100644
index 5d3ce8bfa8..0000000000
--- a/dspace-rest/src/main/java/org/dspace/utils/DSpaceWebapp.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-
-package org.dspace.utils;
-
-import org.dspace.app.util.AbstractDSpaceWebapp;
-
-/**
- * An MBean to identify this web application.
- *
- * @author Bram Luyten (bram at atmire dot com)
- */
-public class DSpaceWebapp
-    extends AbstractDSpaceWebapp {
-    public DSpaceWebapp() {
-        super("REST");
-    }
-
-    @Override
-    public boolean isUI() {
-        return false;
-    }
-}
diff --git a/dspace-rest/src/main/webapp/WEB-INF/applicationContext.xml b/dspace-rest/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index ec892fbaa4..0000000000
--- a/dspace-rest/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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/
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-	http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <!-- Acquires the DSpace Utility Class with initialized Service Manager -->
-    <bean id="dspace" class="org.dspace.utils.DSpace"/>
-
-    <!-- Acquires reference to EventService -->
-    <bean id="dspace.eventService" factory-bean="dspace" factory-method="getEventService"/>
-
-    <!-- Inject the Default LoggerUsageEventListener into the EventService  -->
-    <bean class="org.dspace.usage.LoggerUsageEventListener">
-        <property name="eventService">
-            <ref bean="dspace.eventService"/>
-        </property>
-    </bean>
-
-    <!-- Inject the SolrLoggerUsageEventListener into the EventService  -->
-    <!--
-    Temporarily commented out SolrLoggerUsageEventListener to get REST API working.
-    This should be uncommented again once DS-3815 is resolved.
-
-    <bean class="org.dspace.statistics.SolrLoggerUsageEventListener">
-        <property name="eventService" >
-            <ref bean="dspace.eventService"/>
-        </property>
-    </bean>
-    -->
-
-    <!-- TabFileUsageEventListener -->
-    <!-- Uncomment to enable
-    <bean class="org.dspace.usage.TabFileUsageEventListener">
-        <property name="eventService" >
-            <ref bean="dspace.eventService"/>
-        </property>
-    </bean>
-    -->
-
-    <!--
-    Uncomment to enable PassiveUsageEventListener
-    <bean class="org.dspace.app.statistics.PassiveUsageEventListener">
-        <property name="eventService" >
-            <ref bean="dspace.eventService"/>
-        </property>
-    </bean>
-     -->
-
-</beans>
diff --git a/dspace-rest/src/main/webapp/WEB-INF/security-applicationContext.xml b/dspace-rest/src/main/webapp/WEB-INF/security-applicationContext.xml
deleted file mode 100644
index 677753d7f0..0000000000
--- a/dspace-rest/src/main/webapp/WEB-INF/security-applicationContext.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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/
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:security="http://www.springframework.org/schema/security"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
-    <context:annotation-config/>
-
-    <!--
-        Every url in the rest will pass through these filters, login & shibboleth-login will trigger an authentication attempt.
-     -->
-    <bean id="springSecurityFilterChain" class="org.springframework.security.web.FilterChainProxy">
-        <security:filter-chain-map request-matcher="ant">
-            <security:filter-chain pattern="/login" filters="sif,passwordLoginAuthenticationFilter"/>
-            <security:filter-chain pattern="/shibboleth-login" filters="sif,passwordLoginAuthenticationFilter"/>
-            <security:filter-chain pattern="/logout" filters="sif,logoutFilter"/>
-            <security:filter-chain pattern="/**" filters="sif"/>
-        </security:filter-chain-map>
-    </bean>
-
-    <!-- Creates the spring security context object based on what was there previously -->
-    <bean id="sif" class="org.springframework.security.web.context.SecurityContextPersistenceFilter"/>
-
-    <!--Authentication filter for login -->
-    <bean id="passwordLoginAuthenticationFilter"
-          class="org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter">
-        <!--Custom DSpace authentication manager, will handle the actual login-->
-        <property name="authenticationManager" ref="dspaceAuthenticationManager"/>
-        <!-- Ensures that after login no redirect is made to the home page, the rest will return a 200 status code -->
-        <property name="authenticationSuccessHandler"
-                  ref="org.dspace.rest.authentication.NoRedirectAuthenticationLoginSuccessHandler"/>
-        <property name="usernameParameter" value="email"/>
-        <property name="passwordParameter" value="password"/>
-        <property name="postOnly" value="false"/>
-        <!--Match on any request-->
-        <property name="requiresAuthenticationRequestMatcher"
-                  ref="org.springframework.security.web.util.matcher.AnyRequestMatcher"/>
-    </bean>
-
-    <security:authentication-manager alias="dspaceAuthenticationManager">
-        <security:authentication-provider ref='dspaceAuthenticationProvider'/>
-    </security:authentication-manager>
-
-    <!-- Custom DSpace authentication provider, this bean is responsible to login the user, it is triggered by calling the "passwordLoginAuthenticationFilter"  -->
-    <bean class="org.dspace.rest.authentication.DSpaceAuthenticationProvider" id="dspaceAuthenticationProvider"
-          lazy-init="true"/>
-
-
-    <!--Filter for logout, destroys the spring security context-->
-    <bean id="logoutFilter" class="org.springframework.security.web.authentication.logout.LogoutFilter">
-        <constructor-arg index="0" ref="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler"/>
-        <constructor-arg index="1">
-            <list>
-                <bean class="org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler"/>
-            </list>
-        </constructor-arg>
-        <!--Match on any request-->
-        <property name="logoutRequestMatcher" ref="org.springframework.security.web.util.matcher.AnyRequestMatcher"/>
-    </bean>
-
-    <!--Utility beans-->
-    <bean id="org.springframework.security.web.util.matcher.AnyRequestMatcher"
-          class="org.springframework.security.web.util.matcher.AnyRequestMatcher"/>
-
-    <bean id="org.dspace.rest.authentication.NoRedirectAuthenticationLoginSuccessHandler"
-          class="org.dspace.rest.authentication.NoRedirectAuthenticationLoginSuccessHandler"/>
-    <bean id="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler"
-          class="org.dspace.rest.authentication.NoRedirectAuthenticationLogoutSuccessHandler"/>
-</beans>
diff --git a/dspace-rest/src/main/webapp/WEB-INF/web.xml b/dspace-rest/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 34d74d9630..0000000000
--- a/dspace-rest/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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/
-
--->
-<web-app id="DSpace-RESTv6" version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
-
-    <filter>
-        <filter-name>dspace.request</filter-name>
-        <filter-class>org.dspace.utils.servlet.DSpaceWebappServletFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>dspace.request</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-    <servlet>
-        <servlet-name>DSpace REST API (Deprecated)</servlet-name>
-        <servlet-class>
-            org.glassfish.jersey.servlet.ServletContainer
-        </servlet-class>
-        <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.dspace.rest.DSpaceRestApplication</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>DSpace REST API (Deprecated)</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/static/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- Security settings and mapping -->
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>DSpace REST API (Deprecated)</web-resource-name>
-            <url-pattern>/*</url-pattern>
-        </web-resource-collection>
-        <user-data-constraint>
-            <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-        </user-data-constraint>
-    </security-constraint>
-
-    <!-- ConfigurationService initialization for dspace.dir -->
-    <context-param>
-        <description>
-            The location of the DSpace home directory
-        </description>
-        <param-name>dspace.dir</param-name>
-        <param-value>${dspace.dir}</param-value>
-    </context-param>
-
-    <context-param>
-        <description>
-	    The location of the Log4J configuration
-        </description>
-        <param-name>log4jConfiguration</param-name>
-        <param-value>${dspace.dir}/config/log4j2.xml</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>
-            /WEB-INF/applicationContext.xml,
-            /WEB-INF/security-applicationContext.xml
-        </param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.dspace.app.util.DSpaceContextListener</listener-class>
-    </listener>
-
-    <!-- kernel start listener (from impl)
-        The following listener can be used instead of the filter below, it is simpler, cleaner
-        and eliminates the need for a DSpaceKernelServletFilter filter to be involved with the
-        request cycle.
-    -->
-    <listener>
-        <listener-class>org.dspace.servicemanager.servlet.DSpaceKernelServletContextListener</listener-class>
-    </listener>
-
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
-    <listener>
-        <listener-class>org.dspace.app.util.DSpaceWebappListener</listener-class>
-    </listener>
-
-
-</web-app>
diff --git a/dspace-rest/src/main/webapp/static/reports/authenticate.html b/dspace-rest/src/main/webapp/static/reports/authenticate.html
deleted file mode 100644
index 046ced425c..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/authenticate.html
+++ /dev/null
@@ -1,58 +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/
-
--->
-<html>
-<head>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
-
-    <!-- sortable.js can be obtained at http://www.kryogenix.org/code/browser/sorttable/ -->
-    <!-- <script src="sorttable.js"></script> -->
-
-    <script src="restReport.js"></script>
-    <script type="text/javascript">
-    var AuthReport = function() {
-        Report.call(this);
-        this.makeAuthLink = function(){return false;};
-    }
-    $(document).ready(function(){
-        var myReport=new AuthReport();
-        $("#authenticate").on("click",function(){
-          myReport.init();  
-        });
-        $("#logout").on("click",function(){
-          myReport.myAuth.logout();            
-        });
-    });
-    </script>
-    <script src="spin.js"></script>
-    <link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css"></link>
-    <link rel="stylesheet" type="text/css" href="restClient.css"></link>
-    <title>Authenticate for the REST Report Tools</title>
-</head>
-<body>
-<h2>Login for an Authenticated Report View</h2>
-<div>This is intended for sites with Password Authentication Enabled</div>
-<span id="currentUser"></span>
-<div id="password">
-  <div>
-  <label for="restemail">Email</label>
-  <input id="restemail" type="text" value="" size="30"/>
-  </div>
-  <div>
-  <label for="restpass">Password</label>
-  <input id="restpass" type="password" value=""/>
-  </div>
-  <div>
-  <button id="authenticate">Authenticate</button>
-  <button id="logout">Logout</button>
-  </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/index.html b/dspace-rest/src/main/webapp/static/reports/index.html
deleted file mode 100644
index bc71b0417c..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/index.html
+++ /dev/null
@@ -1,77 +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/
-
--->
-<!DOCTYPE html>
-<html>
-<head>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
-
-    <!-- sortable.js can be obtained at http://www.kryogenix.org/code/browser/sorttable/ -->
-    <!-- <script src="sorttable.js"></script> -->
-
-    <script src="restReport.js"></script>
-    <script src="restCollReport.js"></script>
-    <script src="spin.js"></script>
-    <link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css"></link>
-    <link rel="stylesheet" type="text/css" href="restClient.css"></link>
-    <title>DSpace REST QC Client</title>
-</head>
-<body>
-<a href="query.html">Query Tool</a>
-<span id="currentUser"></span>
-<hr/>
-<h1>DSpace REST QC Client</h1>
-<div id='metadatadiv'>
-    <h3>Filters</h3>
-    <div>
-      <div>
-        <button disabled="disabled" class="activate showCollections">Show Collections</button>
-      </div>
-      <div id='filterdiv'>
-      </div>
-      <div>
-        <button disabled="disabled" class="activate showCollections">Show Collections</button>
-      </div>
-    </div>
-    <h3>Collection Report</h3>
-    <div>
-      <div><a class="this-search" href="#">URL to current search</a></div>
-      <div id="report">..</div> 
-    </div>
-    <h3>Item Results</h3>
-    <div id="itemResults">
-      <h3>Additional data to return</h3>
-      <div id="queries-aux">
-        <button id="refresh-fields">Refresh Items</button>
-        <div id="show-fields"></div>
-      </div>
-      <h3>Bitstream data to return</h3>
-      <div id="queries-bit">
-        <div id="show-fields-bits"></div>
-        <button id="refresh-fields-bits">Refresh Items</button>
-      </div>
-      <h3>Results</h3>
-      <div id='itemdiv'>
-        <h3></h3>
-        <div><a class="this-search" href="#">URL to current search</a></div>
-        <div>
-         <button id="prev">Prev Page</button>
-         <button id="next">Next Page</button>
-         <button id="export">Export for Metadata Update</button>
-         <span id="exlimit">Export will export one page of results</span>
-        </div>
-        <input type="hidden" id="ifilter"/>
-        <input type="hidden" id="icollection"/>
-        <table id="itemtable" class="sortable"></table>
-      </div>
-    </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/query.html b/dspace-rest/src/main/webapp/static/reports/query.html
deleted file mode 100644
index 5a7a79cb20..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/query.html
+++ /dev/null
@@ -1,105 +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/
-
--->
-<html>
-<head>
-    <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
-    <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.9.1/jquery-ui.min.js"></script>
-
-    <!-- sortable.js can be obtained at http://www.kryogenix.org/code/browser/sorttable/ -->
-    <!-- <script src="sorttable.js"></script> -->
-
-    <script src="restReport.js"></script>
-    <script src="restQueryReport.js"></script>
-    <script src="spin.js"></script>
-    <link rel="stylesheet" type="text/css" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.10.3/themes/smoothness/jquery-ui.css"></link>
-    <link rel="stylesheet" type="text/css" href="restClient.css"></link>
-    <title>DSpace REST Query Client</title>
-</head>
-<body>
-<a href="index.html">Collection Filter</a>
-<span id="currentUser"></span>
-<hr/>
-<h1>DSpace REST Query Client</h1>
-<div id="querydiv">
-  <div id='metadatadiv'>
-    <h3>Collection Selector</h3>
-    <div id="collSelector">
-    </div>
-    <h3>Metadata Field Queries</h3>
-    <div>
-      <fieldset id="predefqueries">
-        <label>Pre-defined Queries</label>
-        <select id="predefselect">
-        </select>
-      </fieldset>
-      <div id="queries">
-      </div>
-      <div>
-        <button class="query-button" disabled="disabled" class="activate">Run Item Query</button>
-      </div>
-    </div>
-    <h3>Limit/Paginate Queries</h3>
-    <div id="queries-page">
-      <div>
-        <label for="limit">Limit:</label>
-        <select id="limit" name="limit">
-          <option value="10">10</option>
-          <option value="25">25</option>
-          <option value="50">50</option>
-          <option value="100" selected>100</option>
-          <option value="250">250</option>
-          <option value="1000">1000</option>
-        </select>
-        <label for="offset"> Offset:</label><input id="offset" name="offset" value="0"/>
-      </div>
-      <div>
-        <button class="query-button" disabled="disabled" class="activate">Run Item Query</button>
-      </div>
-    </div>
-    <h3>Filters</h3>
-    <div>
-      <div>
-        <button class="query-button" disabled="disabled" class="activate">Run Item Query</button>
-      </div>
-      <div id='filterdiv'>
-      </div>
-      <div>
-        <button class="query-button" disabled="disabled" class="activate">Run Item Query</button>
-      </div>
-    </div>
-    <h3>Additional data to return</h3>
-    <div id="queries-aux">
-      <div id="show-fields"></div>
-      <div>
-        <button class="query-button" disabled="disabled" class="activate">Run Item Query</button>
-      </div>
-    </div>
-    <h3>Bitstream data to return</h3>
-    <div id="queries-bit">
-      <div id="show-fields-bits"></div>
-      <button class="query-button" disabled="disabled" class="activate" id="refresh-fields-bit">Refresh Items</button>
-    </div>
-    <h3>Item Results</h3>
-    <div id='itemdiv'>
-      <h3></h3>  
-      <div><a class="this-search" href="#">URL to current search</a></div>
-      <div>
-        <button id="prev">Prev Page</button>
-        <button id="next">Next Page</button>
-        <button id="export">Export for Metadata Update</button>
-        <span id="exlimit">Export will export one page of results, increase result limits as needed</span>
-      </div>
-      <table id="itemtable" class="sortable">
-      </table>
-    </div>
-  </div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/restClient.css b/dspace-rest/src/main/webapp/static/reports/restClient.css
deleted file mode 100644
index d81724ae67..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/restClient.css
+++ /dev/null
@@ -1,98 +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/
- */
-table {border-collapse: collapse;border-right:solid thin black;}
-table td, table th {border: thin solid black; padding: 4px;}
-tr.header {background-color: #EEEEEE;}
-tr:hover td, tr:hover th {background-color: #DDDDDD;}
-tr.even td {border-bottom: thin dotted black;}
-tr.odd td {border-top: thin dotted black;}
-td.even {background-color: #EEFFEE;}
-td.head {background-color: #EEEEFF;}
-td.num {text-align: right;}
-td.link {text-decoration: underline; color: blue;}
-td, th {width: 100px;}
-td.error {color: red;background-color: yellow;}
-td.title, th.title {width: 400px;}
-td.mod, th.mod {width: 200px;}
-#itemtable {width: 100%;}
-#itemdiv {display: none;}
-td.ititle, th.ititle {width: 600px;}
-td.partial {color:red; font-style: italic;}
-
-button:disabled {
-	background-color:gray;
-}
-input:read-only {
-	background-color: gray;
-}
-div.metadata {
-	padding: 2px;
-    width: 880px;
-}
-#metadatadiv select, #metadatadiv input {
-	padding: 2px;
-	margin: 4px;
-}
-#metadatadiv fieldset {
-	margin: 6px 15px;
-    width: 850px;
-}
-
-#metadatadiv label {
-	font-weight: bold;
-}
-
-#itemtable td div:not(:first-child) {
-	border-top: thin solid gray;
-}
-
-body {
-	min-height: 700px;
-	min-width: 700px;
-}
-
-tr.header th {
-	vertical-align: bottom;
-}
-
-a.partial::after {
-	content:" ?";
-}
-
-fieldset.catdiv {
-	border: thin solid black;
-	margin-bottom: 8px;
-}
-
-fieldset.catdiv div {
-	width: 380px;
-	float: left;
-}
-
-#collSel {
-	width: 90%;
-}
-
-#filterdiv label {
-	font-weight: normal;
-}
-
-.button {
-	background-color: #EEEEEE;
-}
-
-.toobig::before {
-	content: "*";
-}
-#exlimit {
-  font-style: italic;
-}
-
-.red {
-  color: red;
-}
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/restCollReport.js b/dspace-rest/src/main/webapp/static/reports/restCollReport.js
deleted file mode 100644
index 8d800a8edc..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/restCollReport.js
+++ /dev/null
@@ -1,510 +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/
- */
-var CollReport = function() {
-    Report.call(this);
-    //If sortable.js is included, uncomment the following
-    //this.hasSorttable = function(){return true;}
-    this.getLangSuffix = function(){
-      return "[en]";
-    };
-    
-    //Indicate if Password Authentication is supported
-    //this.makeAuthLink = function(){return true;};
-    //Indicate if Shibboleth Authentication is supported
-    //this.makeShibLink = function(){return true;};
-
-    this.COLL_LIMIT = 20;
-    this.TOOBIG = 10000;
-    this.loadId = 0;
-    this.THREADS =11;
-    this.THREADSP = 11;
-    this.ACCIDX_COLL = 1;
-    this.ACCIDX_ITEM = 2;
-    this.IACCIDX_META = 0;
-    this.IACCIDX_BIT  = 1;
-    this.IACCIDX_ITEM = 2;
-    this.getDefaultParameters = function(){
-        return {
-            "show_fields[]" : [], 
-            "show_fields_bits[]" : [],
-            filters       : "",
-            limit         : this.COUNT_LIMIT,
-            offset        : 0,
-            icollection   : "",
-            ifilter       : "",
-        };
-    };
-    this.getCurrentParameters = function(){
-        return {
-            "show_fields[]" : this.myMetadataFields.getShowFields(),
-            "show_fields_bits[]" : this.myBitstreamFields.getShowFieldsBits(),
-            filters         : this.myFilters.getFilterList(),
-            limit           : this.myReportParameters.getLimit(),
-            offset          : this.myReportParameters.getOffset(),
-            icollection    : $("#icollection").val(),
-            ifilter        : $("#ifilter").val(),
-        };
-    };
-    var self = this;
-
-    this.init = function() {
-        this.baseInit();    
-        $("#icollection").val(self.myReportParameters.params.icollection);
-        $("#ifilter").val(self.myReportParameters.params.ifilter);
-        $("#itemResults").accordion({
-            heightStyle: "content",
-            collapsible: true,
-            active: 2
-        });
-    };
-    
-    this.myAuth.callback = function(data) {
-        self.createCollectionTable();
-        $(".showCollections").bind("click", function(){
-            self.loadData();
-        });
-        $("#refresh-fields,#refresh-fields-bits").bind("click", function(){
-            self.drawItemTable($("#icollection").val(), $("#ifilter").val(), 0);
-        });
-    };
-
-    this.createCollectionTable = function() {
-        var self = this;
-        var tbl = $("<table/>");
-        tbl.attr("id","table");
-        $("#report").replaceWith(tbl);
-
-        var thead = $("<thead/>");
-        tbl.append(thead);
-        var tbody = $("<tbody/>");
-        tbl.append(tbody);
-        var tr = self.myHtmlUtil.addTr(thead).addClass("header");
-        self.myHtmlUtil.addTh(tr, "Num").addClass("num").addClass("sorttable_numeric");
-        self.myHtmlUtil.addTh(tr, "Community").addClass("title");
-        self.myHtmlUtil.addTh(tr, "Collection").addClass("title");
-        var thn = self.myHtmlUtil.addTh(tr, "Num Items").addClass("sorttable_numeric");
-        self.myHtmlUtil.makeTotalCol(thn);
-        thn = self.myHtmlUtil.addTh(tr, "Num Filtered").addClass("sorttable_numeric");
-        self.myHtmlUtil.makeTotalCol(thn);
-        
-        self.addCollections();
-    };
-
-    this.addCollections = function() {
-        var self = this;
-        
-        $.ajax({
-            url: "/rest/hierarchy",
-            dataType: "json",
-            headers: self.myAuth.getHeaders(),
-            success: function(data){
-                if (data.community != null) {
-                    $.each(data.community, function(index, comm){
-                        self.addCommunity(comm, comm);
-                    });                    
-                }
-                self.setCollectionCounts(0);
-            },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/hierarchy "+ status+ " " + errorThrown);
-            }
-        });
-    };
-
-    this.addCommunity = function(top, comm) {
-        var self = this;
-
-        if (comm.collection != null) {
-            $.each(comm.collection, function(index, coll){
-                self.addCollection(top, coll);
-            });                    
-        }
-        if (comm.community != null) {
-            $.each(comm.community, function(index, scomm){
-            self.addCommunity(top, scomm);
-        });                    
-    }
-    };
-
-    this.addCollection = function(top, coll) {
-        var self = this;
-
-        var tbody = $("#table tbody");
-        var index = tbody.find("tr").length;
-
-        var tr = self.myHtmlUtil.addTr(tbody);
-        tr.attr("cid", coll.id).attr("index",index).addClass(index % 2 == 0 ? "odd data" : "even data");
-        self.myHtmlUtil.addTd(tr, index + 1).addClass("num");
-        var parval = self.myHtmlUtil.getAnchor(top.name, self.ROOTPATH + top.handle); 
-        
-        self.myHtmlUtil.addTd(tr, parval).addClass("title comm");
-        self.myHtmlUtil.addTdAnchor(tr, coll.name, self.ROOTPATH + coll.handle).addClass("title");
-    };
-    
-    
-    this.setCollectionCounts = function(offset) {
-        var self = this;
-
-        $.ajax({
-            url: "/rest/filtered-collections",
-            data: {
-                limit  : self.COLL_LIMIT,
-                offset : offset
-             },
-            dataType: "json",
-            headers: self.myAuth.getHeaders(),
-            success: function(data){
-                $.each(data, function(index, coll){
-                    var id = self.getId(coll);
-                    var tr = $("#table tbody").find("tr[cid="+id+"]");
-                    var td = tr.find("td.numCount");
-                    td.text(coll.numberItems);
-                    td.on("click", function(){
-                        self.drawItemTable(self.getId(coll),'',0);
-                        $("#icollection").val(self.getId(coll));
-                        $("#ifilter").val("");
-                    });
-                });
-                
-                //cannot assume data returned is full amount in case some items are restricted
-                //if (data.length == self.COLL_LIMIT) {
-                if (data.length > 0) {
-                    self.setCollectionCounts(offset + self.COLL_LIMIT);
-                    return;
-                }  
-                self.myHtmlUtil.totalCol(3);
-                $("#table").addClass("sortable");
-                  
-                  if (self.myFilters.getFilterList() != "") {
-                      self.loadData();
-                      if ($("#icollection").val() != "") {
-                          self.drawItemTable($("#icollection").val(), $("#ifilter").val(), 0);
-                      }
-                  }
-            },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/collections "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-                self.spinner.stop();
-                  $(".showCollections").attr("disabled", false);
-            }
-        });    
-    };
-    
-    this.loadData = function() {
-        self.spinner.spin($("h1")[0]);
-        $(".showCollections").attr("disabled", true);
-        $("#metadatadiv").accordion("option", "active", self.ACCIDX_COLL);
-        self.loadId++;
-        $("td.datacol,th.datacol").remove();
-        $("#table tr.data").addClass("processing");
-        self.myFilters.filterString = self.myFilters.getFilterList();
-        self.doRow(0, self.THREADS, self.loadId);
-    };
-    
-    this.doRow = function(row, threads, curLoadId) {
-        if (self.loadId != curLoadId) return;
-        var tr = $("tr[index="+row+"]");
-        if (!tr.is("*")){
-            return; 
-        }
-            
-        var cid = tr.attr("cid");
-        $.ajax({
-            url: "/rest/filtered-collections/"+cid,
-            data: {
-                limit : self.COUNT_LIMIT,
-                filters : self.myFilters.filterString,
-            },
-            dataType: "json",
-            headers: self.myAuth.getHeaders(),
-            success: function(data) {
-                var numItems = data.numberItems;
-                var numItemsProcessed = data.numberItemsProcessed;
-                $.each(data.itemFilters, function(index, itemFilter){
-                    if (self.loadId != curLoadId) {
-                        return;
-                    }
-                    var trh = $("#table tr.header");
-                    var filterName = itemFilter["filter-name"];
-                    var filterTitle = itemFilter.title == null ? filterName : itemFilter.title;
-                    if (!trh.find("th."+filterName).is("*")) {
-                        var th = self.myHtmlUtil.addTh(trh, filterTitle);
-                        th.addClass(filterName).addClass("datacol").addClass("sorttable_numeric");
-                        self.myHtmlUtil.makeTotalCol(th);
-                        
-                        if (itemFilter.description != null) {
-                            th.attr("title", itemFilter.description);                                            
-                        }
-
-                        $("tr.data").each(function(){
-                            var td = self.myHtmlUtil.addTd($(this), "");
-                            td.addClass(filterName).addClass("num").addClass("datacol");
-                        });
-                    }
-                    
-                    self.setCellCount(tr, cid, 0, (numItems != numItemsProcessed), itemFilter);
-                    self.setFilteredCount(tr, cid, 0, numItems, numItemsProcessed);
-                });
-                
-                tr.removeClass("processing");
-                if (!$("#table tr.processing").is("*")) {
-                    self.updateSortable();
-                    self.totalFilters();
-                    self.spinner.stop();
-                        $(".showCollections").attr("disabled", false);
-                    return;
-                }
-                if (row % threads == 0 || threads == 1) {
-                    for(var i=1; i<=threads; i++) {
-                        self.doRow(row+i, threads, curLoadId);
-                    }                    
-                }
-             },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/filtered-collections "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-                self.spinner.stop();
-                $(".showCollections").attr("disabled", false);
-            }
-        });
-    };            
-                
-    this.updateSortable = function() {
-                    if (self.hasSorttable()) {
-                        $("#table").removeClass("sortable");
-                        $("#table").addClass("sortable");
-                        sorttable.makeSortable($("#table")[0]);                        
-                    }
-    };
-
-    this.totalFilters = function() {
-        var colcount = $("#table tr th").length;
-        for(var i=4; i<colcount; i++) {
-            self.myHtmlUtil.totalCol(i);
-        }
-    };
-
-    this.updateRow = function(cid, offset) {
-        var tr = $("tr[cid="+cid+"]");
-        $.ajax({
-            url: "/rest/filtered-collections/"+cid,
-            data: {
-                limit : self.COUNT_LIMIT,
-                offset : offset,
-                filters : self.myFilters.filterString,
-            },
-            dataType: "json",
-            headers: self.myAuth.getHeaders(),
-            success: function(data) {
-                var numItems = data.numberItems;
-                var numItemsProcessed = data.numberItemsProcessed;
-                $.each(data.itemFilters, function(index, itemFilter){
-                    self.setCellCount(tr, cid, offset, (numItems != numItemsProcessed + offset),itemFilter);
-                });
-                self.setFilteredCount(tr, cid, offset, numItems, numItemsProcessed);                
-             },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/filtered-collections/ " + cid+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-                self.spinner.stop();
-                  $(".showCollections").attr("disabled", false);
-            }
-        });
-    };            
-
-    this.setFilteredCount = function(tr, cid, offset, numItems, numItemsProcessed) {
-        var td = tr.find("td.numFiltered");
-        var total = numItemsProcessed + offset; 
-        td.text(total);
-        td.removeClass("partial");
-        td.removeClass("toobig");
-        if (numItems != numItemsProcessed + offset) {
-            if (offset == 0) {
-                td.addClass("button");
-                td.off();
-                td.on("click", function(){
-                    if ($(this).hasClass("toobig")) {
-                        if (!confirm("A large number of items are present in this collection.\n\n" + 
-                                "If you choose to load this data, it will take some time to load and may impact server performance.")) {
-                            return;
-                        }
-                    }
-                    $(this).off();
-                    $(this).removeClass("button");
-                    self.updateRow(cid, offset + self.COUNT_LIMIT);
-                });                                            
-            } else {
-                self.updateRow(cid, offset + self.COUNT_LIMIT);
-            }
-            td.addClass("partial");
-            var title = "Collection partially processed, item counts are incomplete. ";
-            if (numItems >= self.TOOBIG) {
-                td.addClass("toobig");
-                title+= "\nIt will take significant time to apply this filter to the entire collection.";
-            }            
-            td.attr("title", title);
-            return false;
-        } else {
-            self.totalFilters();
-        }
-        return true;
-    };
-    
-    this.setCellCount = function(tr, cid, offset, isPartial, itemFilter) {
-        var filterName = itemFilter["filter-name"];
-        var icount = itemFilter["item-count"];
-
-        var td = tr.find("td."+filterName);
-        if (icount == null) {
-            icount = 0;
-        }
-        var cur = parseInt(td.text());
-        if (!isNaN(cur)) {
-            icount += cur;            
-        }
-        
-        td.removeClass("partial");
-        td.removeClass("link");
-        td.removeAttr("title");
-        td.off();
-        td.text(icount);
-        if (icount != 0) {
-            td.addClass("link");
-            if (isPartial) {
-                td.addClass("partial");
-                td.attr("title", "Collection partially processed, item counts are incomplete");
-            }    
-            td.on("click", function(){
-                self.drawItemTable(cid,filterName,0);
-                $("#icollection").val(cid);
-                $("#ifilter").val(filterName);
-            });                            
-        }        
-    };
-    
-                
-    this.drawItemTable = function(cid, filter, offset) {
-        self = this;
-        self.spinner.spin($("h1")[0]);
-        $("#itemtable").replaceWith($('<table id="itemtable" class="sortable"></table>'));
-        var itbl = $("#itemtable");
-        //itbl.find("tr").remove("*");
-        var tr = self.myHtmlUtil.addTr(itbl).addClass("header");
-        self.myHtmlUtil.addTh(tr, "Num").addClass("num").addClass("sorttable_numeric");
-        self.myHtmlUtil.addTh(tr, "id");
-        self.myHtmlUtil.addTh(tr, "Handle");
-        self.myHtmlUtil.addTh(tr, "dc.title"  + self.getLangSuffix()).addClass("title");
-        var fields = $("#show-fields select").val();
-        if (fields != null) {
-            $.each(fields, function(index, field){
-                self.myHtmlUtil.addTh(tr, field + self.getLangSuffix());        
-            });        
-        }
-        var bitfields = $("#show-fields-bits select").val();
-        if (bitfields != null) {
-          $.each(bitfields, function(index, bitf){
-            self.myHtmlUtil.addTh(tr, bitf);    
-          });   
-        }
-    
-        var expand = "items";
-        if (fields != null) {
-          expand += ",metadata";
-        }
-        if (bitfields != null) {
-          expand += ",bitstreams";
-        }
-
-        var params = {
-            expand: expand,
-            limit: self.ITEM_LIMIT,
-            filters: filter,
-            offset: offset,
-            "show_fields[]" : fields,
-            "show_fields_bits[]" : bitfields,
-        };
-        
-        $.ajax({
-            url: "/rest/filtered-collections/"+cid,
-            data: params,
-            dataType: "json",
-            headers: self.myAuth.getHeaders(),
-            success: function(data){
-                var source = filter == "" ? data.items : data.itemFilters[0].items;
-                
-                $.each(source, function(index, item){
-                    var tr = self.myHtmlUtil.addTr(itbl);
-                    tr.addClass(index % 2 == 0 ? "odd data" : "even data");
-                    self.myHtmlUtil.addTd(tr, offset+index+1).addClass("num");
-                    self.myHtmlUtil.addTd(tr, self.getId(item));
-                    self.myHtmlUtil.addTdAnchor(tr, item.handle, self.ROOTPATH + item.handle);
-                    self.myHtmlUtil.addTd(tr, item.name).addClass("ititle");
-                    if (fields != null) {
-                        $.each(fields, function(index, field){
-                            var td = self.myHtmlUtil.addTd(tr, "");
-                            $.each(item.metadata, function(mindex,mv){
-                                if (mv.key == field) {
-                                    td.append($("<div>"+mv.value+"</div>"));
-                                }
-                            });
-                        });    
-                    }
-                    if (bitfields != null) {
-                      $.each(bitfields, function(index, bitfield){
-                        var td = self.myHtmlUtil.addTd(tr, "");
-                        var fieldtext = self.myBitstreamFields.getKeyText(bitfield, item, bitfields);
-                        for(var j=0; j<fieldtext.length; j++) {
-                          td.append($("<div>"+fieldtext[j]+"</div>"));
-                        }
-                      });
-                    }
-                });
-                self.displayItems(filter + " Items in " + data.name, 
-                    offset,
-                    self.ITEM_LIMIT,
-                    data.numberItems,
-                    function(){self.drawItemTable(cid, filter, (offset - self.ITEM_LIMIT < 0) ? 0 : offset - self.ITEM_LIMIT);},
-                    function(){self.drawItemTable(cid, filter, offset + self.ITEM_LIMIT);}
-                );
-                
-                if (self.hasSorttable()){
-                    sorttable.makeSortable(itbl[0]);                    
-                }
-                $("#metadatadiv").accordion("option", "active", self.ACCIDX_ITEM); 
-            },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/filtered-collections "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-                self.spinner.stop();
-                $(".showCollections").attr("disabled", false);
-                $("#itemResults").accordion("option", "active", self.IACCIDX_ITEM);
-            }
-        });
-    };
-
-    //Ignore the first column containing a row number and the item handle
-    this.exportCol = function(colnum, col) {
-        var data = "";
-        if (colnum == 0) return "";
-        if (colnum == 2) return "";
-        data += (colnum == 1) ? "" : ",";
-        data += self.exportCell(col);
-        return data;
-    };
-};
-CollReport.prototype = Object.create(Report.prototype);
-
-$(document).ready(function(){
-    var myReport=new CollReport();
-    myReport.init();
-});
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/restQueryReport.js b/dspace-rest/src/main/webapp/static/reports/restQueryReport.js
deleted file mode 100644
index 18e9a61d08..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/restQueryReport.js
+++ /dev/null
@@ -1,350 +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/
- */
-var QueryReport = function() {
-    Report.call(this);
-    
-    //If sortable.js is included, uncomment the following
-    //this.hasSorttable = function(){return true;}
-    this.getLangSuffix = function(){
-      return "[en]";
-    };
-    
-    //Indicate if Password Authentication is supported
-    //this.makeAuthLink = function(){return true;};
-    //Indicate if Shibboleth Authentication is supported
-    //this.makeShibLink = function(){return true;};
-
-    this.getDefaultParameters = function(){
-        return {
-            "collSel[]"     : [],
-            "query_field[]" : [],
-            "query_op[]"    : [],
-            "query_val[]"   : [],
-            "show_fields[]" : [],
-            "show_fields_bits[]" : [],
-            "filters"       : "",
-            "limit"         : this.ITEM_LIMIT,
-            "offset"        : 0,          
-        };
-    };
-    this.getCurrentParameters = function(){
-    var expand = "parentCollection,metadata";
-    if (this.myBitstreamFields.hasBitstreamFields()) {
-      expand += ",bitstreams";
-    }
-        var params = {
-            "query_field[]" : [],
-            "query_op[]"    : [],
-            "query_val[]"   : [],
-            "collSel[]"     : ($("#collSel").val() == null) ? [""] : $("#collSel").val(),
-            limit           : this.myReportParameters.getLimit(),
-            offset          : this.myReportParameters.getOffset(),
-            "expand"        : expand,
-            filters         : this.myFilters.getFilterList(),
-            "show_fields[]" : this.myMetadataFields.getShowFields(),
-            "show_fields_bits[]" : this.myBitstreamFields.getShowFieldsBits(),
-        };
-        $("select.query-tool,input.query-tool").each(function() {
-            var paramArr = params[$(this).attr("name")];
-            paramArr[paramArr.length] = $(this).val();
-        });
-        return params;
-    };
-    var self = this;
-
-    this.init = function() {
-        this.baseInit();    
-    };
-    
-    this.initMetadataFields = function() {
-        this.myMetadataFields = new QueryableMetadataFields(self);
-        this.myMetadataFields.load();        
-    };
-    this.myAuth.callback = function(data) {
-        $(".query-button").click(function(){self.runQuery();});
-    };
-
-    this.runQuery = function() {
-        this.spinner.spin($("body")[0]);
-        $("button").attr("disabled", true);
-        $.ajax({
-            url: "/rest/filtered-items", 
-            data: this.getCurrentParameters(), 
-            dataType: "json",
-            headers: self.myAuth.getHeaders(),
-            success: function(data){
-                data.metadata = $("#show-fields select").val();
-                data.bitfields = $("#show-fields-bits select").val();
-                self.drawItemFilterTable(data);
-                self.spinner.stop();
-                $("button").not("#next,#prev").attr("disabled", false);
-            },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/filtered-items "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status, errorThrown) {
-                self.spinner.stop();
-                $("button").not("#next,#prev").attr("disabled", false);
-            }
-        });
-    };
-    
-    this.drawItemFilterTable = function(data) {
-        $("#itemtable").replaceWith($('<table id="itemtable" class="sortable"></table>'));
-        var itbl = $("#itemtable");
-        var tr = self.myHtmlUtil.addTr(itbl).addClass("header");
-        self.myHtmlUtil.addTh(tr, "Num").addClass("num").addClass("sorttable_numeric");
-        self.myHtmlUtil.addTh(tr, "id");
-        self.myHtmlUtil.addTh(tr, "collection");
-        self.myHtmlUtil.addTh(tr, "Item Handle");
-        self.myHtmlUtil.addTh(tr, "dc.title" + self.getLangSuffix());
-        
-        var mdCols = [];
-        if (data.metadata) {
-            $.each(data.metadata, function(index, field) {
-                if (field != "") {
-                    self.myHtmlUtil.addTh(tr,field + self.getLangSuffix()).addClass("returnFields");
-                    mdCols[mdCols.length] = field;            
-                }
-            });            
-        }
-        
-        if (data.bitfields) {
-          $.each(data.bitfields, function(index, bitfield) {
-            if (bitfield != "") {
-              self.myHtmlUtil.addTh(tr,bitfield).addClass("returnFields");
-              mdCols[mdCols.length] = bitfield;      
-            }
-          });     
-        }
-
-        $.each(data.items, function(index, item){
-            var tr = self.myHtmlUtil.addTr(itbl);
-            tr.addClass(index % 2 == 0 ? "odd data" : "even data");
-            self.myHtmlUtil.addTd(tr, self.myReportParameters.getOffset()+index+1).addClass("num");
-            self.myHtmlUtil.addTd(tr, self.getId(item));
-            if (item.parentCollection == null) {
-                self.myHtmlUtil.addTd(tr, "--");            
-            } else {
-                self.myHtmlUtil.addTdAnchor(tr, item.parentCollection.name, self.ROOTPATH + item.parentCollection.handle);
-            }
-            self.myHtmlUtil.addTdAnchor(tr, item.handle, self.ROOTPATH + item.handle);
-            self.myHtmlUtil.addTd(tr, item.name);
-            
-            for(var i=0; i<mdCols.length; i++) {
-                var key =  mdCols[i];
-                var td = self.myHtmlUtil.addTd(tr, "");
-                $.each(item.metadata, function(colindex, metadata) {
-                    if (metadata.key == key) {
-                        if (metadata.value != null) {
-                            var div = $("<div>"+metadata.value+"</div>");
-                            td.append(div);
-                        }
-                    }
-                });
-                var fieldtext = self.myBitstreamFields.getKeyText(key, item, data.bitfields);
-                for(var j=0; j<fieldtext.length; j++) {
-                  td.append($("<div>"+fieldtext[j]+"</div>"));
-                }
-            }
-        });
-        
-        this.displayItems(data["query-annotation"],
-            this.myReportParameters.getOffset(),
-            this.myReportParameters.getLimit(),
-            data["unfiltered-item-count"],
-            function(){
-                self.myReportParameters.updateOffset(false);
-                self.runQuery();
-            }, 
-            function(){
-                self.myReportParameters.updateOffset(true);
-                self.runQuery();
-            }
-        );
-        
-        if (this.hasSorttable()) {
-            sorttable.makeSortable(itbl[0]);            
-        }
-        $("#metadatadiv").accordion("option", "active", $("#metadatadiv > h3").length - 1); 
-    };
-    
-    //Ignore the first column containing a row number and the item handle, get handle for the collection
-    this.exportCol = function(colnum, col) {
-        var data = "";
-        if (colnum == 0) return "";
-        if (colnum == 3) return "";
-        data += (colnum == 1) ? "" : ",";
-        
-        if (colnum == 2) {
-            var anchor = $(col).find("a");
-            var href = anchor.is("a") ? anchor.attr("href").replace(self.ROOTPATH,"") : $(col).text();
-            data += "\"" + href + "\"";
-        } else {
-            data += self.exportCell(col);        }
-        return data;
-    };
-};
-QueryReport.prototype = Object.create(Report.prototype);
-
-$(document).ready(function(){
-    var myReport=new QueryReport();
-    myReport.init();
-});
-
-var QueryableMetadataFields = function(report) {
-    MetadataFields.call(this, report);
-    var self = this;
-    
-    this.initFields = function(data, report) {
-        self.metadataSchemas = data;
-        var params = report.myReportParameters.params;
-        var fields = params["query_field[]"];
-        var ops = params["query_op[]"];
-        var vals = params["query_val[]"];
-        if (fields && ops && vals) {
-            if (fields.length == 0) {
-                self.drawFilterQuery("*","exists","");
-            } else {
-                for(var i=0; i<fields.length; i++) {
-                    var op = ops.length > i ? ops[i] : "";
-                    var val = vals.length > i ? vals[i] : "";
-                    self.drawFilterQuery(fields[i],op,val);
-                } 
-            }                
-        }
-        self.drawShowFields(params["show_fields[]"]);
-        self.initQueries();        
-        report.spinner.stop();
-        $(".query-button").attr("disabled", false);
-    };
-    
-    this.initQueries = function() {
-        $("#predefselect")
-          .append($("<option value='new'>New Query</option>"))
-          .append($("<option value='q1'>Has No Title</option>"))
-          .append($("<option value='q2'>Has No dc.identifier.uri</option>"))
-          .append($("<option value='q3'>Has compound subject</option>"))
-          .append($("<option value='q4'>Has compound dc.contributor.author</option>"))
-          .append($("<option value='q5'>Has compound dc.creator</option>"))
-          .append($("<option value='q6'>Has URL in dc.description</option>"))
-          .append($("<option value='q7'>Has full text in dc.description.provenance</option>"))
-          .append($("<option value='q8'>Has non-full text in dc.description.provenance</option>"))
-          .append($("<option value='q9'>Has empty metadata</option>"))
-          .append($("<option value='q10'>Has unbreaking metadata in description</option>"))
-          .append($("<option value='q12'>Has XML entity in metadata</option>"))
-          .append($("<option value='q13'>Has non-ascii character in metadata</option>"))
-          .on("change",function(){
-              $("div.metadata").remove();
-              var val = $("#predefselect").val();
-              if (val ==  'new') {
-                  self.drawFilterQuery("","","");            
-              } else if (val ==  'q1') {
-                  self.drawFilterQuery("dc.title","doesnt_exist","");                        
-              } else if (val ==  'q2') {
-                  self.drawFilterQuery("dc.identifier.uri","doesnt_exist","");                        
-              } else if (val ==  'q3') {
-                  self.drawFilterQuery("dc.subject.*","like","%;%");                        
-              } else if (val ==  'q4') {
-                  self.drawFilterQuery("dc.contributor.author","like","% and %");                        
-              } else if (val ==  'q5') {
-                  self.drawFilterQuery("dc.creator","like","% and %");                        
-              } else if (val ==  'q6') {
-                  self.drawFilterQuery("dc.description","matches","^.*(http://|https://|mailto:).*$");                        
-              } else if (val ==  'q7') {
-                  self.drawFilterQuery("dc.description.provenance","matches","^.*No\\. of bitstreams(.|\\r|\\n|\\r\\n)*\\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$");                        
-              } else if (val ==  'q8') {
-                  self.drawFilterQuery("dc.description.provenance","doesnt_match","^.*No\\. of bitstreams(.|\\r|\\n|\\r\\n)*\\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$");                        
-              } else if (val ==  'q9') {
-                  self.drawFilterQuery("*","matches","^\\s*$");                        
-              } else if (val ==  'q10') {
-                  self.drawFilterQuery("dc.description.*","matches","^.*[^\\s]{50,}.*$");                        
-              } else if (val ==  'q12') {
-                  self.drawFilterQuery("*","matches","^.*&#.*$");                        
-              } else if (val ==  'q13') {
-                  self.drawFilterQuery("*","matches","^.*[^[:ascii:]].*$");                        
-              }
-          });
-    };
-
-    this.drawFilterQuery = function(pField, pOp, pVal) {
-        var div = $("<div class='metadata'/>").appendTo("#queries");
-        var sel = $("<select class='query-tool' name='query_field[]'/>");
-        var opt = $("<option value='*'>Any Field</option>");
-        sel.append(opt);
-        $.each(self.metadataSchemas, function(index, schema){
-            if (schema.prefix == 'eperson') {
-                return;
-            }
-            $.each(schema.fields, function(findex, field) {
-                var name = field.name;
-                var parts = name.match(/^([^\.]+)\.([^\.]+)\.([^\.]+)$/);
-                if (parts == null) {
-                    var wildname = name + ".*";
-                    var opt = $("<option/>");
-                    opt.attr("value",wildname).text(wildname);
-                    sel.append(opt);                
-                }
-                var opt = $("<option/>");
-                opt.attr("value",name).text(name);
-                sel.append(opt);
-            });
-        });
-        sel.val(pField);
-        div.append(sel);
-        var opsel = $("<select class='query-tool' name='query_op[]'/>");
-        $("<option>exists</option>").val("exists").appendTo(opsel);
-        $("<option>does not exist</option>").val("doesnt_exist").appendTo(opsel);
-        $("<option selected>equals</option>").val("equals").appendTo(opsel);
-        $("<option>does not equal</option>").val("not_equals").appendTo(opsel);
-        $("<option>like</option>").val("like").appendTo(opsel);
-        $("<option>not like</option>").val("not_like").appendTo(opsel);
-        $("<option>contains</option>").val("contains").appendTo(opsel);
-        $("<option>does not contain</option>").val("doesnt_contain").appendTo(opsel);
-        $("<option>matches</option>").val("matches").appendTo(opsel);
-        $("<option>does not match</option>").val("doesnt_match").appendTo(opsel);
-        opsel.val(pOp);
-        opsel.change(function(){
-            self.valField($(this));
-        });
-        div.append(opsel);
-        var input = $("<input class='query-tool' name='query_val[]'/>");
-        div.append(input);
-        input.val(pVal);
-        self.valField(opsel);
-        $("<button class='field_plus'>+</button>").appendTo(div).click(function(){
-            self.drawFilterQuery();
-            self.queryButtons();
-        });
-        $("<button class='field_minus'>-</button>").appendTo(div).click(function(){
-            $(this).parent("div.metadata").remove();
-            self.queryButtons();
-        });
-        self.queryButtons();
-    };
-
-    this.valField = function(valop) {
-        var val = valop.val();
-        var disableval = (val == "exists" || val == "not_exists");
-        var valinput = valop.parent("div.metadata").find("input[name='query_val[]']");
-        valinput.attr("readonly",disableval);
-        if (disableval) {
-            valinput.val("");        
-        }
-    };
-
-    this.queryButtons = function() {
-        $("button.field_plus").attr("disabled",true);
-        $("button.field_plus:last").attr("disabled",false);
-        $("button.field_minus").attr("disabled",false);
-        if ($("button.field_minus").length == 1) {
-            $("button.field_minus").attr("disabled",true);                
-        }
-    };
-};
-QueryableMetadataFields.prototype = Object.create(MetadataFields.prototype);
\ No newline at end of file
diff --git a/dspace-rest/src/main/webapp/static/reports/restReport.js b/dspace-rest/src/main/webapp/static/reports/restReport.js
deleted file mode 100644
index 8c9dfd9ad4..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/restReport.js
+++ /dev/null
@@ -1,745 +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/
- */
-var Report = function() {
-    var self = this;
-    this.COLL_LIMIT = 500;
-    this.COUNT_LIMIT = 500;
-    this.ITEM_LIMIT = 100;
-
-    this.ROOTPATH = "/handle/";
-
-    //Indicate if Password Authentication is supported
-    this.makeAuthLink = function(){return false;};
-
-    //Indicate if Shibboleth Authentication is supported
-    this.makeShibLink = function(){return false;};
-    this.shibPath = "/Shibboleth.sso/Login";
-
-    //Override this to return obj.id for DSpace 5 versions
-    this.getId = function(obj) {
-        return obj.uuid;
-    };
-
-    //Override this method is sortable.js has been included
-    this.hasSorttable = function() {
-        return false;
-    };
-
-    this.getDefaultParameters = function(){
-        return {};
-    };
-    this.getCurrentParameters = function(){
-        return {};
-    };
-
-    this.saveUrl = function() {
-        this.myReportParameters.saveAsUrl(this.getCurrentParameters());
-    };
-
-    this.getLoginPayload = function() {
-        //Placeholder to allow a customized report to prompt for email/password
-        //If not enabled, the authenticaton callback will be called immediately
-        var email = $("#restemail").val();
-        var pass = $("#restpass").val();
-        if (email == "" || pass == "") {
-          return undefined;
-        } else if (email == null || pass == null) {
-           return undefined;
-        } else {
-           return {email: email, password: pass};
-        }
-    };
-    this.getLangSuffix = function(){
-        return "";
-    };
-    this.myAuth = new Auth(this);
-    this.myAuth.authStat();
-    this.myAuth.callback = function(data) {
-        self.spinner.stop();
-    };
-    this.myHtmlUtil = new HtmlUtil();
-    this.spinner = new Spinner({
-        lines: 13, // The number of lines to draw
-        length: 20, // The length of each line
-        width: 10, // The line thickness
-        radius: 30, // The radius of the inner circle
-        corners: 1, // Corner roundness (0..1)
-        rotate: 0, // The rotation offset
-        direction: 1, // 1: clockwise, -1: counterclockwise
-        color: '#000', // #rgb or #rrggbb or array of colors
-        speed: 1, // Rounds per second
-        trail: 60, // Afterglow percentage
-        shadow: false, // Whether to render a shadow
-        hwaccel: false, // Whether to use hardware acceleration
-        className: 'spinner', // The CSS class to assign to the spinner
-        zIndex: 2e9, // The z-index (defaults to 2000000000)
-        top:  '400px', // Top position relative to parent
-        left: '600px' // Left position relative to parent
-    });
-
-    this.displayItems = function(itemsTitle, offset, limit, total, funcdec, funcinc) {
-        var count = $("#itemtable tr.data").length;
-
-        var last = offset + limit;
-        var suff = "";
-
-        if (total == null) {
-            last = offset + count;
-            suff = (count == limit) ? " of " + last + "+ " : " of " + last;
-        } else if (limit == total) {
-            //total may only be accurate to page size
-            suff = " of " + total + "+ ";
-        } else {
-            last = (last > total) ? total : last;
-            suff = " of " + total;
-        }
-        suff += " unfiltered; displaying " + count + " filtered" ;
-
-        itemsTitle += " (" + (offset+1) + " - " + last + suff + ")";
-        $("#prev,#next").attr("disabled",true);
-        $("#itemdiv h3").text(itemsTitle);
-        $("#exlimit").removeClass("red");
-        if (offset > 0) $("#prev").attr("disabled", false);
-        $("#prev").off("click").on("click", funcdec);
-        //in case of filters, always allow next
-
-        if (total == null) {
-            $("#next").attr("disabled", false);
-        } else if (offset + limit  < total) {
-            $("#next").attr("disabled", false);
-            $("#exlimit").addClass("red");
-        } else if (limit == total) {
-            //total may only be accurate to one page
-            $("#next").attr("disabled", false);
-            $("#exlimit").addClass("red");
-        }
-        $("#next").off("click").on("click", funcinc);
-    };
-
-    this.myReportParameters = undefined;
-    this.myFilters = undefined;
-    this.myMetadataFields = undefined;
-
-    this.initMetadataFields = function() {
-        this.myMetadataFields = new MetadataFields(self);
-        this.myMetadataFields.load();
-    };
-
-  this.initBitstreamFields = function() {
-    this.myBitstreamFields = new BitstreamFields(self);
-    this.myBitstreamFields.load();
-  };
-
-    this.baseInit = function() {
-        this.myReportParameters = new ReportParameters(
-                this.getDefaultParameters(),
-                window.location.search.substr(1)
-        );
-        this.spinner.spin($("h1")[0]);
-        this.myFilters = new Filters(this.myReportParameters.params["filters"]);
-        this.initMetadataFields();
-        this.initBitstreamFields();
-        this.getActiveTab = function(){return 1;};
-        $("#metadatadiv").accordion({
-            heightStyle: "content",
-            collapsible: true,
-            active: self.getActiveTab()
-        });
-        $("#export").click(function(){
-            self.export($("#itemtable tr"));
-        });
-        $("a.this-search").on("click",function(){
-            self.saveUrl();
-        });
-        this.myFilters.createFilterTable(this.myReportParameters.params.filters);
-        this.myAuth.init();
-    };
-
-    this.makeCsv = function(rows) {
-        var itemdata = "";
-        rows.each(function(rownum, row){
-            itemdata += (rownum == 0) ? "" : "\r\n";
-            $(row).find("td,th").each(function(colnum, col){
-                itemdata += self.exportCol(colnum, col);
-            });
-        });
-        return itemdata;
-    };
-
-    this.export = function(rows) {
-    var itemdata = "data:text/csv;charset=utf-8," + this.makeCsv(rows);
-        var encodedUri = encodeURI(itemdata);
-        window.open(encodedUri);
-    };
-
-    //this is meant to be overridden for each report
-    this.exportCol = function(colnum, col) {
-        var data = "";
-        data += (colnum == 0) ? "" : ",";
-        data += self.exportCell(col);
-        return data;
-    };
-
-    this.exportCell = function(col) {
-        data = "\"";
-        $(col).contents().each(function(i, node){
-            if ($(node).is("hr")) {
-                data += "||";
-            } else {
-                data += $(node).text().replace(/\n/g," ").replace(/"/g,"\"\"").replace(/\s/g," ");
-                if ($(node).is("div:not(:last-child)")) {
-                    data += "||";
-                }
-            }
-        });
-        data += "\"";
-        return data;
-    };
-
-    this.init = function() {
-        this.baseInit();
-    };
-};
-
-var Auth = function(report) {
-    this.report = report;
-    this.TOKEN = undefined;
-    this.callback = function(data) {
-    };
-    this.saveToken = function(data) {
-        this.TOKEN = data;
-    };
-    this.init = function() {
-        var loginPayload = report.getLoginPayload();
-        if (loginPayload == undefined) {
-            this.callback();
-            return;
-        }
-
-        var self = this;
-        $.ajax({
-            url : "/rest/login",
-            contentType : "application/x-www-form-urlencoded",
-            accepts : "application/json",
-            type : "POST",
-            data : loginPayload,
-            success : function(data){
-                self.saveToken(data);
-               },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/login "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-                self.authStat();
-                self.callback();
-            }
-        });
-    };
-
-    this.verifyShibLogin = function() {
-        var self = this;
-        $.ajax({
-            url: "/rest/shibboleth-login",
-            success: self.authStat
-        });
-    };
-
-    this.authStat = function() {
-        var self = this;
-        $.ajax({
-            url : "/rest/status",
-            dataType : "json",
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/status "+ status+ " " + errorThrown);
-            },
-            success: function(data) {
-                var user = "";
-                if (data.email != undefined) {
-                    user = data.email;
-                } else {
-                    user = "You are not logged in.  Some items may be excluded from reports.";
-                }
-                var anchor = $("<a/>").text(user);
-                if (self.report.makeShibLink()) {
-                  anchor.attr("href", self.report.shibPath + "?target="+document.location);
-                }
-                if (self.report.makeAuthLink()) {
-                    anchor.attr("href","javascript:window.open('authenticate.html','Authenticate (Password Auth Only)','height=200,width=500')");
-                }
-                $("#currentUser").empty().append("<b>Current User: </b>").append(anchor);
-                if (data.email == undefined && self.report.makeShibLink()) {
-                    self.verifyShibLogin();
-                }
-            }
-        });
-    };
-
-    this.logout = function() {
-        var self = this;
-        $.ajax({
-            url : "/rest/logout",
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/logout "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-                self.authStat();
-            }
-        });
-    };
-    this.getHeaders = function() {
-        var HEADERS = {};
-        if (this.TOKEN != null) {
-            HEADERS['rest-dspace-token'] = this.TOKEN;
-        }
-        return HEADERS;
-    };
-};
-
-var ReportParameters = function(defaultParams, prmstr) {
-    this.params = defaultParams;
-
-    if (prmstr == null) prmstr = "";
-    var prmarr = prmstr.split("&");
-    for ( var i = 0; i < prmarr.length; i++) {
-        var tmparr = prmarr[i].split("=");
-        var field = tmparr[0];
-        var val = decodeURIComponent(tmparr[1]);
-        var pval = this.params[field];
-
-        if ($.isArray(pval)) {
-            pval[pval.length] = val;
-        } else {
-            this.params[field] = val;
-        }
-    }
-    $("#limit").val(this.params.limit);
-    $("#offset").val(this.params.offset);
-    this.limit = this.params.limit;
-    this.offset = this.params.offset;
-
-    this.getOffset = function() {
-        var offset = $("#offset").val();
-        return $.isNumeric(offset) ? Number(offset) : this.offset;
-    };
-
-    this.getNextOffset = function() {
-        return this.getOffset() + this.getLimit();
-    };
-
-    this.getPrevOffset = function() {
-        var v = this.getOffset() - this.getLimit();
-        return v < 0 ? 0 : v;
-    };
-
-    this.getLimit = function() {
-        var limit = $("#limit").val();
-        return $.isNumeric(limit) ? Number(limit) : this.limit;
-    };
-
-    this.updateOffset = function(increment) {
-        var val = $("#offset").val();
-        var lim = $("#limit").val();
-        if ($.isNumeric(val) && $.isNumeric(lim)) {
-            if (increment) {
-                $("#offset").val(this.getNextOffset());
-            } else {
-                $("#offset").val(this.getPrevOffset());
-            }
-        }
-    };
-
-    this.saveAsUrl = function(params) {
-        var pstr = $.param(params).replace(/%5B%5D/g,"[]");
-        window.location.search = pstr;
-    };
-};
-
-
-var Filters = function() {
-    this.createFilterTable = function(filterList) {
-        self = this;
-        var paramFilterSel = filterList == null ? new Array() : filterList.split(",");
-        var categories = new Array();
-        self.addFilter("", categories, "General", "None", "De-select all filters", "none").click(
-            function(){
-                $("input.filter,input.all").attr("checked",false);
-                $("#filter-reload").attr("disabled", false);
-            }
-        );
-        self.addFilter("all", categories, "General", "All", "Show all filters", "all").click(
-            function(){
-                $("input.filter,input.none").attr("checked",false);
-                $("#filter-reload").attr("disabled", false);
-            }
-        );
-
-        $.getJSON(
-            "/rest/filters",
-            function(data){
-                $.each(data, function(index, filter){
-                    var checkbox = self.addFilter(filter["filter-name"], categories, filter.category, filter.title, filter.description, "filter").click(
-                        function(){
-                            $("input.none,input.all").attr("checked",false);
-                            $("#filter-reload").attr("disabled", false);
-                        }
-                    );
-                    $.each(paramFilterSel, function(index, filtername){
-                        if (filtername == filter["filter-name"]) {
-                            checkbox.attr("checked", true);
-                        }
-                    });
-                });
-            }
-        );
-    };
-
-    this.addFilter = function(val, categories, category, title, description, cname) {
-        var catdiv = null;
-        for(var i=0; i<categories.length; i++) {
-            if (categories[i].name == category) {
-                catdiv = categories[i].div;
-                break;
-            }
-        }
-        if (catdiv == null) {
-            catdiv = $("<fieldset class='catdiv'/>");
-            catdiv.append($("<legend>"+category+"</legend>"));
-            $("#filterdiv").append(catdiv);
-            categories[categories.length] = {name: category, div: catdiv};
-        }
-        var div = $("<div/>");
-        var input = $("<input name='filters[]' type='checkbox'/>");
-        input.attr("id",val);
-        input.val(val);
-        input.addClass(cname);
-        div.append(input);
-        var ftitle = (title == null) ? val : title;
-        var label = $("<label>" + ftitle + "</label>");
-        label.attr("title", description);
-        div.append(label);
-        catdiv.append(div);
-        return input;
-    };
-
-    this.getFilterList = function() {
-        var list="";
-        $("input:checked[name='filters[]']").each(
-            function(){
-                if (list != "") {
-                    list += ",";
-                }
-                list += $(this).val();
-            }
-        );
-        if (list == "") {
-            list = "none";
-        }
-        return list;
-    };
-};
-
-var MetadataFields = function(report) {
-    this.metadataSchemas = undefined;
-    var self = this;
-
-    this.load = function(){
-        $.ajax({
-            url: "/rest/registries/schema",
-            dataType: "json",
-            success: function(data){
-                self.initFields(data, report);
-            },
-            error: function(xhr, status, errorThrown) {
-                alert("Error in /rest/registries/schema "+ status+ " " + errorThrown);
-            },
-            complete: function(xhr, status) {
-            }
-        });
-    };
-
-    this.initFields = function(data, report) {
-        var params = report.myReportParameters.params;
-        self.metadataSchemas = data;
-        self.drawShowFields(params["show_fields[]"]);
-    };
-
-    this.getShowFields = function(){
-        var val = $("#show-fields select").val();
-        return val == null ? Array() : val;
-    };
-
-    this.drawShowFields = function(pfields) {
-        var sel = $("<select name='show_fields'/>").attr("multiple","true").attr("size","8").appendTo("#show-fields");
-        $.each(this.metadataSchemas, function(index, schema){
-            if (schema.prefix == 'eperson') {
-                return;
-            }
-            $.each(schema.fields, function(findex, field) {
-                var name = field.name;
-                var opt = $("<option/>");
-                opt.attr("value",name).text(name);
-                for(var i=0; i<pfields.length; i++) {
-                    if (pfields[i] == name) {
-                        opt.attr("selected", true);
-                    }
-                }
-                sel.append(opt);
-            });
-        });
-    };
-
-    this.initQueries = function(){};
-};
-
-var BitstreamFields = function(report) {
-  var self = this;
-  this.isOriginal = function(bit){
-    return bit.bundleName === "ORIGINAL";
-  };
-  this.map = [
-    {
-      key: "original-file-names",
-      name: "Original File Names",
-      ftest: self.isOriginal,
-      fval: function(bit) {
-        return bit.name;
-      }
-    },
-    {
-      key: "mime-type",
-      name: "Mime Type",
-      ftest: self.isOriginal,
-      fval: function(bit) {
-        return bit.mimeType;
-      }
-    },
-    {
-      key: "bitstream-format",
-      name: "Bitstream Format",
-      ftest: self.isOriginal,
-      fval: function(bit) {
-        return bit.format;
-      }
-    },
-    {
-      key: "bitstream-description",
-      name: "Bitstream Description",
-      ftest: self.isOriginal,
-      fval: function(bit) {
-        return bit.description;
-      }
-    },
-    {
-      key: "bitstream-size",
-      name: "Bitstream Size",
-      ftest: self.isOriginal,
-      fval: function(bit) {
-        return Number(bit.sizeBytes);
-      }
-    },
-    {
-      key: "bitstream-checksum",
-      name: "MD5 Checksum",
-      ftest: self.isOriginal,
-      fval: function(bit) {
-        if (bit.checkSum.checkSumAlgorithm === "MD5") {
-          return bit.checkSum.value;
-        }
-        return "";
-      }
-    },
-  ];
-
-  this.load = function(){
-    self.initFields(report);
-  };
-
-  this.initFields = function(report) {
-    var params = report.myReportParameters.params;
-    self.drawShowFieldsBits(params["show_fields_bits[]"]);
-  };
-
-  this.hasBitstreamFields = function() {
-    return self.getShowFieldsBits() != null;
-  };
-
-  this.getShowFieldsBits = function(){
-    var val = $("#show-fields-bits select").val();
-    return val == null ? Array() : val;
-  };
-
-  this.drawShowFieldsBits = function(pfieldsBits) {
-    var sel = $("<select name='show_fields_bits'/>");
-    sel.attr("multiple","true").attr("size","8").appendTo("#show-fields-bits");
-    for(var i=0; i<this.map.length; i++) {
-      var opt = report.myHtmlUtil.addOpt(sel, this.map[i].name, this.map[i].key);
-      if (pfieldsBits != null) {
-        opt.attr("selected", pfieldsBits[this.map[i].key] != undefined ? "Y" : null);
-      }
-      sel.append(opt);
-    }
-  };
-
-
-  this.getKeyText = function(key, item, bitfields) {
-    var ret = [];
-    if (bitfields == null || item.bitstreams == null) {
-      return ret;
-    }
-    if (!bitfields.includes(key)) {
-      return ret;
-    }
-    var mapval = null;
-    for(var i=0; i<this.map.length; i++) {
-      if (this.map[i].key === key) {
-        mapval = this.map[i];
-        break;
-      }
-    }
-    if (mapval == null) {
-      return ret;
-    }
-
-    $.each(item.bitstreams, function(colindex, bitstream) {
-      if (mapval.ftest(bitstream)) {
-        var val = mapval.fval(bitstream);
-        if (val != null) {
-          if (isNaN(val) || ret.length == 0) {
-            ret.push(val);
-          } else {
-            ret[0] += val;
-          }
-
-        }
-      }
-    });
-    return ret;
-  };
-};
-
-var HtmlUtil = function() {
-    this.addTr = function(tbl) {
-        var tr = $("<tr/>");
-        tbl.append(tr);
-        return tr;
-    };
-
-    this.addTd = function(tr, val) {
-        var td = $("<td/>");
-        if (val != null) {
-            td.append(val);
-        }
-        tr.append(td);
-        return td;
-    };
-
-    this.addTh = function(tr, val) {
-        var th = $("<th/>");
-        if (val != null) {
-            th.append(val);
-        }
-        tr.append(th);
-        return th;
-    };
-
-    this.addTdAnchor = function(tr, val, href) {
-        return this.addTd(tr, this.getAnchor(val, href));
-    };
-
-    this.getAnchor = function(val, href) {
-        var a = $("<a/>");
-        a.append(val);
-        a.attr("href", href);
-        a.attr("target", "_blank");
-        a.attr("rel", "noopener noreferrer");
-        return a;
-    };
-
-    this.createOpt = function(name, val) {
-        var opt = $("<option/>");
-        opt.attr("value", val).text(name);
-        return opt;
-    };
-
-    this.addOpt = function(sel, name, val) {
-        var opt = this.createOpt(name, val);
-        sel.append(opt);
-        return opt;
-    };
-
-    this.addDisabledOpt = function(sel, name, val) {
-        var opt = this.createOpt(name, val).attr("disabled",true);
-        sel.append(opt);
-        return opt;
-    };
-
-    this.makeTotalCol = function(th) {
-        th.append($("<hr><span class='num'>-</span>"));
-    };
-
-    this.totalCol = function(index){
-        var total = 0;
-        $("#table tr.data").each(function(){
-            var val = $($(this).find("td")[index]).text();
-            if ($.isNumeric(val)) {
-                total += Number(val);
-            }
-        });
-        $($("#table tr.header th")[index]).find("span.num").text(total);
-    };
-
-};
-
-var CommunitySelector = function(report, parent, paramCollSel) {
-    var self = this;
-    var collSel = $("<select/>").attr("id","collSel").attr("name","collSel").attr("multiple", true).attr("size",15);
-    parent.append(collSel);
-    report.myHtmlUtil.addOpt(collSel, "Whole Repository", "");
-
-    $.ajax({
-        url: "/rest/hierarchy",
-        dataType: "json",
-        headers: report.myAuth.getHeaders(),
-        success: function(data){
-            var collSel = $("#collSel");
-            if (data.community != null) {
-                $.each(data.community, function(index, comm){
-                    self.addCommLabel(collSel, comm, 0, paramCollSel);
-                });
-            }
-        },
-        error: function(xhr, status, errorThrown) {
-            alert("Error in /rest/communities "+ status+ " " + errorThrown);
-        },
-        complete: function(xhr, status) {
-        }
-    });
-
-    this.addCommLabel = function(collSel, comm, indent, paramCollSel) {
-        var prefix = "";
-        for(var i=0; i<indent; i++) {
-            prefix += "--";
-        }
-        report.myHtmlUtil.addDisabledOpt(collSel, prefix + comm.name, comm.id);
-        if (comm.collection != null) {
-            $.each(comm.collection, function(index, coll) {
-                var opt = report.myHtmlUtil.addOpt(collSel, prefix + "--" + coll.name, coll.id);
-                $.each(paramCollSel, function(index, collid){
-                    if (collid == coll.id) {
-                        opt.attr("selected", true);
-                    }
-                });
-            });
-        }
-        if (comm.community != null) {
-            $.each(comm.community, function(index, scomm) {
-                self.addCommLabel(collSel, scomm, indent + 1, paramCollSel);
-            });
-        }
-    };
-};
diff --git a/dspace-rest/src/main/webapp/static/reports/spin.js b/dspace-rest/src/main/webapp/static/reports/spin.js
deleted file mode 100644
index afe41355ff..0000000000
--- a/dspace-rest/src/main/webapp/static/reports/spin.js
+++ /dev/null
@@ -1,369 +0,0 @@
-/**
- * Copyright (c) 2011-2014 Felix Gnass
- * Licensed under the MIT license
- */
-
-/*
- * The MIT License
-
-Copyright (c) 2011-2014 Felix Gnass [fgnass at neteye dot de]
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
- */
-(function(root, factory) {
-
-  /* CommonJS */
-  if (typeof exports == 'object')  module.exports = factory();
-
-  /* AMD module */
-  else if (typeof define == 'function' && define.amd) define(factory);
-
-  /* Browser global */
-  else root.Spinner = factory();
-}
-(this, function() {
-  "use strict";
-
-  var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
-    , animations = {} /* Animation rules keyed by their name */
-    , useCssAnimations /* Whether to use CSS animations or setTimeout */
-    ;
-
-  /**
-   * Utility function to create elements. If no tag name is given,
-   * a DIV is created. Optionally properties can be passed.
-   */
-  function createEl(tag, prop) {
-    var el = document.createElement(tag || 'div')
-      , n
-      ;
-
-    for(n in prop) el[n] = prop[n];
-    return el;
-  }
-
-  /**
-   * Appends children and returns the parent.
-   */
-  function ins(parent /* child1, child2, ...*/) {
-    for (var i=1, n=arguments.length; i<n; i++)
-      parent.appendChild(arguments[i])
-
-    return parent;
-  }
-
-  /**
-   * Insert a new stylesheet to hold the @keyframe or VML rules.
-   */
-  var sheet = (function() {
-    var el = createEl('style', {type : 'text/css'});
-    ins(document.getElementsByTagName('head')[0], el);
-    return el.sheet || el.styleSheet;
-  }());
-
-  /**
-   * Creates an opacity keyframe animation rule and returns its name.
-   * Since most mobile Webkits have timing issues with animation-delay,
-   * we create separate rules for each line/segment.
-   */
-  function addAnimation(alpha, trail, i, lines) {
-    var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-')
-      , start = 0.01 + i/lines * 100
-      , z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
-      , prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
-      , pre = prefix && '-' + prefix + '-' || ''
-      ;
-
-    if (!animations[name]) {
-      sheet.insertRule(
-        '@' + pre + 'keyframes ' + name + '{' +
-        '0%{opacity:' + z + '}' +
-        start + '%{opacity:' + alpha + '}' +
-        (start+0.01) + '%{opacity:1}' +
-        (start+trail) % 100 + '%{opacity:' + alpha + '}' +
-        '100%{opacity:' + z + '}' +
-        '}', sheet.cssRules.length);
-
-      animations[name] = 1;
-    }
-
-    return name;
-  }
-
-  /**
-   * Tries various vendor prefixes and returns the first supported property.
-   */
-  function vendor(el, prop) {
-    var s = el.style
-      , pp
-      , i
-      ;
-
-    prop = prop.charAt(0).toUpperCase() + prop.slice(1);
-    for(i=0; i<prefixes.length; i++) {
-      pp = prefixes[i]+prop;
-      if(s[pp] !== undefined) return pp;
-    }
-    if(s[prop] !== undefined) return prop;
-  }
-
-  /**
-   * Sets multiple style properties at once.
-   */
-  function css(el, prop) {
-    for (var n in prop)
-      el.style[vendor(el, n)||n] = prop[n];
-
-    return el;
-  }
-
-  /**
-   * Fills in default values.
-   */
-  function merge(obj) {
-    for (var i=1; i < arguments.length; i++) {
-      var def = arguments[i];
-      for (var n in def)
-        if (obj[n] === undefined) obj[n] = def[n];
-    }
-    return obj;
-  }
-
-  /**
-   * Returns the line color from the given string or array.
-   */
-  function getColor(color, idx) {
-    return typeof color == 'string' ? color : color[idx % color.length];
-  }
-
-  // Built-in defaults
-
-  var defaults = {
-    lines: 12,            // The number of lines to draw
-    length: 7,            // The length of each line
-    width: 5,             // The line thickness
-    radius: 10,           // The radius of the inner circle
-    rotate: 0,            // Rotation offset
-    corners: 1,           // Roundness (0..1)
-    color: '#000',        // #rgb or #rrggbb
-    direction: 1,         // 1: clockwise, -1: counterclockwise
-    speed: 1,             // Rounds per second
-    trail: 100,           // Afterglow percentage
-    opacity: 1/4,         // Opacity of the lines
-    fps: 20,              // Frames per second when using setTimeout()
-    zIndex: 2e9,          // Use a high z-index by default
-    className: 'spinner', // CSS class to assign to the element
-    top: '50%',           // center vertically
-    left: '50%',          // center horizontally
-    position: 'absolute'  // element position
-  };
-
-  /** The constructor */
-  function Spinner(o) {
-    this.opts = merge(o || {}, Spinner.defaults, defaults);
-  }
-
-  // Global defaults that override the built-ins:
-  Spinner.defaults = {};
-
-  merge(Spinner.prototype, {
-
-    /**
-     * Adds the spinner to the given target element. If this instance is already
-     * spinning, it is automatically removed from its previous target b calling
-     * stop() internally.
-     */
-    spin: function(target) {
-      this.stop();
-
-      var self = this
-        , o = self.opts
-        , el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
-        ;
-
-      css(el, {
-        left: o.left,
-        top: o.top
-      });
-        
-      if (target) {
-        target.insertBefore(el, target.firstChild||null);
-      }
-
-      el.setAttribute('role', 'progressbar');
-      self.lines(el, self.opts);
-
-      if (!useCssAnimations) {
-        // No CSS animation support, use setTimeout() instead
-        var i = 0
-          , start = (o.lines - 1) * (1 - o.direction) / 2
-          , alpha
-          , fps = o.fps
-          , f = fps/o.speed
-          , ostep = (1-o.opacity) / (f*o.trail / 100)
-          , astep = f/o.lines
-
-        ;(function anim() {
-          i++;
-          for (var j = 0; j < o.lines; j++) {
-            alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity);
-
-            self.opacity(el, j * o.direction + start, alpha, o);
-          }
-          self.timeout = self.el && setTimeout(anim, ~~(1000/fps));
-        })();
-      }
-      return self;
-    },
-
-    /**
-     * Stops and removes the Spinner.
-     */
-    stop: function() {
-      var el = this.el;
-      if (el) {
-        clearTimeout(this.timeout);
-        if (el.parentNode) el.parentNode.removeChild(el);
-        this.el = undefined;
-      }
-      return this;
-    },
-
-    /**
-     * Internal method that draws the individual lines. Will be overwritten
-     * in VML fallback mode below.
-     */
-    lines: function(el, o) {
-      var i = 0
-        , start = (o.lines - 1) * (1 - o.direction) / 2
-        , seg
-        ;
-
-      function fill(color, shadow) {
-        return css(createEl(), {
-          position: 'absolute',
-          width: (o.length+o.width) + 'px',
-          height: o.width + 'px',
-          background: color,
-          boxShadow: shadow,
-          transformOrigin: 'left',
-          transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
-          borderRadius: (o.corners * o.width>>1) + 'px'
-        });
-      }
-
-      for (; i < o.lines; i++) {
-        seg = css(createEl(), {
-          position: 'absolute',
-          top: 1+~(o.width/2) + 'px',
-          transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
-          opacity: o.opacity,
-          animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
-        });
-
-        if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}));
-        ins(el, ins(seg, fill(getColor(o.color, i), '0 0 1px rgba(0,0,0,.1)')));
-      }
-      return el;
-    },
-
-    /**
-     * Internal method that adjusts the opacity of a single line.
-     * Will be overwritten in VML fallback mode below.
-     */
-    opacity: function(el, i, val) {
-      if (i < el.childNodes.length) el.childNodes[i].style.opacity = val;
-    }
-
-  });
-
-
-  function initVML() {
-
-    /* Utility function to create a VML tag */
-    function vml(tag, attr) {
-      return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr);
-    }
-
-    // No CSS transforms but VML support, add a CSS rule for VML elements:
-    sheet.addRule('.spin-vml', 'behavior:url(#default#VML)');
-
-    Spinner.prototype.lines = function(el, o) {
-      var r = o.length+o.width
-        , s = 2*r
-        ;
-
-      function grp() {
-        return css(
-          vml('group', {
-            coordsize: s + ' ' + s,
-            coordorigin: -r + ' ' + -r
-          }),
-          { width: s, height: s }
-        );
-      }
-
-      var margin = -(o.width+o.length)*2 + 'px'
-        , g = css(grp(), {position: 'absolute', top: margin, left: margin})
-        , i
-        ;
-
-      function seg(i, dx, filter) {
-        ins(g,
-          ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
-            ins(css(vml('roundrect', {arcsize: o.corners}), {
-                width: r,
-                height: o.width,
-                left: o.radius,
-                top: -o.width>>1,
-                filter: filter
-              }),
-              vml('fill', {color: getColor(o.color, i), opacity: o.opacity}),
-              vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
-            )
-          )
-        );
-      }
-
-      if (o.shadow)
-        for (i = 1; i <= o.lines; i++)
-          seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)');
-
-      for (i = 1; i <= o.lines; i++) seg(i);
-      return ins(el, g);
-    };
-
-    Spinner.prototype.opacity = function(el, i, val, o) {
-      var c = el.firstChild;
-      o = o.shadow && o.lines || 0;
-      if (c && i+o < c.childNodes.length) {
-        c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild;
-        if (c) c.opacity = val;
-      }
-    };
-  }
-
-  var probe = css(createEl('group'), {behavior: 'url(#default#VML)'});
-
-  if (!vendor(probe, 'transform') && probe.adj) initVML();
-  else useCssAnimations = vendor(probe, 'animation');
-
-  return Spinner;
-
-}));
diff --git a/dspace-rest/src/test/java/org/dspace/rest/common/TestJAXBSchema.java b/dspace-rest/src/test/java/org/dspace/rest/common/TestJAXBSchema.java
deleted file mode 100644
index 4333b26577..0000000000
--- a/dspace-rest/src/test/java/org/dspace/rest/common/TestJAXBSchema.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.rest.common;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
-import java.io.Writer;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.SchemaOutputResolver;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public class TestJAXBSchema {
-
-    private static class TestSchemaOutputResolver extends SchemaOutputResolver {
-
-        private final Writer output;
-
-        public TestSchemaOutputResolver(Writer output) {
-            this.output = output;
-        }
-
-        public Result createOutput(String namespaceUri, String suggestedFileName) throws IOException {
-            StreamResult result = new StreamResult(output);
-            result.setSystemId("xsd0.xsd");
-            return result;
-        }
-
-    }
-
-    @Test
-    public void testFullSchema() throws Exception {
-        StringWriter writer = new StringWriter();
-        TestSchemaOutputResolver resolver = new TestSchemaOutputResolver(writer);
-        JAXBContext context = JAXBContext.newInstance(
-            Bitstream.class,
-            CheckSum.class,
-            Collection.class,
-            Community.class,
-            DSpaceObject.class,
-            Item.class,
-            MetadataEntry.class,
-            ResourcePolicy.class,
-            Status.class
-        );
-        context.generateSchema(resolver);
-
-        String res = "org/dspace/rest/common/expected_xsd0.xsd";
-        InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(res);
-        String expected = IOUtils.toString(is, "UTF-8");
-
-        // System.err.println(writer.toString());
-
-        assertEquals("JAXB schema", expected, writer.toString());
-    }
-
-}
diff --git a/dspace-rest/src/test/resources/org/dspace/rest/common/expected_xsd0.xsd b/dspace-rest/src/test/resources/org/dspace/rest/common/expected_xsd0.xsd
deleted file mode 100644
index c705330670..0000000000
--- a/dspace-rest/src/test/resources/org/dspace/rest/common/expected_xsd0.xsd
+++ /dev/null
@@ -1,154 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<xs:schema version="1.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-  <xs:element name="bitstream" type="bitstream"/>
-
-  <xs:element name="collection" type="collection"/>
-
-  <xs:element name="community" type="community"/>
-
-  <xs:element name="dspaceobject" type="dSpaceObject"/>
-
-  <xs:element name="item" type="item"/>
-
-  <xs:element name="metadataentry" type="metadataEntry"/>
-
-  <xs:element name="resourcepolicy" type="resourcePolicy"/>
-
-  <xs:element name="status" type="status"/>
-
-  <xs:complexType name="bitstream">
-    <xs:complexContent>
-      <xs:extension base="dSpaceObject">
-        <xs:sequence>
-          <xs:element name="bundleName" type="xs:string" minOccurs="0"/>
-          <xs:element name="checkSum" type="checkSum" minOccurs="0"/>
-          <xs:element name="description" type="xs:string" minOccurs="0"/>
-          <xs:element name="format" type="xs:string" minOccurs="0"/>
-          <xs:element name="mimeType" type="xs:string" minOccurs="0"/>
-          <xs:element name="parentObject" type="dSpaceObject" minOccurs="0"/>
-          <xs:element name="policies" type="resourcePolicy" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="retrieveLink" type="xs:string" minOccurs="0"/>
-          <xs:element name="sequenceId" type="xs:int" minOccurs="0"/>
-          <xs:element name="sizeBytes" type="xs:long" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="dSpaceObject">
-    <xs:sequence>
-      <xs:element name="link" type="xs:string"/>
-      <xs:element name="expand" type="xs:string" maxOccurs="unbounded"/>
-      <xs:element name="handle" type="xs:string" minOccurs="0"/>
-      <xs:element name="name" type="xs:string" minOccurs="0"/>
-      <xs:element name="type" type="xs:string" minOccurs="0"/>
-      <xs:element name="UUID" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="checkSum">
-    <xs:simpleContent>
-      <xs:extension base="xs:string">
-        <xs:attribute name="checkSumAlgorithm" type="xs:string"/>
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:complexType name="resourcePolicy">
-    <xs:sequence>
-      <xs:element name="action" type="action" minOccurs="0"/>
-      <xs:element name="endDate" type="xs:dateTime" minOccurs="0"/>
-      <xs:element name="epersonId" type="xs:string" minOccurs="0"/>
-      <xs:element name="groupId" type="xs:string" minOccurs="0"/>
-      <xs:element name="id" type="xs:int" minOccurs="0"/>
-      <xs:element name="resourceId" type="xs:string" minOccurs="0"/>
-      <xs:element name="resourceType" type="xs:string" minOccurs="0"/>
-      <xs:element name="rpDescription" type="xs:string" minOccurs="0"/>
-      <xs:element name="rpName" type="xs:string" minOccurs="0"/>
-      <xs:element name="rpType" type="xs:string" minOccurs="0"/>
-      <xs:element name="startDate" type="xs:dateTime" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="collection">
-    <xs:complexContent>
-      <xs:extension base="dSpaceObject">
-        <xs:sequence>
-          <xs:element name="copyrightText" type="xs:string" minOccurs="0"/>
-          <xs:element name="introductoryText" type="xs:string" minOccurs="0"/>
-          <xs:element name="items" type="item" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="license" type="xs:string" minOccurs="0"/>
-          <xs:element name="numberItems" type="xs:int" minOccurs="0"/>
-          <xs:element name="parentCommunity" type="community" minOccurs="0"/>
-          <xs:element name="parentCommunityList" type="community" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="shortDescription" type="xs:string" minOccurs="0"/>
-          <xs:element name="sidebarText" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="item">
-    <xs:complexContent>
-      <xs:extension base="dSpaceObject">
-        <xs:sequence>
-          <xs:element name="archived" type="xs:string" minOccurs="0"/>
-          <xs:element name="bitstreams" type="bitstream" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="lastModified" type="xs:string" minOccurs="0"/>
-          <xs:element name="metadata" type="metadataEntry" maxOccurs="unbounded"/>
-          <xs:element name="parentCollection" type="collection" minOccurs="0"/>
-          <xs:element name="parentCollectionList" type="collection" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="parentCommunityList" type="community" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="withdrawn" type="xs:string" minOccurs="0"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="metadataEntry">
-    <xs:sequence>
-      <xs:element name="key" type="xs:string" minOccurs="0"/>
-      <xs:element name="language" type="xs:string" minOccurs="0"/>
-      <xs:element name="value" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="community">
-    <xs:complexContent>
-      <xs:extension base="dSpaceObject">
-        <xs:sequence>
-          <xs:element name="collections" type="collection" nillable="true" minOccurs="0" maxOccurs="unbounded"/>
-          <xs:element name="copyrightText" type="xs:string" minOccurs="0"/>
-          <xs:element name="countItems" type="xs:int" minOccurs="0"/>
-          <xs:element name="introductoryText" type="xs:string" minOccurs="0"/>
-          <xs:element name="logo" type="bitstream" minOccurs="0"/>
-          <xs:element name="parentCommunity" type="community" minOccurs="0"/>
-          <xs:element name="shortDescription" type="xs:string" minOccurs="0"/>
-          <xs:element name="sidebarText" type="xs:string" minOccurs="0"/>
-          <xs:element name="subcommunities" type="community" maxOccurs="unbounded"/>
-        </xs:sequence>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="status">
-    <xs:sequence>
-      <xs:element name="apiVersion" type="xs:string" minOccurs="0"/>
-      <xs:element name="authenticated" type="xs:boolean"/>
-      <xs:element name="email" type="xs:string" minOccurs="0"/>
-      <xs:element name="fullname" type="xs:string" minOccurs="0"/>
-      <xs:element name="okay" type="xs:boolean"/>
-      <xs:element name="sourceVersion" type="xs:string" minOccurs="0"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:simpleType name="action">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="READ"/>
-      <xs:enumeration value="WRITE"/>
-      <xs:enumeration value="DELETE"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:schema>
-
diff --git a/dspace-server-webapp/pom.xml b/dspace-server-webapp/pom.xml
index 5395169950..b437b07869 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)
@@ -15,7 +14,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -25,23 +24,82 @@
 
         <!-- 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>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.2.1</version>
                 <executions>
                     <execution>
-                        <phase>prepare-package</phase>
+                        <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>
+                                </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>**/*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>
+                                        <include>**/static/**</include>
+                                        <include>**/spring/**</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -66,11 +124,11 @@
                         <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>
+                        <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>
@@ -155,7 +213,7 @@
                             <systemPropertyVariables>
                                 <!-- Specify the dspace.dir to use for test environment -->
                                 <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                                <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>
@@ -214,7 +272,7 @@
                         <configuration>
                             <systemPropertyVariables>
                                 <!-- Specify the dspace.dir to use for test environment -->
-                                <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                                <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>
@@ -235,6 +293,14 @@
                 <artifactId>spring-expression</artifactId>
                 <version>${spring.version}</version>
             </dependency>
+
+            <!-- Specify the version of json-smart we want to use.
+                 This solves a version mismatch between nimbus-jose-jwt and json-path below. -->
+            <!--<dependency>
+                <groupId>net.minidev</groupId>
+                <artifactId>json-smart</artifactId>
+                <version>2.5.0</version>
+            </dependency>-->
         </dependencies>
     </dependencyManagement>
 
@@ -253,12 +319,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>
@@ -283,6 +343,18 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Use version brought in by spring-boot-starter-web above -->
+                <exclusion>
+                    <groupId>io.micrometer</groupId>
+                    <artifactId>micrometer-observation</artifactId>
+                </exclusion>
+                <!-- Use version brought in by spring-boot-starter-web above -->
+                <exclusion>
+                    <groupId>io.micrometer</groupId>
+                    <artifactId>micrometer-commons</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -316,6 +388,13 @@
             <groupId>org.webjars.bowergithub.codeseven</groupId>
             <artifactId>toastr</artifactId>
             <version>2.1.4</version>
+            <exclusions>
+                <!-- We use a later version of JQuery as defined above -->
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.jquery</groupId>
+                    <artifactId>jquery-dist</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Pull in current version of URI.js (https://medialize.github.io/URI.js/) via WebJars
              Made available at: webjars/urijs/src/URI.min.js -->
@@ -337,6 +416,13 @@
             <groupId>org.webjars.bowergithub.jashkenas</groupId>
             <artifactId>backbone</artifactId>
             <version>1.4.1</version>
+            <exclusions>
+                <!-- We use a later version of underscore as defined above -->
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.jashkenas</groupId>
+                    <artifactId>underscore</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <!-- Pull in current version of json-editor.js (https://github.com/json-editor/json-editor) via WebJars
              Made available at: webjars/json-editor__json-editor/2.6.1/dist/jsoneditor.js
@@ -345,7 +431,7 @@
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>json-editor__json-editor</artifactId>
-            <version>2.6.1</version>
+            <version>2.15.1</version>
         </dependency>
         <!-- Also pull in current version of Bootstrap via WebJars.
              This is used by BOTH our HAL Browser and our OAI-PMH interface.
@@ -362,6 +448,13 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
             <version>${spring-boot.version}</version>
+            <exclusions>
+                <!-- Use version brought in by spring-boot-starter-web above -->
+                <exclusion>
+                    <groupId>io.micrometer</groupId>
+                    <artifactId>micrometer-observation</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- Add in log4j support by excluding default logging, and using starter-log4j -->
@@ -369,7 +462,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-	        <version>${spring-boot.version}</version>
+            <version>${spring-boot.version}</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>
@@ -381,7 +474,13 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-log4j2</artifactId>
-	        <version>${spring-boot.version}</version>
+            <version>${spring-boot.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
         </dependency>
 
         <!-- DSpace dependencies -->
@@ -433,10 +532,6 @@
             <groupId>commons-validator</groupId>
             <artifactId>commons-validator</artifactId>
         </dependency>
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -446,6 +541,21 @@
             <groupId>com.nimbusds</groupId>
             <artifactId>nimbus-jose-jwt</artifactId>
             <version>${nimbus-jose-jwt.version}</version>
+            <exclusions>
+                <!-- We pull in a later version below -->
+                <exclusion>
+                    <groupId>net.minidev</groupId>
+                    <artifactId>json-smart</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <!-- Specify the version of json-smart we want to use.
+             This solves a version mismatch between nimbus-jose-jwt and json-path below. -->
+        <dependency>
+            <groupId>net.minidev</groupId>
+            <artifactId>json-smart</artifactId>
+            <version>2.5.0</version>
         </dependency>
 
         <dependency>
@@ -479,6 +589,13 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!-- Required for ITs to ensure they use Apache HttpClient in AbstractWebClientIntegrationTest -->
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>5.3.1</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
@@ -488,12 +605,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>
@@ -522,6 +637,13 @@
             <artifactId>solr-core</artifactId>
             <version>${solr.client.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Later version provided by Hibernate -->
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
@@ -545,8 +667,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-          <groupId>javax.annotation</groupId>
-          <artifactId>javax.annotation-api</artifactId>
+          <groupId>jakarta.annotation</groupId>
+          <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
index e8b8eb8e70..63ac50b6ea 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/AuthenticationRestController.java
@@ -14,9 +14,9 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.converter.EPersonConverter;
 import org.dspace.app.rest.link.HalLinkService;
@@ -36,8 +36,6 @@ import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.rest.utils.Utils;
 import org.dspace.core.Context;
 import org.dspace.service.ClientInfoService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -64,8 +62,6 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 public class AuthenticationRestController implements InitializingBean {
 
-    private static final Logger log = LoggerFactory.getLogger(AuthenticationRestController.class);
-
     @Autowired
     DiscoverableEndpointsService discoverableEndpointsService;
 
@@ -224,7 +220,7 @@ public class AuthenticationRestController implements InitializingBean {
      * @return ResponseEntity
      */
     @RequestMapping(value = "/login", method = { RequestMethod.GET, RequestMethod.PUT, RequestMethod.PATCH,
-            RequestMethod.DELETE })
+        RequestMethod.DELETE })
     public ResponseEntity login() {
         return ResponseEntity.status(HttpStatus.METHOD_NOT_ALLOWED).body("Only POST is allowed for login requests.");
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamBundleController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamBundleController.java
index 38fb4f4150..a26087b49c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamBundleController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamBundleController.java
@@ -14,9 +14,9 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.link.HalLinkService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamCategoryRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamCategoryRestController.java
index aa511bcb92..81968269fa 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamCategoryRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamCategoryRestController.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest;
 import static org.dspace.app.rest.utils.ContextUtil.obtainContext;
 
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.repository.BitstreamRestRepository;
 import org.dspace.authorize.AuthorizeException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
index 22b18724b9..db9d26a5f6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BitstreamRestController.java
@@ -15,10 +15,10 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.Response;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.Response;
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
index 0cb6bc47e0..d86c54e4fc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/BundleUploadBitstreamController.java
@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.converter.ConverterService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionGroupRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionGroupRestController.java
index d85685a188..6aa6f75378 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionGroupRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionGroupRestController.java
@@ -13,9 +13,9 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionHarvestSettingsController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionHarvestSettingsController.java
index 856804808c..2ff1a85193 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionHarvestSettingsController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionHarvestSettingsController.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.converter.HarvestedCollectionConverter;
 import org.dspace.app.rest.link.HalLinkService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionItemTemplateController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionItemTemplateController.java
index 6a0890fabc..66a3965d86 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionItemTemplateController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionItemTemplateController.java
@@ -12,11 +12,11 @@ import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFI
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.BadRequestException;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.BadRequestException;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.CollectionRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionLogoController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionLogoController.java
index c3243d8887..7d0535858f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionLogoController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CollectionLogoController.java
@@ -7,11 +7,13 @@
  */
 package org.dspace.app.rest;
 
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID;
+
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.CollectionRest;
@@ -44,15 +46,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/api/" + CollectionRest.CATEGORY + "/" + CollectionRest.PLURAL_NAME
-    + CollectionLogoController.REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID + "/logo")
+    + REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID + "/logo")
 public class CollectionLogoController {
 
-    /**
-     * Regular expression in the request mapping to accept UUID as identifier
-     */
-    protected static final String REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID =
-            "/{uuid:[0-9a-fxA-FX]{8}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{12}}";
-
     @Autowired
     protected Utils utils;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityAdminGroupRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityAdminGroupRestController.java
index 2265ac941e..77c5d96295 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityAdminGroupRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityAdminGroupRestController.java
@@ -12,9 +12,9 @@ import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFI
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.GroupRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityLogoController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityLogoController.java
index 52c0f000b6..72bfc0e5bc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityLogoController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CommunityLogoController.java
@@ -7,11 +7,13 @@
  */
 package org.dspace.app.rest;
 
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID;
+
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.CommunityRest;
@@ -44,15 +46,9 @@ import org.springframework.web.multipart.MultipartFile;
  */
 @RestController
 @RequestMapping("/api/" + CommunityRest.CATEGORY + "/" + CommunityRest.PLURAL_NAME
-    + CommunityLogoController.REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID + "/logo")
+    + REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID + "/" + CommunityRest.LOGO)
 public class CommunityLogoController {
 
-    /**
-     * Regular expression in the request mapping to accept UUID as identifier
-     */
-    protected static final String REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID =
-        "/{uuid:[0-9a-fxA-FX]{8}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{12}}";
-
     @Autowired
     protected Utils utils;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ContentReportRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ContentReportRestController.java
new file mode 100644
index 0000000000..c3df859e95
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ContentReportRestController.java
@@ -0,0 +1,226 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.converter.ConverterService;
+import org.dspace.app.rest.model.ContentReportSupportRest;
+import org.dspace.app.rest.model.FilteredCollectionsQuery;
+import org.dspace.app.rest.model.FilteredCollectionsRest;
+import org.dspace.app.rest.model.FilteredItemsQueryPredicate;
+import org.dspace.app.rest.model.FilteredItemsQueryRest;
+import org.dspace.app.rest.model.FilteredItemsRest;
+import org.dspace.app.rest.model.RestModel;
+import org.dspace.app.rest.model.hateoas.ContentReportSupportResource;
+import org.dspace.app.rest.model.hateoas.FilteredCollectionsResource;
+import org.dspace.app.rest.model.hateoas.FilteredItemsResource;
+import org.dspace.app.rest.repository.ContentReportRestRepository;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.contentreport.Filter;
+import org.dspace.contentreport.service.ContentReportService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.rest.webmvc.ControllerUtils;
+import org.springframework.hateoas.Link;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This controller receives and dispatches requests related to the
+ * contents reports ported from DSpace 6.x (Filtered Collections
+ * and Filtered Items).
+ * @author Jean-François Morin (Université Laval)
+ */
+@RestController
+@RequestMapping("/api/" + RestModel.CONTENT_REPORT)
+public class ContentReportRestController implements InitializingBean {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
+
+    @Autowired
+    private DiscoverableEndpointsService discoverableEndpointsService;
+    @Autowired
+    private ConverterService converter;
+    @Autowired
+    private ContentReportRestRepository contentReportRestRepository;
+    @Autowired
+    private ContentReportService contentReportService;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        discoverableEndpointsService
+            .register(this, List.of(Link.of("/api/" + RestModel.CONTENT_REPORT, RestModel.CONTENT_REPORT)));
+    }
+
+    @RequestMapping(method = RequestMethod.GET)
+    public ContentReportSupportResource getContentReportSupport() {
+        ContentReportSupportRest contentReportSupportRest = contentReportRestRepository.getContentReportSupport();
+        return converter.toResource(contentReportSupportRest);
+    }
+
+    /**
+     * GET-based endpoint for the Filtered Collections contents report.
+     * This method also serves as a feed for the HAL Browser infrastructure.
+     * @param filters querying filters received as a comma-separated string
+     * or as a multivalued parameter
+     * @param request HTTP request
+     * @param response HTTP response
+     * @return the list of collections with their respective statistics
+     */
+    @PreAuthorize("hasAuthority('ADMIN')")
+    @GetMapping("/filteredcollections")
+    public ResponseEntity<RepresentationModel<?>> getFilteredCollections(
+            @RequestParam(name = "filters", required = false) List<String> filters,
+            HttpServletRequest request, HttpServletResponse response) throws IOException {
+        if (contentReportService.getEnabled()) {
+            Context context = ContextUtil.obtainContext(request);
+            Set<Filter> filtersSet = listToStream(filters)
+                    .map(Filter::get)
+                    .filter(f -> f != null)
+                    .collect(Collectors.toSet());
+            FilteredCollectionsQuery query = FilteredCollectionsQuery.of(filtersSet);
+            return filteredCollectionsReport(context, query);
+        }
+
+        error404(response);
+        return null;
+    }
+
+
+    private ResponseEntity<RepresentationModel<?>> filteredCollectionsReport(Context context,
+            FilteredCollectionsQuery query) {
+        FilteredCollectionsRest report = contentReportRestRepository
+                .findFilteredCollections(context, query);
+        FilteredCollectionsResource result = converter.toResource(report);
+        return ControllerUtils.toResponseEntity(HttpStatus.OK, new HttpHeaders(), result);
+    }
+
+    /**
+     * Endpoint for the Filtered Items contents report.
+     * All parameters received as comma-separated lists can also be repeated
+     * instead (e.g., filters=a&filters=b&...).
+     * @param collections comma-separated list UUIDs of collections to include in the report
+     * @param predicates predicates to filter the requested items.
+     * A given predicate has the form
+     * field:operator:value (if value is required by the operator), or
+     * field:operator (if no value is required by the operator).
+     * The colon is used here as a separator to avoid conflicts with the
+     * comma, which is already used by Spring as a multi-value separator.
+     * Predicates are actually retrieved directly through the request to prevent comma-containing
+     * predicate values from being split by the Spring infrastructure.
+     * @param pageNumber page number (starting at 0)
+     * @param pageLimit maximum number of items per page
+     * @param filters querying filters received as a comma-separated string
+     * @param additionalFields comma-separated list of extra fields to add to the report
+     * @param request HTTP request
+     * @param response HTTP response
+     * @param pageable paging parameters
+     * @return the list of items with their respective statistics
+     */
+    @PreAuthorize("hasAuthority('ADMIN')")
+    @GetMapping("/filtereditems")
+    public ResponseEntity<RepresentationModel<?>> getFilteredItems(
+            @RequestParam(name = "collections", required = false) List<String> collections,
+            @RequestParam(name = "queryPredicates", required = false) List<String> predicates,
+            @RequestParam(name = "pageNumber", defaultValue = "0") String pageNumber,
+            @RequestParam(name = "pageLimit", defaultValue = "10") String pageLimit,
+            @RequestParam(name = "filters", required = false) List<String> filters,
+            @RequestParam(name = "additionalFields", required = false) List<String> additionalFields,
+            HttpServletRequest request, HttpServletResponse response, Pageable pageable) throws IOException {
+        if (contentReportService.getEnabled()) {
+            Context context = ContextUtil.obtainContext(request);
+            String[] realPredicates = request.getParameterValues("queryPredicates");
+            List<String> collUuids = Optional.ofNullable(collections).orElseGet(() -> List.of());
+            List<FilteredItemsQueryPredicate> preds = arrayToStream(realPredicates)
+                    .map(FilteredItemsQueryPredicate::of)
+                    .collect(Collectors.toList());
+            int pgLimit = parseInt(pageLimit, 10);
+            int pgNumber = parseInt(pageNumber, 0);
+            Pageable myPageable = pageable;
+            if (pageable == null || pageable.getPageNumber() != pgNumber || pageable.getPageSize() != pgLimit) {
+                Sort sort = Optional.ofNullable(pageable).map(Pageable::getSort).orElse(Sort.unsorted());
+                myPageable = PageRequest.of(pgNumber, pgLimit, sort);
+            }
+            Set<Filter> filtersMap = listToStream(filters)
+                    .map(Filter::get)
+                    .filter(f -> f != null)
+                    .collect(Collectors.toSet());
+            List<String> addFields = Optional.ofNullable(additionalFields).orElseGet(() -> List.of());
+            FilteredItemsQueryRest query = FilteredItemsQueryRest.of(collUuids, preds, pgLimit, filtersMap, addFields);
+
+            return filteredItemsReport(context, query, myPageable);
+        }
+
+        error404(response);
+        return null;
+    }
+
+    private static Stream<String> listToStream(Collection<String> array) {
+        return Optional.ofNullable(array)
+                .stream()
+                .flatMap(Collection::stream)
+                .filter(StringUtils::isNotBlank);
+    }
+
+    private static Stream<String> arrayToStream(String... array) {
+        return Optional.ofNullable(array)
+                .stream()
+                .flatMap(Arrays::stream)
+                .filter(StringUtils::isNotBlank);
+    }
+
+    private static int parseInt(String value, int defaultValue) {
+        return Optional.ofNullable(value)
+                .stream()
+                .mapToInt(Integer::parseInt)
+                .findFirst()
+                .orElse(defaultValue);
+    }
+
+    private ResponseEntity<RepresentationModel<?>> filteredItemsReport(Context context,
+            FilteredItemsQueryRest query, Pageable pageable) {
+        FilteredItemsRest report = contentReportRestRepository
+                .findFilteredItems(context, query, pageable);
+        FilteredItemsResource result = converter.toResource(report);
+        return ControllerUtils.toResponseEntity(HttpStatus.OK, new HttpHeaders(), result);
+    }
+
+    private void error404(HttpServletResponse response) throws IOException {
+        log.debug("Content Reports are disabled");
+        String err = "Content Reports are disabled";
+        response.setStatus(404);
+        response.setContentType("text/html");
+        response.setContentLength(err.length());
+        response.getWriter().write(err);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/CsrfRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CsrfRestController.java
new file mode 100644
index 0000000000..7f94b22cfe
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/CsrfRestController.java
@@ -0,0 +1,62 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.data.rest.webmvc.ControllerUtils;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.web.csrf.CsrfToken;
+import org.springframework.security.web.csrf.CsrfTokenRepository;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Define GET /api/security/csrf endpoint which may be used to obtain a CSRF token from Spring Security.
+ * This is useful to force a CSRF token to be generated prior to a POST/PUT/PATCH request that requires it.
+ * <P>
+ * NOTE: This endpoint should be used sparingly to ensure clients are NOT performing two requests for every modifying
+ * request (e.g. a GET /csrf followed by a POST/PUT/PATCH to another endpoint). Ideally, calling this endpoint is only
+ * necessary BEFORE the first POST/PUT/PATCH (if a CSRF token has not yet been obtained), or in scenarios where the
+ * client must *force* the CSRF token to be reloaded.
+ */
+@RequestMapping(value = "/api/security")
+@RestController
+public class CsrfRestController {
+
+    @Lazy
+    @Autowired
+    CsrfTokenRepository csrfTokenRepository;
+
+    /**
+     * Return the current CSRF token as defined by Spring Security.
+     * Inspired by
+     * https://docs.spring.io/spring-security/reference/5.8/migration/servlet/exploits.html#_i_am_using_a_single_page_application_with_httpsessioncsrftokenrepository
+     * @param request HTTP Request
+     * @param response HTTP response
+     * @param csrfToken injected CsrfToken by Spring Security
+     * @return An empty response with CSRF in header & cookie
+     */
+    @GetMapping("/csrf")
+    @PreAuthorize("permitAll()")
+    public ResponseEntity<RepresentationModel<?>> getCsrf(HttpServletRequest request,
+                                                          HttpServletResponse response,
+                                                          CsrfToken csrfToken) {
+        // Save the CSRF token to our response using the currently enabled CsrfTokenRepository
+        csrfTokenRepository.saveToken(csrfToken, request, response);
+
+        // Return a 204 No Content status
+        return ControllerUtils.toEmptyResponse(HttpStatus.NO_CONTENT);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoverableEndpointsService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoverableEndpointsService.java
index 1853285d71..aa22603387 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoverableEndpointsService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/DiscoverableEndpointsService.java
@@ -84,7 +84,7 @@ public class DiscoverableEndpointsService {
 
     private boolean isLinkValid(Object controller, String href) {
         // FIXME we need to implement a check to be sure that there are no other
-        // controller with an highter precedence mapped on the same URL (this
+        // controller with an higher precedence mapped on the same URL (this
         // could be used to override default implementation)
         return true;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java
index 0729754172..93658848b0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/EntityTypeLabelRestController.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest;
 
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.model.EntityTypeRest;
 import org.dspace.app.rest.model.hateoas.EntityTypeResource;
@@ -40,7 +40,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author Maria Verdonck (Atmire) on 2019-12-13
  */
 @RestController
-@RequestMapping("/api/" + EntityTypeRest.CATEGORY + "/" + EntityTypeRest.NAME_PLURAL)
+@RequestMapping("/api/" + EntityTypeRest.CATEGORY + "/" + EntityTypeRest.PLURAL_NAME)
 public class EntityTypeLabelRestController {
 
     protected final EntityTypeService entityTypeService = ContentServiceFactory.getInstance().getEntityTypeService();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/GroupRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/GroupRestController.java
index 522d69fbe8..4ad2834cbc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/GroupRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/GroupRestController.java
@@ -23,9 +23,9 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.utils.Utils;
@@ -47,7 +47,7 @@ import org.springframework.web.bind.annotation.RestController;
  * This will be the entry point for the api/eperson/groups endpoint with additional paths to it
  */
 @RestController
-@RequestMapping("/api/" + GroupRest.CATEGORY + "/" + GroupRest.GROUPS)
+@RequestMapping("/api/" + GroupRest.CATEGORY + "/" + GroupRest.PLURAL_NAME)
 public class GroupRestController {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/HarvesterMetadataController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/HarvesterMetadataController.java
index dad1a2eb75..a40629cae5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/HarvesterMetadataController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/HarvesterMetadataController.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest;
 
 import java.util.List;
 import java.util.Map;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.link.HalLinkService;
 import org.dspace.app.rest.model.HarvesterMetadataRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemAddBundleController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemAddBundleController.java
index 5175dec5e2..fd40b5cafd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemAddBundleController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemAddBundleController.java
@@ -12,10 +12,10 @@ import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFI
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.converter.MetadataConverter;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestController.java
index b5a0c957f2..db238e1a5c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestController.java
@@ -14,9 +14,9 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
@@ -43,7 +43,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * This controller will handle all the incoming calls on the api/code/items/{uuid}/owningCollection endpoint
+ * This controller will handle all the incoming calls on the api/core/items/{uuid}/owningCollection endpoint
  * where the uuid corresponds to the item of which you want to edit the owning collection.
  */
 @RestController
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemTemplateRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemTemplateRestController.java
index a6dbf3496e..5ebc567e60 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemTemplateRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ItemTemplateRestController.java
@@ -12,9 +12,9 @@ import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFI
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/LDNInboxController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/LDNInboxController.java
new file mode 100644
index 0000000000..f0ccbcf873
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/LDNInboxController.java
@@ -0,0 +1,145 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import java.sql.SQLException;
+import java.util.regex.Pattern;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.validator.routines.UrlValidator;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.LDNRouter;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.InvalidLDNMessageException;
+import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.dspace.web.ContextUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.server.ResponseStatusException;
+
+@Controller
+@RequestMapping("/ldn")
+@ConditionalOnProperty("ldn.enabled")
+public class LDNInboxController {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
+
+    @Autowired
+    private LDNRouter router;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    /**
+     * LDN DSpace inbox.
+     *
+     * @param notification received notification
+     * @return ResponseEntity 400 not stored, 202 stored
+     * @throws Exception
+     */
+    @PostMapping(value = "/inbox", consumes = "application/ld+json")
+    public ResponseEntity<Object> inbox(HttpServletRequest request, @RequestBody Notification notification)
+        throws Exception {
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        validate(context, notification, request.getRemoteAddr());
+
+        LDNMessageEntity ldnMsgEntity = ldnMessageService.create(context, notification, request.getRemoteAddr());
+        log.info("stored ldn message {}", ldnMsgEntity);
+        context.commit();
+
+        return ResponseEntity.accepted()
+            .body(String.format("Successfully stored notification %s %s",
+                notification.getId(), notification.getType()));
+    }
+
+    /**
+     * LDN DSpace inbox options.
+     *
+     * @return ResponseEntity 200 with allow and accept-post headers
+     */
+    @RequestMapping(value = "/inbox", method = RequestMethod.OPTIONS)
+    public ResponseEntity<Void> options() {
+        return ResponseEntity.ok()
+            .allow(HttpMethod.OPTIONS, HttpMethod.POST)
+            .header("Accept-Post", "application/ld+json")
+            .build();
+    }
+
+    /**
+     * @param e
+     * @return ResponseEntity<String>
+     */
+    @ExceptionHandler(ResponseStatusException.class)
+    public ResponseEntity<String> handleResponseStatusException(ResponseStatusException e) {
+        return ResponseEntity.status(e.getStatusCode().value())
+                .body(e.getMessage());
+    }
+
+    private void validate(Context context, Notification notification, String sourceIp) {
+        String id = notification.getId();
+        Pattern URNRegex =
+            Pattern.compile("^urn:uuid:[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
+
+        if (!URNRegex.matcher(id).matches() && !new UrlValidator().isValid(id)) {
+            throw new InvalidLDNMessageException("Invalid URI format for 'id' field.");
+        }
+
+        if (notification.getOrigin() == null || notification.getTarget() == null || notification.getObject() == null) {
+            throw new InvalidLDNMessageException("Origin or Target or Object is missing");
+        }
+
+        if (configurationService.getBooleanProperty("ldn.notify.inbox.block-untrusted", true)) {
+            try {
+                NotifyServiceEntity originNotifyService =
+                    ldnMessageService.findNotifyService(context, notification.getOrigin());
+                if (originNotifyService == null) {
+                    throw new DSpaceBadRequestException("Notify Service [" + notification.getOrigin()
+                        + "] unknown. LDN message can not be received.");
+                }
+            } catch (SQLException sqle) {
+                throw new DSpaceBadRequestException("Notify Service [" + notification.getOrigin()
+                + "] unknown. LDN message can not be received.");
+            }
+        }
+        if (configurationService.getBooleanProperty("ldn.notify.inbox.block-untrusted-ip", true)) {
+            try {
+                NotifyServiceEntity originNotifyService =
+                    ldnMessageService.findNotifyService(context, notification.getOrigin());
+                if (originNotifyService == null) {
+                    throw new DSpaceBadRequestException("Notify Service [" + notification.getOrigin()
+                        + "] unknown. LDN message can not be received.");
+                }
+                boolean isValidIp = ldnMessageService.isValidIp(originNotifyService, sourceIp);
+                if (!isValidIp) {
+                    throw new DSpaceBadRequestException("Source IP for Incoming LDN Message [" + notification.getId()
+                        + "] out of its Notify Service IP Range. LDN message can not be received.");
+                }
+            } catch (SQLException sqle) {
+                throw new DSpaceBadRequestException("Notify Service [" + notification.getOrigin()
+                + "] unknown. LDN message can not be received.");
+            }
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/LDNMessageRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/LDNMessageRestController.java
new file mode 100644
index 0000000000..92335cb5cc
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/LDNMessageRestController.java
@@ -0,0 +1,94 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_URN_UUID;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.converter.ConverterService;
+import org.dspace.app.rest.model.LDNMessageEntityRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.hateoas.Link;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * Rest Controller for requesting the reprocessing of LDNMessageEntity
+ *
+ * @author Stefano Maffei (stefano.maffei at 4science.com)
+ */
+@RestController
+@RequestMapping("/api/" + LDNMessageEntityRest.CATEGORY + "/"
+    + LDNMessageEntityRest.NAME_PLURALS + REGEX_REQUESTMAPPING_IDENTIFIER_AS_URN_UUID + "/enqueueretry")
+public class LDNMessageRestController implements InitializingBean {
+
+    private static final Logger log = LogManager.getLogger(LDNMessageRestController.class);
+
+    @Autowired
+    private ConverterService converterService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Autowired
+    private Utils utils;
+
+    @Autowired
+    private DiscoverableEndpointsService discoverableEndpointsService;
+
+    @Override
+    public void afterPropertiesSet() {
+        discoverableEndpointsService.register(this,
+            List.of(Link.of("/api/" + LDNMessageEntityRest.CATEGORY + "/"
+                + LDNMessageEntityRest.NAME_PLURALS + "/{id}/enqueueretry",
+                "enqueueretry")));
+    }
+
+    @PostMapping(produces = "application/json")
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public ResponseEntity<String> findByItem(@PathVariable("id") String id)
+        throws SQLException, AuthorizeException, JsonProcessingException {
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        LDNMessageEntity ldnMessageEntity = ldnMessageService.find(context, id);
+        if (ldnMessageEntity == null) {
+            throw new ResourceNotFoundException("No such item: " + id);
+        }
+        ldnMessageEntity.setQueueStatus(LDNMessageEntity.QUEUE_STATUS_QUEUED_FOR_RETRY);
+        ldnMessageService.update(context, ldnMessageEntity);
+
+        LDNMessageEntityRest resultRequestStatusRests = converterService.toRest(
+            ldnMessageEntity, utils.obtainProjection());
+
+        context.complete();
+        String result = new ObjectMapper()
+            .writerWithDefaultPrettyPrinter().writeValueAsString(resultRequestStatusRests);
+
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/MappedCollectionRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/MappedCollectionRestController.java
index 14dae21ebe..6f886096bd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/MappedCollectionRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/MappedCollectionRestController.java
@@ -14,9 +14,9 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.MethodNotAllowedException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/NotifyRequestStatusRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/NotifyRequestStatusRestController.java
new file mode 100644
index 0000000000..0c599b03e8
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/NotifyRequestStatusRestController.java
@@ -0,0 +1,107 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.ldn.model.NotifyRequestStatus;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.converter.ConverterService;
+import org.dspace.app.rest.model.NotifyRequestStatusRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.hateoas.Link;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * Rest Controller for NotifyRequestStatus targeting items
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+@RestController
+@RequestMapping("/api/" + NotifyRequestStatusRest.CATEGORY + "/" + NotifyRequestStatusRest.PLURAL_NAME +
+    REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID)
+public class NotifyRequestStatusRestController implements InitializingBean {
+
+    private static final Logger log = LogManager.getLogger(NotifyRequestStatusRestController.class);
+
+    @Autowired
+    private ConverterService converterService;
+
+    @Autowired
+    private Utils utils;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    @Autowired
+    private DiscoverableEndpointsService discoverableEndpointsService;
+
+    @Override
+    public void afterPropertiesSet() {
+        discoverableEndpointsService.register(this,
+            List.of(Link.of("/api/" + NotifyRequestStatusRest.CATEGORY + "/" + NotifyRequestStatusRest.NAME,
+                NotifyRequestStatusRest.NAME)));
+    }
+
+    @GetMapping(produces = "application/json")
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public ResponseEntity<String> findByItem(@PathVariable UUID uuid)
+        throws SQLException, AuthorizeException, JsonProcessingException {
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        Item item = itemService.find(context, uuid);
+        if (item == null) {
+            throw new ResourceNotFoundException("No such item: " + uuid);
+        }
+        EPerson currentUser = context.getCurrentUser();
+        if (!currentUser.equals(item.getSubmitter()) && !authorizeService.isAdmin(context)) {
+            throw new AuthorizeException("User unauthorized");
+        }
+        NotifyRequestStatus resultRequests = ldnMessageService.findRequestsByItem(context, item);
+        NotifyRequestStatusRest resultRequestStatusRests = converterService.toRest(
+            resultRequests, utils.obtainProjection());
+
+        context.complete();
+        String result = new ObjectMapper()
+            .writerWithDefaultPrettyPrinter().writeValueAsString(resultRequestStatusRests);
+
+        return new ResponseEntity<>(result, HttpStatus.OK);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java
index db04b3b7cd..eaba79d1a8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OidcRestController.java
@@ -10,15 +10,15 @@ package org.dspace.app.rest;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.AuthnRest;
 import org.dspace.core.Utils;
 import org.dspace.services.ConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.hateoas.Link;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Rest controller that handles redirect after OIDC authentication succeded.
+ * Rest controller that handles redirect after OIDC authentication succeeded.
  *
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  */
@@ -35,7 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping(value = "/api/" + AuthnRest.CATEGORY + "/oidc")
 public class OidcRestController {
 
-    private static final Logger log = LoggerFactory.getLogger(OidcRestController.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private ConfigurationService configurationService;
@@ -66,11 +66,12 @@ public class OidcRestController {
         }
 
         if (StringUtils.equalsAnyIgnoreCase(redirectHostName, allowedHostNames.toArray(new String[0]))) {
-            log.debug("OIDC redirecting to " + redirectUrl);
+            log.debug("OIDC redirecting to {}", redirectUrl);
             response.sendRedirect(redirectUrl); // lgtm [java/unvalidated-url-redirection]
         } else {
-            log.error("Invalid OIDC redirectURL=" + redirectUrl +
-                          ". URL doesn't match hostname of server or UI!");
+            log.error("Invalid OIDC redirectURL={}."
+                    + " URL doesn't match hostname of server or UI!",
+                    redirectUrl);
             response.sendError(HttpServletResponse.SC_BAD_REQUEST,
                                "Invalid redirectURL! Must match server or ui hostname.");
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
index fef6269e3e..baf45c14b6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/OpenSearchController.java
@@ -12,15 +12,15 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.rest.utils.ScopeResolver;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/PrimaryBitstreamController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/PrimaryBitstreamController.java
index c236954dab..d978752b7d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/PrimaryBitstreamController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/PrimaryBitstreamController.java
@@ -12,8 +12,8 @@ import static org.dspace.core.Constants.BITSTREAM;
 
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BundleRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/QAEventRelatedRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/QAEventRelatedRestController.java
new file mode 100644
index 0000000000..b3afdf7945
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/QAEventRelatedRestController.java
@@ -0,0 +1,142 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_STRING_VERSION_STRONG;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.UUID;
+
+import org.dspace.app.rest.converter.ConverterService;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.model.hateoas.ItemResource;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.rest.webmvc.ControllerUtils;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.hateoas.RepresentationModel;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * This RestController will take care to manipulate the related item eventually
+ * associated with a qa event
+ * "/api/integration/qualityassuranceevents/{qaeventid}/related"
+ */
+@RestController
+@RequestMapping("/api/" + QAEventRest.CATEGORY + "/" + QAEventRest.PLURAL_NAME
+    + REGEX_REQUESTMAPPING_IDENTIFIER_AS_STRING_VERSION_STRONG + "/" + QAEventRest.RELATED)
+public class QAEventRelatedRestController {
+
+    @Autowired
+    protected Utils utils;
+
+    @Autowired
+    private ConverterService converterService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    /**
+     * This method associate an item to a qa event
+     * 
+     * @param qaeventId       The qa event id
+     * @param relatedItemUUID The uuid of the related item to associate with the qa event
+     * @return The related item
+     * @throws SQLException       If something goes wrong
+     * @throws AuthorizeException If something goes wrong
+     */
+    @PostMapping
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public ResponseEntity<RepresentationModel<?>> addRelatedItem(@PathVariable(name = "id") String qaeventId,
+        @RequestParam(name = "item") UUID relatedItemUUID) throws SQLException, AuthorizeException {
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        QAEvent qaevent = qaEventService.findEventByEventId(qaeventId);
+        if (qaevent == null) {
+            throw new ResourceNotFoundException("No such qa event: " + qaeventId);
+        }
+
+        if (!qaEventService.isRelatedItemSupported(qaevent)) {
+            throw new UnprocessableEntityException("The given event does not supports a related item");
+        }
+
+        if (qaevent.getRelated() != null) {
+            throw new UnprocessableEntityException("The given event already has a related item");
+        }
+
+        Item relatedItem = itemService.find(context, relatedItemUUID);
+        if (relatedItem == null) {
+            throw new UnprocessableEntityException("The proposed related item was not found");
+        }
+
+        qaevent.setRelated(relatedItemUUID.toString());
+        qaEventService.store(context, qaevent);
+
+        ItemRest relatedItemRest = converterService.toRest(relatedItem, utils.obtainProjection());
+        ItemResource itemResource = converterService.toResource(relatedItemRest);
+
+        context.complete();
+
+        return ControllerUtils.toResponseEntity(HttpStatus.CREATED, new HttpHeaders(), itemResource);
+    }
+
+    /**
+     * This method remove the association to a related item from a qa event
+     * 
+     * @param qaeventId       The qa event id
+     * @return The related item
+     * @throws SQLException       If something goes wrong
+     * @throws AuthorizeException If something goes wrong
+     */
+    @DeleteMapping
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public ResponseEntity<RepresentationModel<?>> removeRelatedItem(@PathVariable(name = "id") String qaeventId)
+        throws SQLException, AuthorizeException, IOException {
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        QAEvent qaevent = qaEventService.findEventByEventId(qaeventId);
+
+        if (qaevent == null) {
+            throw new ResourceNotFoundException("No such qa event: " + qaeventId);
+        }
+
+        if (!qaEventService.isRelatedItemSupported(qaevent)) {
+            throw new UnprocessableEntityException("The given event does not supports a related item");
+        }
+
+        if (qaevent.getRelated() != null) {
+            qaevent.setRelated(null);
+            qaEventService.store(context, qaevent);
+            context.complete();
+        }
+
+        return ControllerUtils.toEmptyResponse(HttpStatus.NO_CONTENT);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RelationshipRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RelationshipRestController.java
index 4959d5ac75..b9c940f1c1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RelationshipRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RelationshipRestController.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest;
 import static org.dspace.app.rest.utils.RegexUtils.REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT;
 
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.model.RelationshipRest;
 import org.dspace.app.rest.repository.RelationshipRestRepository;
 import org.dspace.app.rest.utils.ContextUtil;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java
index e772aa0abe..3311f303ad 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyEPersonReplaceRestController.java
@@ -15,9 +15,9 @@ import static org.springframework.web.bind.annotation.RequestMethod.PUT;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.utils.Utils;
 import org.dspace.authorize.AuthorizeException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java
index e9ba0dff44..2a041aba3a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/ResourcePolicyGroupReplaceRestController.java
@@ -15,9 +15,9 @@ import static org.springframework.web.bind.annotation.RequestMethod.PUT;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.utils.Utils;
 import org.dspace.authorize.AuthorizeException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java
index b82b483075..772096e705 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RestResourceController.java
@@ -23,15 +23,14 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.converter.JsonPatchConverter;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
@@ -56,6 +55,7 @@ import org.dspace.app.rest.utils.RestRepositoryUtils;
 import org.dspace.app.rest.utils.Utils;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.util.UUIDUtils;
+import org.springframework.aop.AopInvocationException;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -126,7 +126,7 @@ public class RestResourceController implements InitializingBean {
             // see https://github.com/spring-projects/spring-hateoas/issues/408
             // Link l = linkTo(this.getClass(), r).withRel(r);
             String[] split = r.split("\\.", 2);
-            String plural = English.plural(split[1]);
+            String plural = split[1];
             Link l = Link.of("/api/" + split[0] + "/" + plural, plural);
             links.add(l);
             log.debug(l.getRel().value() + " " + l.getHref());
@@ -220,8 +220,10 @@ public class RestResourceController implements InitializingBean {
         Optional<RestAddressableModel> modelObject = Optional.empty();
         try {
             modelObject = repository.findById(id);
-        } catch (ClassCastException e) {
-            // ignore, as handled below
+        } catch (ClassCastException | IllegalArgumentException | AopInvocationException e) {
+            // These exceptions may be thrown if the "id" param above is not valid for DSpaceRestRepository.findById()
+            // (e.g. passing an Integer param when a UUID is expected, or similar).
+            // We can safely ignore these exceptions as they simply mean the object was not found (see below).
         }
         if (!modelObject.isPresent()) {
             throw new ResourceNotFoundException(apiCategory + "." + model + " with id: " + id + " not found");
@@ -371,7 +373,8 @@ public class RestResourceController implements InitializingBean {
      * @return              The relevant ResponseEntity for this request
      * @throws HttpRequestMethodNotSupportedException   If something goes wrong
      */
-    @RequestMapping(method = RequestMethod.POST, consumes = {"application/json", "application/hal+json"})
+    @RequestMapping(method = RequestMethod.POST, value = {"", "/"},
+                    consumes = {"application/json", "application/hal+json"})
     public ResponseEntity<RepresentationModel<?>> post(HttpServletRequest request,
                                                        @PathVariable String apiCategory,
                                                        @PathVariable String model,
@@ -398,7 +401,7 @@ public class RestResourceController implements InitializingBean {
      * @return              The relevant ResponseEntity for this request
      * @throws HttpRequestMethodNotSupportedException   If something goes wrong
      */
-    @RequestMapping(method = RequestMethod.POST, consumes = {"text/uri-list"})
+    @RequestMapping(method = RequestMethod.POST, value = {"", "/"}, consumes = {"text/uri-list"})
     public ResponseEntity<RepresentationModel<?>> postWithUriListContentType(HttpServletRequest request,
                                                                              @PathVariable String apiCategory,
                                                                              @PathVariable String model)
@@ -572,6 +575,37 @@ public class RestResourceController implements InitializingBean {
         return uploadInternal(request, apiCategory, model, uuid, uploadfile);
     }
 
+    /**
+     * Called in POST, multipart, upload to a specific rest resource the file passed as "file" request parameter
+     *
+     * Note that the regular expression in the request mapping accept a String as identifier;
+     *
+     * @param request
+     *            the http request
+     * @param apiCategory
+     *            the api category
+     * @param model
+     *            the rest model that identify the REST resource collection
+     * @param id
+     *            the id of the specific rest resource
+     * @param uploadfile
+     *            the file to upload
+     * @return the created resource
+     * @throws HttpRequestMethodNotSupportedException
+     */
+    @RequestMapping(method = RequestMethod.POST,
+            value = REGEX_REQUESTMAPPING_IDENTIFIER_AS_STRING_VERSION_STRONG,
+            headers = "content-type=multipart/form-data")
+    public <ID extends Serializable> ResponseEntity<RepresentationModel<?>> upload(HttpServletRequest request,
+                                                                                   @PathVariable String apiCategory,
+                                                                                   @PathVariable String model,
+                                                                                   @PathVariable String id,
+                                                                                   @RequestParam("file") MultipartFile
+                                                                                uploadfile)
+        throws HttpRequestMethodNotSupportedException {
+        return uploadInternal(request, apiCategory, model, id, uploadfile);
+    }
+
     /**
      * Internal upload method.
      *
@@ -620,7 +654,7 @@ public class RestResourceController implements InitializingBean {
      * @throws IOException
      * @throws AuthorizeException
      */
-    @RequestMapping(method = { RequestMethod.POST }, headers = "content-type=multipart/form-data")
+    @RequestMapping(method = { RequestMethod.POST }, value = {"", "/"}, headers = "content-type=multipart/form-data")
     public <T extends RestAddressableModel> ResponseEntity<RepresentationModel<?>> upload(
             HttpServletRequest request,
             @PathVariable String apiCategory,
@@ -684,6 +718,28 @@ public class RestResourceController implements InitializingBean {
         return patchInternal(request, apiCategory, model, id, jsonNode);
     }
 
+    /**
+     * PATCH method, using operation on the resources following (JSON) Patch notation (https://tools.ietf
+     * .org/html/rfc6902)
+     *
+     * Note that the regular expression in the request mapping accept a UUID as identifier;
+     *
+     * @param request
+     * @param apiCategory
+     * @param model
+     * @param id
+     * @param jsonNode
+     * @return
+     * @throws HttpRequestMethodNotSupportedException
+     */
+    @RequestMapping(method = RequestMethod.PATCH, value = REGEX_REQUESTMAPPING_IDENTIFIER_AS_STRING_VERSION_STRONG)
+    public ResponseEntity<RepresentationModel<?>> patch(HttpServletRequest request, @PathVariable String apiCategory,
+                                                        @PathVariable String model,
+                                                        @PathVariable String id,
+                                                        @RequestBody(required = true) JsonNode jsonNode) {
+        return patchInternal(request, apiCategory, model, id, jsonNode);
+    }
+
     /**
      * Internal patch method
      *
@@ -711,9 +767,13 @@ public class RestResourceController implements InitializingBean {
             log.error(e.getMessage(), e);
             throw e;
         }
-        DSpaceResource result = converter.toResource(modelObject);
-        //TODO manage HTTPHeader
-        return ControllerUtils.toResponseEntity(HttpStatus.OK, new HttpHeaders(), result);
+        if (modelObject != null) {
+            DSpaceResource result = converter.toResource(modelObject);
+            //TODO manage HTTPHeader
+            return ControllerUtils.toResponseEntity(HttpStatus.OK, new HttpHeaders(), result);
+        } else {
+            return ControllerUtils.toEmptyResponse(HttpStatus.NO_CONTENT);
+        }
 
     }
 
@@ -891,7 +951,7 @@ public class RestResourceController implements InitializingBean {
             int start = Math.toIntExact(page.getOffset());
             int end = (start + page.getPageSize()) > fullList.size() ? fullList.size() : (start + page.getPageSize());
             DSpaceRestRepository<RestAddressableModel, ?> resourceRepository = utils
-                .getResourceRepository(fullList.get(0).getCategory(), fullList.get(0).getType());
+                .getResourceRepository(fullList.get(0).getCategory(), fullList.get(0).getTypePlural());
             PageImpl<RestAddressableModel> pageResult = new PageImpl(fullList.subList(start, end), page,
                                                                      fullList.size());
             return assembler.toModel(pageResult.map(converter::toResource));
@@ -905,7 +965,8 @@ public class RestResourceController implements InitializingBean {
     }
 
     /**
-     * Find all
+     * Find all via a GET request to the root endpoint. This method will trigger in cases where the called endpoint
+     * either includes a trailing slash or not.
      *
      * @param apiCategory
      * @param model
@@ -913,7 +974,7 @@ public class RestResourceController implements InitializingBean {
      * @param assembler
      * @return
      */
-    @RequestMapping(method = RequestMethod.GET)
+    @RequestMapping(method = RequestMethod.GET, value = {"", "/"})
     @SuppressWarnings("unchecked")
     public <T extends RestAddressableModel> PagedModel<DSpaceResource<T>> findAll(@PathVariable String apiCategory,
             @PathVariable String model, Pageable page, PagedResourcesAssembler assembler, HttpServletResponse response,
@@ -1036,6 +1097,17 @@ public class RestResourceController implements InitializingBean {
         return uriComponentsBuilder.encode().build().toString();
     }
 
+    /**
+     * Method to delete an entity by ID
+     * Note that the regular expression in the request mapping accept a number as identifier;
+     *
+     * @param request
+     * @param apiCategory
+     * @param model
+     * @param id
+     * @return
+     * @throws HttpRequestMethodNotSupportedException
+     */
     @RequestMapping(method = RequestMethod.DELETE, value = REGEX_REQUESTMAPPING_IDENTIFIER_AS_DIGIT)
     public ResponseEntity<RepresentationModel<?>> delete(HttpServletRequest request, @PathVariable String apiCategory,
                                                          @PathVariable String model, @PathVariable Integer id)
@@ -1050,6 +1122,13 @@ public class RestResourceController implements InitializingBean {
         return deleteInternal(apiCategory, model, uuid);
     }
 
+    @RequestMapping(method = RequestMethod.DELETE, value = REGEX_REQUESTMAPPING_IDENTIFIER_AS_STRING_VERSION_STRONG)
+    public ResponseEntity<RepresentationModel<?>> delete(HttpServletRequest request, @PathVariable String apiCategory,
+                                                         @PathVariable String model, @PathVariable String id)
+        throws HttpRequestMethodNotSupportedException {
+        return deleteInternal(apiCategory, model, id);
+    }
+
     /**
      * Internal method to delete resource.
      *
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RootRestResourceController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RootRestResourceController.java
index 7cb1854af8..d6ed84c3d6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/RootRestResourceController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/RootRestResourceController.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.link.HalLinkService;
 import org.dspace.app.rest.model.hateoas.RootResource;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/SitemapRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/SitemapRestController.java
index efc79f2a39..95d0ba7729 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/SitemapRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/SitemapRestController.java
@@ -13,9 +13,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.catalina.connector.ClientAbortException;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java
index c32d551cbe..6daac9be8c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/SubmissionCCLicenseUrlRepository.java
@@ -10,8 +10,8 @@ package org.dspace.app.rest;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletRequest;
 
+import jakarta.servlet.ServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
  * It only supports a search method
  */
 
-@Component(SubmissionCCLicenseUrlRest.CATEGORY + "." + SubmissionCCLicenseUrlRest.NAME)
+@Component(SubmissionCCLicenseUrlRest.CATEGORY + "." + SubmissionCCLicenseUrlRest.PLURAL_NAME)
 public class SubmissionCCLicenseUrlRepository extends DSpaceRestRepository<SubmissionCCLicenseUrlRest, String>
                                               implements InitializingBean {
 
@@ -133,8 +133,8 @@ public class SubmissionCCLicenseUrlRepository extends DSpaceRestRepository<Submi
     public void afterPropertiesSet() {
         discoverableEndpointsService.register(this, Arrays.asList(
                 Link.of("/api/" + SubmissionCCLicenseUrlRest.CATEGORY + "/" +
-                        SubmissionCCLicenseUrlRest.PLURAL + "/search",
-                        SubmissionCCLicenseUrlRest.PLURAL + "-search")));
+                        SubmissionCCLicenseUrlRest.PLURAL_NAME + "/search",
+                        SubmissionCCLicenseUrlRest.PLURAL_NAME + "-search")));
     }
 
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java
index 40c0a79b97..8a35794aa1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/UUIDLookupRestController.java
@@ -14,9 +14,9 @@ import java.net.URI;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.converter.ConverterService;
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 84%
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 07b802b684..4c835d9918 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
@@ -10,28 +10,24 @@ package org.dspace.app.rest;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.Filter;
 
+import jakarta.servlet.Filter;
+import org.dspace.app.ldn.LDNQueueExtractor;
+import org.dspace.app.ldn.LDNQueueTimeoutChecker;
 import org.dspace.app.rest.filter.DSpaceRequestContextFilter;
 import org.dspace.app.rest.model.hateoas.DSpaceLinkRelationProvider;
 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;
 import org.dspace.google.GoogleAsyncEventListener;
 import org.dspace.utils.servlet.DSpaceWebappServletFilter;
-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;
@@ -46,24 +42,16 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
 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)
  */
-@SpringBootApplication
 @EnableScheduling
 @EnableCaching
-public class Application extends SpringBootServletInitializer {
-
-    private static final Logger log = LoggerFactory.getLogger(Application.class);
+@Configuration
+public class WebApplication {
 
     @Autowired
     private ApplicationConfig configuration;
@@ -76,6 +64,22 @@ public class Application extends SpringBootServletInitializer {
         GenerateSitemaps.generateSitemapsScheduled();
     }
 
+    @Scheduled(cron = "${ldn.queue.extractor.cron:-}")
+    public void ldnExtractFromQueue() throws IOException, SQLException {
+        if (!configuration.getLdnEnabled()) {
+            return;
+        }
+        LDNQueueExtractor.extractMessageFromQueue();
+    }
+
+    @Scheduled(cron = "${ldn.queue.timeout.checker.cron:-}")
+    public void ldnQueueTimeoutCheck() throws IOException, SQLException {
+        if (!configuration.getLdnEnabled()) {
+            return;
+        }
+        LDNQueueTimeoutChecker.checkQueueMessageTimeout();
+    }
+
     @Scheduled(cron = "${solr-database-resync.cron:-}")
     public void solrDatabaseResync() throws Exception {
         SolrDatabaseResyncCli.runScheduled();
@@ -86,26 +90,6 @@ public class Application extends SpringBootServletInitializer {
         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.
@@ -253,7 +237,7 @@ public class Application extends SpringBootServletInitializer {
                 // Make all other Webjars available off the /webjars path
                 registry
                     .addResourceHandler("/webjars/**")
-                    .addResourceLocations("/webjars/");
+                    .addResourceLocations("/webjars/", "classpath:/META-INF/resources/webjars/");
             }
 
             @Override
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionCollectionsLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionCollectionsLinkRepository.java
index fd1192e0bb..549a5ec78e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionCollectionsLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionCollectionsLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.WorkflowDefinitionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Maria Verdonck (Atmire) on 11/12/2019
  */
-@Component(WorkflowDefinitionRest.CATEGORY + "." + WorkflowDefinitionRest.NAME + "."
+@Component(WorkflowDefinitionRest.CATEGORY + "." + WorkflowDefinitionRest.PLURAL_NAME + "."
     + WorkflowDefinitionRest.COLLECTIONS_MAPPED_TO)
 public class WorkflowDefinitionCollectionsLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionStepsLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionStepsLinkRepository.java
index 24c82ee460..91cb0cffc0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionStepsLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowDefinitionStepsLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest;
 
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.WorkflowDefinitionRest;
 import org.dspace.app.rest.model.WorkflowStepRest;
 import org.dspace.app.rest.projection.Projection;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Maria Verdonck (Atmire) on 24/02/2020
  */
-@Component(WorkflowDefinitionRest.CATEGORY + "." + WorkflowDefinitionRest.NAME + "."
+@Component(WorkflowDefinitionRest.CATEGORY + "." + WorkflowDefinitionRest.PLURAL_NAME + "."
     + WorkflowDefinitionRest.STEPS)
 public class WorkflowDefinitionStepsLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowStepActionsLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowStepActionsLinkRepository.java
index f2b6a423f8..0740d318a0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowStepActionsLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/WorkflowStepActionsLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest;
 
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.WorkflowActionRest;
 import org.dspace.app.rest.model.WorkflowStepRest;
 import org.dspace.app.rest.projection.Projection;
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Maria Verdonck (Atmire) on 24/02/2020
  */
-@Component(WorkflowStepRest.CATEGORY + "." + WorkflowStepRest.NAME + "."
+@Component(WorkflowStepRest.CATEGORY + "." + WorkflowStepRest.PLURAL_NAME + "."
     + WorkflowStepRest.ACTIONS)
 public class WorkflowStepActionsLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/AuthorizationRestUtil.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/AuthorizationRestUtil.java
index c8a9d2435b..d2cf2fe364 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/AuthorizationRestUtil.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/AuthorizationRestUtil.java
@@ -12,6 +12,7 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.model.BaseObjectRest;
 import org.dspace.app.rest.repository.DSpaceRestRepository;
 import org.dspace.app.rest.repository.ReloadableEntityObjectRepository;
@@ -66,7 +67,8 @@ public class AuthorizationRestUtil {
         String[] objType;
         try {
             objType = parts[2].split("\\.");
-            DSpaceRestRepository repository = utils.getResourceRepositoryByCategoryAndModel(objType[0], objType[1]);
+            DSpaceRestRepository repository = utils
+                .getResourceRepositoryByCategoryAndModel(objType[0], English.plural(objType[1]));
             Serializable pk = utils.castToPKClass((ReloadableEntityObjectRepository) repository, objIdStr);
             try {
                 // disable the security as we only need to retrieve the object to further process the authorization
@@ -141,7 +143,7 @@ public class AuthorizationRestUtil {
             objId = idParts[2];
         } else {
             throw new IllegalArgumentException(
-                    "the authoization id is invalid, it must have the form " +
+                    "the authorization id is invalid, it must have the form " +
                     "[eperson-uuid_]feature-id_object-type_object-id");
         }
         return new String[] { eperson, feature, objType, objId };
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
index 9642bb4a2d..aed82ba866 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanClaimItemFeature.java
@@ -11,6 +11,8 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
 import org.dspace.app.rest.model.BaseObjectRest;
@@ -22,8 +24,6 @@ import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.profile.service.ResearcherProfileService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -43,7 +43,7 @@ public class CanClaimItemFeature implements AuthorizationFeature {
 
     public static final String NAME = "canClaimItem";
 
-    private static final Logger LOG = LoggerFactory.getLogger(CanClaimItemFeature.class);
+    private static final Logger LOG = LogManager.getLogger();
 
     @Autowired
     private ItemService itemService;
@@ -72,7 +72,8 @@ public class CanClaimItemFeature implements AuthorizationFeature {
         try {
             return researcherProfileService.findById(context, context.getCurrentUser().getID()) == null;
         } catch (SQLException | AuthorizeException e) {
-            LOG.warn("Error while checking if eperson has a ResearcherProfileAssociated: {}", e.getMessage(), e);
+            LOG.warn("Error while checking if eperson has a ResearcherProfileAssociated: {}",
+                    e.getMessage(), e);
             return false;
         }
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java
index c20668fcc5..15438a5e9a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CanDeleteVersionFeature.java
@@ -15,7 +15,6 @@ import org.dspace.app.rest.model.BaseObjectRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.projection.DefaultProjection;
-import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.versioning.Version;
@@ -34,8 +33,6 @@ import org.springframework.stereotype.Component;
     description = "It can be used to verify if the user can delete a version of an Item")
 public class CanDeleteVersionFeature extends DeleteFeature {
 
-    @Autowired
-    private ItemService itemService;
     @Autowired
     private ItemConverter itemConverter;
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CoarNotifyEnabled.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CoarNotifyEnabled.java
new file mode 100644
index 0000000000..5ef8410e08
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/CoarNotifyEnabled.java
@@ -0,0 +1,42 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.authorization.impl;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.authorization.AuthorizationFeature;
+import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
+import org.dspace.app.rest.model.BaseObjectRest;
+import org.dspace.app.rest.model.SiteRest;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+@AuthorizationFeatureDocumentation(name = CoarNotifyEnabled.NAME,
+        description = "It can be used to verify if the user can see the coar notify protocol is enabled")
+public class CoarNotifyEnabled implements AuthorizationFeature {
+
+    public final static String NAME = "coarNotifyEnabled";
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public boolean isAuthorized(Context context, BaseObjectRest object) throws SQLException, SearchServiceException {
+        return configurationService.getBooleanProperty("ldn.enabled", true);
+    }
+
+    @Override
+    public String[] getSupportedTypes() {
+        return new String[]{ SiteRest.CATEGORY + "." + SiteRest.NAME };
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/EPersonForgotPasswordFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/EPersonForgotPasswordFeature.java
new file mode 100644
index 0000000000..c6e6b55526
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/EPersonForgotPasswordFeature.java
@@ -0,0 +1,58 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.authorization.impl;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.authorization.AuthorizationFeature;
+import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
+import org.dspace.app.rest.model.BaseObjectRest;
+import org.dspace.app.rest.model.EPersonRest;
+import org.dspace.app.rest.model.SiteRest;
+import org.dspace.app.util.AuthorizeUtil;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Component;
+
+/**
+ * Checks if the user provided is allowed to request a password reset.
+ * If none user specified, checks if the current context is allowed to set the password.
+ *
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ **/
+@Component
+@AuthorizationFeatureDocumentation(name = EPersonForgotPasswordFeature.NAME,
+    description = "It can be used to check password reset for an eperson")
+public class EPersonForgotPasswordFeature implements AuthorizationFeature {
+
+    public static final String NAME = "epersonForgotPassword";
+
+    @Override
+    public boolean isAuthorized(Context context, BaseObjectRest object) throws SQLException {
+        boolean isEperson = object instanceof EPersonRest;
+        boolean isSite = object instanceof SiteRest;
+        if (!isEperson && !isSite) {
+            return false;
+        }
+        if (!AuthorizeUtil.authorizeForgotPassword()) {
+            return false;
+        }
+        if (isEperson) {
+            return AuthorizeUtil.authorizeUpdatePassword(context, ((EPersonRest) object).getEmail());
+        }
+        return true;
+    }
+
+    @Override
+    public String[] getSupportedTypes() {
+        return new String[] {
+            SiteRest.CATEGORY + "." + SiteRest.NAME,
+            EPersonRest.CATEGORY + "." + EPersonRest.NAME
+        };
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/QAAuthorizationFeature.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/QAAuthorizationFeature.java
new file mode 100644
index 0000000000..332c7a5989
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/authorization/impl/QAAuthorizationFeature.java
@@ -0,0 +1,46 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.authorization.impl;
+
+import java.sql.SQLException;
+
+import org.dspace.app.rest.authorization.AuthorizationFeature;
+import org.dspace.app.rest.authorization.AuthorizationFeatureDocumentation;
+import org.dspace.app.rest.model.BaseObjectRest;
+import org.dspace.app.rest.model.SiteRest;
+import org.dspace.core.Context;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * The QA Event feature. It can be used to verify if Quality Assurance can be seen.
+ *
+ * Authorization is granted if the current user has READ permissions on the given bitstream.
+ */
+@Component
+@AuthorizationFeatureDocumentation(name = QAAuthorizationFeature.NAME,
+        description = "It can be used to verify if the user can manage Quality Assurance events")
+public class QAAuthorizationFeature implements AuthorizationFeature {
+    public final static String NAME = "canSeeQA";
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Override
+    public boolean isAuthorized(Context context, BaseObjectRest object) throws SQLException {
+        return configurationService.getBooleanProperty("qaevents.enabled", false);
+    }
+
+    @Override
+    public String[] getSupportedTypes() {
+        return new String[]{
+            SiteRest.CATEGORY + "." + SiteRest.NAME
+        };
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java
index ad78fe2db4..08a7e9aec8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/configuration/ActuatorConfiguration.java
@@ -14,6 +14,7 @@ import java.util.Arrays;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.dspace.app.rest.DiscoverableEndpointsService;
 import org.dspace.app.rest.health.GeoIpHealthIndicator;
+import org.dspace.app.rest.health.SolrHealthIndicator;
 import org.dspace.authority.AuthoritySolrServiceImpl;
 import org.dspace.discovery.SolrSearchCore;
 import org.dspace.statistics.SolrStatisticsCore;
@@ -22,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
 import org.springframework.boot.actuate.health.Status;
-import org.springframework.boot.actuate.solr.SolrHealthIndicator;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.annotation.Bean;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java
index e837904951..abb79d5798 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ConverterService.java
@@ -16,9 +16,9 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import javax.annotation.Nullable;
-import javax.annotation.PostConstruct;
 
+import jakarta.annotation.Nullable;
+import jakarta.annotation.PostConstruct;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -151,7 +151,7 @@ public class ConverterService {
     private Annotation getAnnotationForRestObject(BaseObjectRest restObject) {
         BaseObjectRest baseObjectRest = restObject;
         DSpaceRestRepository repositoryToUse = utils
-            .getResourceRepositoryByCategoryAndModel(baseObjectRest.getCategory(), baseObjectRest.getType());
+            .getResourceRepositoryByCategoryAndModel(baseObjectRest.getCategory(), baseObjectRest.getTypePlural());
         Annotation preAuthorize = null;
         int maxDepth = 0;
         // DS-4530 exclude the AOP Proxy from determining the annotations
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/CorrectionTypeConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/CorrectionTypeConverter.java
new file mode 100644
index 0000000000..58330fdfae
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/CorrectionTypeConverter.java
@@ -0,0 +1,38 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.CorrectionTypeRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.correctiontype.CorrectionType;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the method to convert a CorrectionType to its REST representation, the
+ * CorrectionTypeRest
+ * 
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component
+public class CorrectionTypeConverter implements DSpaceConverter<CorrectionType, CorrectionTypeRest> {
+
+    @Override
+    public CorrectionTypeRest convert(CorrectionType target, Projection projection) {
+        CorrectionTypeRest targetRest = new CorrectionTypeRest();
+        targetRest.setProjection(projection);
+        targetRest.setId(target.getId());
+        targetRest.setTopic(target.getTopic());
+        return targetRest;
+    }
+
+    @Override
+    public Class<CorrectionType> getModelClass() {
+        return CorrectionType.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/FilteredItemConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/FilteredItemConverter.java
new file mode 100644
index 0000000000..9d42688eb3
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/FilteredItemConverter.java
@@ -0,0 +1,125 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.model.FilteredItemRest;
+import org.dspace.app.rest.model.MetadataValueList;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.util.service.MetadataExposureService;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataField;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the converter from/to the Item in the DSpace API data model and the
+ * REST data model
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@Component
+public class FilteredItemConverter {
+
+    // Must be loaded @Lazy, as ConverterService autowires all DSpaceConverter components
+    @Lazy
+    @Autowired
+    ConverterService converter;
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private CollectionConverter collectionConverter;
+    @Autowired
+    AuthorizeService authorizeService;
+    @Autowired
+    MetadataExposureService metadataExposureService;
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(FilteredItemConverter.class);
+
+    public FilteredItemRest convert(Item obj, Projection projection) {
+        FilteredItemRest item = new FilteredItemRest();
+
+        item.setHandle(obj.getHandle());
+        if (obj.getID() != null) {
+            item.setUuid(obj.getID().toString());
+        }
+        item.setName(obj.getName());
+
+        MetadataValueList metadataValues = getPermissionFilteredMetadata(
+                ContextUtil.obtainCurrentRequestContext(), obj);
+        item.setMetadata(converter.toRest(metadataValues, projection));
+
+        item.setInArchive(obj.isArchived());
+        item.setDiscoverable(obj.isDiscoverable());
+        item.setWithdrawn(obj.isWithdrawn());
+        item.setLastModified(obj.getLastModified());
+
+        List<MetadataValue> entityTypes =
+                itemService.getMetadata(obj, "dspace", "entity", "type", Item.ANY, false);
+        if (CollectionUtils.isNotEmpty(entityTypes) && StringUtils.isNotBlank(entityTypes.get(0).getValue())) {
+            item.setEntityType(entityTypes.get(0).getValue());
+        }
+
+        Optional.ofNullable(obj.getOwningCollection())
+            .map(coll -> collectionConverter.convert(coll, Projection.DEFAULT))
+            .ifPresent(item::setOwningCollection);
+
+        return item;
+    }
+
+    /**
+     * Retrieves the metadata list filtered according to the hidden metadata configuration
+     * When the context is null, it will return the metadatalist as for an anonymous user
+     * Overrides the parent method to include virtual metadata
+     * @param context The context
+     * @param obj     The object of which the filtered metadata will be retrieved
+     * @return A list of object metadata (including virtual metadata) filtered based on the hidden metadata
+     * configuration
+     */
+    private MetadataValueList getPermissionFilteredMetadata(Context context, Item obj) {
+        List<MetadataValue> fullList = itemService.getMetadata(obj, Item.ANY, Item.ANY, Item.ANY, Item.ANY, true);
+        List<MetadataValue> returnList = new LinkedList<>();
+        try {
+            if (obj.isWithdrawn() && (Objects.isNull(context) ||
+                                      Objects.isNull(context.getCurrentUser()) || !authorizeService.isAdmin(context))) {
+                return new MetadataValueList(new ArrayList<>());
+            }
+            if (context != null && (authorizeService.isAdmin(context) || itemService.canEdit(context, obj))) {
+                return new MetadataValueList(fullList);
+            }
+            for (MetadataValue mv : fullList) {
+                MetadataField metadataField = mv.getMetadataField();
+                if (!metadataExposureService
+                        .isHidden(context, metadataField.getMetadataSchema().getName(),
+                                  metadataField.getElement(),
+                                  metadataField.getQualifier())) {
+                    returnList.add(mv);
+                }
+            }
+        } catch (SQLException e) {
+            log.error("Error filtering item metadata based on permissions", e);
+        }
+        return new MetadataValueList(returnList);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ItemFilterConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ItemFilterConverter.java
new file mode 100644
index 0000000000..b058ef057c
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ItemFilterConverter.java
@@ -0,0 +1,35 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.ldn.ItemFilter;
+import org.dspace.app.rest.model.ItemFilterRest;
+import org.dspace.app.rest.projection.Projection;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the converter from the ItemFilter to the REST data model
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component
+public class ItemFilterConverter implements DSpaceConverter<ItemFilter, ItemFilterRest> {
+
+    @Override
+    public ItemFilterRest convert(ItemFilter obj, Projection projection) {
+        ItemFilterRest itemFilterRest = new ItemFilterRest();
+        itemFilterRest.setProjection(projection);
+        itemFilterRest.setId(obj.getId());
+        return itemFilterRest;
+    }
+
+    @Override
+    public Class<ItemFilter> getModelClass() {
+        return ItemFilter.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/JsonPatchConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/JsonPatchConverter.java
index aba4d6a995..89cbc1c2d7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/JsonPatchConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/JsonPatchConverter.java
@@ -10,13 +10,13 @@ package org.dspace.app.rest.converter;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import javax.annotation.Nonnull;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import jakarta.annotation.Nonnull;
 import org.dspace.app.rest.model.patch.AddOperation;
 import org.dspace.app.rest.model.patch.CopyOperation;
 import org.dspace.app.rest.model.patch.FromOperation;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/LDNMessageEntityConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/LDNMessageEntityConverter.java
new file mode 100644
index 0000000000..1c0783aec4
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/LDNMessageEntityConverter.java
@@ -0,0 +1,71 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import java.util.UUID;
+
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.rest.model.LDNMessageEntityRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.DSpaceObject;
+import org.dspace.discovery.IndexableObject;
+import org.springframework.stereotype.Component;
+
+/**
+ * Converter to translate between {@link LDNMessageEntity} and {@link LDNMessageEntityRest} representations.
+ *  @author Stefano Maffei (stefano.maffei at 4science.com)
+ */
+@Component
+public class LDNMessageEntityConverter implements IndexableObjectConverter<LDNMessageEntity, LDNMessageEntityRest> {
+
+    @Override
+    public LDNMessageEntityRest convert(LDNMessageEntity obj, Projection projection) {
+        LDNMessageEntityRest ldnRest = new LDNMessageEntityRest();
+        ldnRest.setNotificationId(obj.getID());
+        ldnRest.setId(obj.getID());
+        ldnRest.setQueueStatus(obj.getQueueStatus());
+        ldnRest.setQueueStatusLabel(LDNMessageEntity.getQueueStatus(obj));
+        ldnRest.setContext(getObjectIdentifier(obj.getContext()));
+        ldnRest.setObject(getObjectIdentifier(obj.getObject()));
+        ldnRest.setActivityStreamType(obj.getActivityStreamType());
+        ldnRest.setCoarNotifyType(obj.getCoarNotifyType());
+        ldnRest.setTarget(getObjectIdentifier(obj.getTarget()));
+        ldnRest.setOrigin(getObjectIdentifier(obj.getOrigin()));
+        ldnRest.setInReplyTo(getObjectIdentifier(obj.getInReplyTo()));
+        ldnRest.setQueueAttempts(obj.getQueueAttempts());
+        ldnRest.setQueueLastStartTime(obj.getQueueLastStartTime());
+        ldnRest.setQueueTimeout(obj.getQueueTimeout());
+        ldnRest.setMessage(obj.getMessage());
+        ldnRest.setNotificationType(LDNMessageEntity.getNotificationType(obj));
+        return ldnRest;
+    }
+
+    private UUID getObjectIdentifier(DSpaceObject dso) {
+        return dso == null ? null : dso.getID();
+    }
+
+    private Integer getObjectIdentifier(NotifyServiceEntity nse) {
+        return nse == null ? null : nse.getID();
+    }
+
+    private String getObjectIdentifier(LDNMessageEntity msg) {
+        return msg == null ? null : msg.getID();
+    }
+
+    @Override
+    public Class<LDNMessageEntity> getModelClass() {
+        return LDNMessageEntity.class;
+    }
+
+    @Override
+    public boolean supportsModel(IndexableObject idxo) {
+        return idxo.getIndexedObject() instanceof LDNMessageEntity;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/NotifyRequestStatusConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/NotifyRequestStatusConverter.java
new file mode 100644
index 0000000000..d4a6efceee
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/NotifyRequestStatusConverter.java
@@ -0,0 +1,37 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.ldn.model.NotifyRequestStatus;
+import org.dspace.app.rest.model.NotifyRequestStatusRest;
+import org.dspace.app.rest.projection.Projection;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the converter from/to the NotifyRequestStatus in the DSpace API data model and
+ * the REST data model
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ */
+@Component
+public class NotifyRequestStatusConverter implements DSpaceConverter<NotifyRequestStatus, NotifyRequestStatusRest> {
+
+    @Override
+    public NotifyRequestStatusRest convert(NotifyRequestStatus modelObject, Projection projection) {
+        NotifyRequestStatusRest result = new NotifyRequestStatusRest();
+        result.setItemuuid(modelObject.getItemUuid());
+        result.setNotifyStatus(modelObject.getNotifyStatus());
+        return result;
+    }
+
+    @Override
+    public Class<NotifyRequestStatus> getModelClass() {
+        return NotifyRequestStatus.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/NotifyServiceConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/NotifyServiceConverter.java
new file mode 100644
index 0000000000..8e0225f43f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/NotifyServiceConverter.java
@@ -0,0 +1,68 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.rest.model.NotifyServiceInboundPatternRest;
+import org.dspace.app.rest.model.NotifyServiceRest;
+import org.dspace.app.rest.projection.Projection;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the converter from the NotifyServiceEntity to the REST data model
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component
+public class NotifyServiceConverter implements DSpaceConverter<NotifyServiceEntity, NotifyServiceRest> {
+
+    @Override
+    public NotifyServiceRest convert(NotifyServiceEntity obj, Projection projection) {
+        NotifyServiceRest notifyServiceRest = new NotifyServiceRest();
+
+        notifyServiceRest.setProjection(projection);
+        notifyServiceRest.setId(obj.getID());
+        notifyServiceRest.setName(obj.getName());
+        notifyServiceRest.setDescription(obj.getDescription());
+        notifyServiceRest.setUrl(obj.getUrl());
+        notifyServiceRest.setLdnUrl(obj.getLdnUrl());
+        notifyServiceRest.setEnabled(obj.isEnabled());
+        notifyServiceRest.setScore(obj.getScore());
+        notifyServiceRest.setLowerIp(obj.getLowerIp());
+        notifyServiceRest.setUpperIp(obj.getUpperIp());
+
+        if (obj.getInboundPatterns() != null) {
+            notifyServiceRest.setNotifyServiceInboundPatterns(
+                convertInboundPatternToRest(obj.getInboundPatterns()));
+        }
+
+        return notifyServiceRest;
+    }
+
+    private List<NotifyServiceInboundPatternRest> convertInboundPatternToRest(
+        List<NotifyServiceInboundPattern> inboundPatterns) {
+        List<NotifyServiceInboundPatternRest> inboundPatternRests = new ArrayList<>();
+        for (NotifyServiceInboundPattern inboundPattern : inboundPatterns) {
+            NotifyServiceInboundPatternRest inboundPatternRest = new NotifyServiceInboundPatternRest();
+            inboundPatternRest.setPattern(inboundPattern.getPattern());
+            inboundPatternRest.setConstraint(inboundPattern.getConstraint());
+            inboundPatternRest.setAutomatic(inboundPattern.isAutomatic());
+            inboundPatternRests.add(inboundPatternRest);
+        }
+        return inboundPatternRests;
+    }
+
+    @Override
+    public Class<NotifyServiceEntity> getModelClass() {
+        return NotifyServiceEntity.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PotentialDuplicateConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PotentialDuplicateConverter.java
new file mode 100644
index 0000000000..8d2814b611
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/PotentialDuplicateConverter.java
@@ -0,0 +1,68 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.MetadataValueList;
+import org.dspace.app.rest.model.PotentialDuplicateRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.virtual.PotentialDuplicate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Component;
+
+/**
+ * Convert DSpace PotentialDuplicate object to a PotentialDuplicateRest REST resource
+ * for use in REST results.
+ *
+ * @author Kim Shepherd
+ */
+@Component
+public class PotentialDuplicateConverter implements DSpaceConverter<PotentialDuplicate, PotentialDuplicateRest> {
+    @Lazy
+    @Autowired
+    private ConverterService converter;
+
+    /**
+     * Convert a PotentialDuplicate model object into its equivalent REST resource, applying
+     * a given projection.
+     * @see PotentialDuplicate
+     * @see PotentialDuplicateRest
+     *
+     * @param modelObject a PotentialDuplicate object
+     * @param projection current projection
+     * @return a converted PotentialDuplicateRest REST object
+     */
+    @Override
+    public PotentialDuplicateRest convert(PotentialDuplicate modelObject, Projection projection) {
+        if (modelObject == null) {
+            return null;
+        }
+        // Instantiate new REST model object
+        PotentialDuplicateRest rest = new PotentialDuplicateRest();
+        // Set or otherwise transform things here, then return
+        rest.setUuid(modelObject.getUuid());
+        rest.setTitle(modelObject.getTitle());
+        rest.setOwningCollectionName(modelObject.getOwningCollectionName());
+        rest.setWorkflowItemId(modelObject.getWorkflowItemId());
+        rest.setWorkspaceItemId(modelObject.getWorkspaceItemId());
+        rest.setMetadata(converter.toRest(new MetadataValueList(modelObject.getMetadataValueList()), projection));
+
+        // Return converted object
+        return rest;
+    }
+
+    /**
+     * For what DSpace API model class does this converter convert?
+     * @return Class of model objects represented.
+     */
+    @Override
+    public Class<PotentialDuplicate> getModelClass() {
+        return PotentialDuplicate.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java
index 54231132d7..15e99f9503 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/ProcessConverter.java
@@ -45,6 +45,7 @@ public class ProcessConverter implements DSpaceConverter<Process, ProcessRest> {
         processRest.setProcessStatus(process.getProcessStatus());
         processRest.setStartTime(process.getStartTime());
         processRest.setEndTime(process.getFinishedTime());
+        processRest.setCreationTime(process.getCreationTime());
         processRest.setParameterRestList(processService.getParameters(process).stream()
                 .map(x -> (ParameterValueRest) converter.toRest(x, projection)).collect(Collectors.toList()));
         return processRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QAEventConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QAEventConverter.java
new file mode 100644
index 0000000000..098f4dafb7
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QAEventConverter.java
@@ -0,0 +1,145 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import jakarta.annotation.PostConstruct;
+import org.dspace.app.rest.model.CorrectionTypeQAEventMessageRest;
+import org.dspace.app.rest.model.NotifyQAEventMessageRest;
+import org.dspace.app.rest.model.OpenaireQAEventMessageRest;
+import org.dspace.app.rest.model.QAEventMessageRest;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.QAEvent;
+import org.dspace.qaevent.service.dto.CorrectionTypeMessageDTO;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.qaevent.service.dto.OpenaireMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation of {@link DSpaceConverter} that converts {@link QAEvent} to
+ * {@link QAEventRest}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component
+public class QAEventConverter implements DSpaceConverter<QAEvent, QAEventRest> {
+
+    private static final String OPENAIRE_PID_HREF_PREFIX_PROPERTY = "qaevents.openaire.pid-href-prefix.";
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private ObjectMapper jsonMapper;
+
+    @PostConstruct
+    public void setup() {
+        jsonMapper = new JsonMapper();
+        jsonMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+    @Override
+    public QAEventRest convert(QAEvent modelObject, Projection projection) {
+        QAEventRest rest = new QAEventRest();
+        rest.setId(modelObject.getEventId());
+        try {
+            rest.setMessage(convertMessage(jsonMapper.readValue(modelObject.getMessage(),
+                                                                modelObject.getMessageDtoClass())));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        rest.setSource(modelObject.getSource());
+        rest.setOriginalId(modelObject.getOriginalId());
+        rest.setProjection(projection);
+        rest.setTitle(modelObject.getTitle());
+        rest.setTopic(modelObject.getTopic());
+        rest.setEventDate(modelObject.getLastUpdate());
+        DecimalFormat decimalFormat = new DecimalFormat("0.000", new DecimalFormatSymbols(Locale.ENGLISH));
+        rest.setTrust(decimalFormat.format(modelObject.getTrust()));
+        // right now only the pending status can be found in persisted qa events
+        rest.setStatus(modelObject.getStatus());
+        return rest;
+    }
+
+    private QAEventMessageRest convertMessage(QAMessageDTO dto) {
+        if (dto instanceof OpenaireMessageDTO) {
+            return convertOpenaireMessage(dto);
+        } else if (dto instanceof NotifyMessageDTO) {
+            return convertNotifyMessage(dto);
+        }
+        if (dto instanceof CorrectionTypeMessageDTO) {
+            return convertCorrectionTypeMessage(dto);
+        }
+        throw new IllegalArgumentException("Unknown message type: " + dto.getClass());
+    }
+
+    private QAEventMessageRest convertNotifyMessage(QAMessageDTO dto) {
+        NotifyMessageDTO notifyDto = (NotifyMessageDTO) dto;
+        NotifyQAEventMessageRest message = new NotifyQAEventMessageRest();
+        message.setServiceName(notifyDto.getServiceName());
+        message.setServiceId(notifyDto.getServiceId());
+        message.setHref(notifyDto.getHref());
+        message.setRelationship(notifyDto.getRelationship());
+        return message;
+    }
+
+    private QAEventMessageRest convertCorrectionTypeMessage(QAMessageDTO dto) {
+        CorrectionTypeMessageDTO correctionTypeDto = (CorrectionTypeMessageDTO) dto;
+        CorrectionTypeQAEventMessageRest message = new CorrectionTypeQAEventMessageRest();
+        message.setReason(correctionTypeDto.getReason());
+        return message;
+    }
+
+    private QAEventMessageRest convertOpenaireMessage(QAMessageDTO dto) {
+        OpenaireMessageDTO openaireDto = (OpenaireMessageDTO) dto;
+        OpenaireQAEventMessageRest message = new OpenaireQAEventMessageRest();
+        message.setAbstractValue(openaireDto.getAbstracts());
+        message.setOpenaireId(openaireDto.getOpenaireId());
+        message.setAcronym(openaireDto.getAcronym());
+        message.setCode(openaireDto.getCode());
+        message.setFunder(openaireDto.getFunder());
+        message.setFundingProgram(openaireDto.getFundingProgram());
+        message.setJurisdiction(openaireDto.getJurisdiction());
+        message.setTitle(openaireDto.getTitle());
+        message.setType(openaireDto.getType());
+        message.setValue(openaireDto.getValue());
+        message.setPidHref(calculateOpenairePidHref(openaireDto.getType(), openaireDto.getValue()));
+        return message;
+    }
+
+    private String calculateOpenairePidHref(String type, String value) {
+        if (type == null) {
+            return null;
+        }
+
+        String hrefType = type.toLowerCase();
+        if (!configurationService.hasProperty(OPENAIRE_PID_HREF_PREFIX_PROPERTY + hrefType)) {
+            return null;
+        }
+
+        String hrefPrefix = configurationService.getProperty(OPENAIRE_PID_HREF_PREFIX_PROPERTY + hrefType, "");
+        return hrefPrefix + value;
+    }
+
+    @Override
+    public Class<QAEvent> getModelClass() {
+        return QAEvent.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QASourceConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QASourceConverter.java
new file mode 100644
index 0000000000..c358c7323e
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QASourceConverter.java
@@ -0,0 +1,41 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.QASourceRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.qaevent.QASource;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation of {@link DSpaceConverter} that converts {@link QASource} to
+ * {@link QASourceRest}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component
+public class QASourceConverter implements DSpaceConverter<QASource, QASourceRest> {
+
+    @Override
+    public Class<QASource> getModelClass() {
+        return QASource.class;
+    }
+
+    @Override
+    public QASourceRest convert(QASource modelObject, Projection projection) {
+        QASourceRest rest = new QASourceRest();
+        rest.setProjection(projection);
+        rest.setId(modelObject.getName()
+                + (modelObject.getFocus() != null ? ":" + modelObject.getFocus().toString() : ""));
+        rest.setLastEvent(modelObject.getLastEvent());
+        rest.setTotalEvents(modelObject.getTotalEvents());
+        return rest;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QATopicConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QATopicConverter.java
new file mode 100644
index 0000000000..e6334924c1
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/QATopicConverter.java
@@ -0,0 +1,43 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.QATopicRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.qaevent.QATopic;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation of {@link DSpaceConverter} that converts {@link QATopic} to
+ * {@link QATopicRest}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component
+public class QATopicConverter implements DSpaceConverter<QATopic, QATopicRest> {
+
+    @Override
+    public Class<QATopic> getModelClass() {
+        return QATopic.class;
+    }
+
+    @Override
+    public QATopicRest convert(QATopic modelObject, Projection projection) {
+        QATopicRest rest = new QATopicRest();
+        rest.setProjection(projection);
+        rest.setId(modelObject.getSource() + ":" +
+                modelObject.getKey().replace("/", "!") +
+                (modelObject.getFocus() != null ? ":" + modelObject.getFocus().toString() : ""));
+        rest.setName(modelObject.getKey());
+        rest.setLastEvent(modelObject.getLastEvent());
+        rest.setTotalEvents(modelObject.getTotalEvents());
+        return rest;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RequestItemConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RequestItemConverter.java
index 27ea4f6630..e6d6f4da2a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RequestItemConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/RequestItemConverter.java
@@ -8,8 +8,7 @@
 
 package org.dspace.app.rest.converter;
 
-import javax.inject.Named;
-
+import jakarta.inject.Named;
 import org.dspace.app.requestitem.RequestItem;
 import org.dspace.app.rest.model.RequestItemRest;
 import org.dspace.app.rest.projection.Projection;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
index 126d37ba1a..e9786962e0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SearchEventConverter.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.model.PageRest;
 import org.dspace.app.rest.model.SearchEventRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCOARNotifyConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCOARNotifyConverter.java
new file mode 100644
index 0000000000..8cfcb6c063
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionCOARNotifyConverter.java
@@ -0,0 +1,47 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.SubmissionCOARNotifyRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.coarnotify.NotifySubmissionConfiguration;
+import org.springframework.stereotype.Component;
+
+/**
+ * This converter is responsible for transforming the model representation of an COARNotify to the REST
+ * representation of an COARNotifySubmissionConfiguration and vice versa
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ **/
+@Component
+public class SubmissionCOARNotifyConverter
+    implements DSpaceConverter<NotifySubmissionConfiguration, SubmissionCOARNotifyRest> {
+
+    /**
+     * Convert a COARNotify to its REST representation
+     * @param modelObject   - the COARNotify to convert
+     * @param projection    - the projection
+     * @return the corresponding SubmissionCOARNotifyRest object
+     */
+    @Override
+    public SubmissionCOARNotifyRest convert(final NotifySubmissionConfiguration modelObject,
+                                            final Projection projection) {
+
+        SubmissionCOARNotifyRest submissionCOARNotifyRest = new SubmissionCOARNotifyRest();
+        submissionCOARNotifyRest.setProjection(projection);
+        submissionCOARNotifyRest.setId(modelObject.getId());
+        submissionCOARNotifyRest.setPatterns(modelObject.getPatterns());
+        return submissionCOARNotifyRest;
+    }
+
+    @Override
+    public Class<NotifySubmissionConfiguration> getModelClass() {
+        return NotifySubmissionConfiguration.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java
index a845455204..0717f9b309 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SubmissionDefinitionConverter.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.SubmissionDefinitionRest;
@@ -70,7 +70,7 @@ public class SubmissionDefinitionConverter implements DSpaceConverter<Submission
                 }
             } catch (ClassNotFoundException e) {
                 throw new IllegalStateException(
-                        "The submission configration is invalid the processing class for the step " + step.getId()
+                        "The submission configuration is invalid the processing class for the step " + step.getId()
                                 + " is not found",
                         e);
             }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionConverter.java
new file mode 100644
index 0000000000..8eed5fb78a
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionConverter.java
@@ -0,0 +1,52 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.SuggestionRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.suggestion.Suggestion;
+import org.dspace.app.suggestion.SuggestionEvidence;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the method to convert a Suggestion to its REST representation, the
+ * SuggestionRest
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@Component
+public class SuggestionConverter
+        implements DSpaceConverter<Suggestion, SuggestionRest> {
+
+    @Autowired
+    private MetadataValueDTOListConverter metadataConverter;
+
+    @Override
+    public SuggestionRest convert(Suggestion target, Projection projection) {
+        SuggestionRest targetRest = new SuggestionRest();
+        targetRest.setProjection(projection);
+        targetRest.setId(target.getID());
+        targetRest.setDisplay(target.getDisplay());
+        targetRest.setExternalSourceUri(target.getExternalSourceUri());
+        targetRest.setSource(target.getSource());
+        targetRest.setScore(String.format("%.2f", target.getScore()));
+        for (SuggestionEvidence se : target.getEvidences()) {
+            targetRest.getEvidences().put(se.getName(),
+                    new SuggestionRest.EvidenceRest(String.format("%.2f", se.getScore()), se.getNotes()));
+        }
+        targetRest.setMetadata(metadataConverter.convert(target.getMetadata()));
+        return targetRest;
+    }
+
+    @Override
+    public Class<Suggestion> getModelClass() {
+        return Suggestion.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionSourceConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionSourceConverter.java
new file mode 100644
index 0000000000..3506133b6f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionSourceConverter.java
@@ -0,0 +1,39 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.SuggestionSourceRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.suggestion.SuggestionSource;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the method to convert a SuggestionSource to its REST representation, the
+ * SuggestionSourceRest
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@Component
+public class SuggestionSourceConverter
+        implements DSpaceConverter<SuggestionSource, SuggestionSourceRest> {
+
+    @Override
+    public SuggestionSourceRest convert(SuggestionSource target, Projection projection) {
+        SuggestionSourceRest targetRest = new SuggestionSourceRest();
+        targetRest.setProjection(projection);
+        targetRest.setId(target.getID());
+        targetRest.setTotal(target.getTotal());
+        return targetRest;
+    }
+
+    @Override
+    public Class<SuggestionSource> getModelClass() {
+        return SuggestionSource.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionTargetConverter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionTargetConverter.java
new file mode 100644
index 0000000000..df355dac1f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/converter/SuggestionTargetConverter.java
@@ -0,0 +1,43 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.converter;
+
+import org.dspace.app.rest.model.SuggestionTargetRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.suggestion.SuggestionTarget;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class provides the method to convert a SuggestionTarget to its REST representation, the
+ * SuggestionTargetRest
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@Component
+public class SuggestionTargetConverter
+        implements DSpaceConverter<SuggestionTarget, SuggestionTargetRest> {
+
+    @Override
+    public SuggestionTargetRest convert(SuggestionTarget target, Projection projection) {
+        SuggestionTargetRest targetRest = new SuggestionTargetRest();
+        targetRest.setProjection(projection);
+        targetRest.setId(target.getID());
+        if (target != null && target.getTarget() != null) {
+            targetRest.setDisplay(target.getTarget().getName());
+        }
+        targetRest.setTotal(target.getTotal());
+        targetRest.setSource(target.getSource());
+        return targetRest;
+    }
+
+    @Override
+    public Class<SuggestionTarget> getModelClass() {
+        return SuggestionTarget.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java
index c2842d33d2..8df77f424a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceAccessDeniedHandler.java
@@ -8,10 +8,10 @@
 package org.dspace.app.rest.exception;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.context.annotation.Lazy;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
index a65ea13bc2..6bfb43297b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/DSpaceApiExceptionControllerAdvice.java
@@ -7,7 +7,7 @@
  */
 package org.dspace.app.rest.exception;
 
-import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 import static org.springframework.web.servlet.DispatcherServlet.EXCEPTION_ATTRIBUTE;
 
 import java.io.IOException;
@@ -15,10 +15,10 @@ import java.sql.SQLException;
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.inject.Inject;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.exception.ResourceAlreadyExistsException;
@@ -33,6 +33,7 @@ import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.repository.support.QueryMethodParameterConversionException;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.HttpStatusCode;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.web.csrf.InvalidCsrfTokenException;
@@ -42,7 +43,6 @@ import org.springframework.web.bind.annotation.ControllerAdvice;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.context.request.WebRequest;
-import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.multipart.MultipartException;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
 
@@ -92,19 +92,12 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
                           HttpServletResponse.SC_FORBIDDEN);
     }
 
-    @ExceptionHandler({IllegalArgumentException.class, MultipartException.class})
+    @ExceptionHandler({IllegalArgumentException.class, MultipartException.class, InvalidLDNMessageException.class})
     protected void handleWrongRequestException(HttpServletRequest request, HttpServletResponse response,
                                                   Exception ex) throws IOException {
         sendErrorResponse(request, response, ex, "Request is invalid or incorrect", HttpServletResponse.SC_BAD_REQUEST);
     }
 
-    @ExceptionHandler(MaxUploadSizeExceededException.class)
-    protected void handleMaxUploadSizeExceededException(HttpServletRequest request, HttpServletResponse response,
-                                               Exception ex) throws IOException {
-        sendErrorResponse(request, response, ex, "Request entity is too large",
-                          HttpServletResponse.SC_REQUEST_ENTITY_TOO_LARGE);
-    }
-
     @ExceptionHandler(SQLException.class)
     protected void handleSQLException(HttpServletRequest request, HttpServletResponse response, Exception ex)
         throws IOException {
@@ -187,7 +180,7 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
     @ExceptionHandler(QueryMethodParameterConversionException.class)
     protected void ParameterConversionException(HttpServletRequest request, HttpServletResponse response, Exception ex)
         throws IOException {
-        // we want the 400 status for missing parameters, see https://jira.lyrasis.org/browse/DS-4428
+        // we want the 400 status for missing parameters, see https://github.com/DSpace/DSpace/issues/7765
         sendErrorResponse(request, response, ex,
                           "A required parameter is invalid",
                           HttpStatus.BAD_REQUEST.value());
@@ -196,7 +189,7 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
     @ExceptionHandler(MissingParameterException.class)
     protected void MissingParameterException(HttpServletRequest request, HttpServletResponse response, Exception ex)
         throws IOException {
-        // we want the 400 status for missing parameters, see https://jira.lyrasis.org/browse/DS-4428
+        // we want the 400 status for missing parameters, see https://github.com/DSpace/DSpace/issues/7765
         sendErrorResponse(request, response, ex,
                           "A required parameter is missing",
                           HttpStatus.BAD_REQUEST.value());
@@ -216,16 +209,16 @@ public class DSpaceApiExceptionControllerAdvice extends ResponseEntityExceptionH
 
     @Override
     protected ResponseEntity<Object> handleMissingServletRequestParameter(MissingServletRequestParameterException ex,
-                                                                          HttpHeaders headers, HttpStatus status,
+                                                                          HttpHeaders headers, HttpStatusCode status,
                                                                           WebRequest request) {
-        // we want the 400 status for missing parameters, see https://jira.lyrasis.org/browse/DS-4428
+        // we want the 400 status for missing parameters, see https://github.com/DSpace/DSpace/issues/7765
         return super.handleMissingServletRequestParameter(ex, headers, HttpStatus.BAD_REQUEST, request);
     }
 
     @Override
     protected ResponseEntity<Object> handleTypeMismatch(TypeMismatchException ex, HttpHeaders headers,
-                                                        HttpStatus status, WebRequest request) {
-        // we want the 400 status for missing parameters, see https://jira.lyrasis.org/browse/DS-4428
+                                                        HttpStatusCode status, WebRequest request) {
+        // we want the 400 status for missing parameters, see https://github.com/DSpace/DSpace/issues/7765
         return super.handleTypeMismatch(ex, headers, HttpStatus.BAD_REQUEST, request);
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidLDNMessageException.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidLDNMessageException.java
new file mode 100644
index 0000000000..0542ef02cd
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/exception/InvalidLDNMessageException.java
@@ -0,0 +1,26 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.exception;
+
+
+/**
+ * This exception is thrown when the given LDN Message json is invalid
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class InvalidLDNMessageException extends RuntimeException {
+
+    public InvalidLDNMessageException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidLDNMessageException(String message) {
+        super(message);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/ContentLanguageHeaderResponseFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/ContentLanguageHeaderResponseFilter.java
index 74ffd73ad4..5f45f7edc5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/ContentLanguageHeaderResponseFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/ContentLanguageHeaderResponseFilter.java
@@ -9,14 +9,14 @@ package org.dspace.app.rest.filter;
 
 import java.io.IOException;
 import java.util.Locale;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.core.I18nUtil;
 import org.springframework.stereotype.Component;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/DSpaceRequestContextFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/DSpaceRequestContextFilter.java
index a9170652a2..59cf702021 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/DSpaceRequestContextFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/filter/DSpaceRequestContextFilter.java
@@ -8,17 +8,15 @@
 package org.dspace.app.rest.filter;
 
 import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.core.Context;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A Servlet Filter whose only role is to clean up open Context objects in
@@ -29,8 +27,6 @@ import org.slf4j.LoggerFactory;
  * @see ContextUtil
  */
 public class DSpaceRequestContextFilter implements Filter {
-    private static final Logger log = LoggerFactory.getLogger(DSpaceRequestContextFilter.class);
-
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         //noop
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java
index 540c3fd172..5d87dc5205 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/hdlresolver/HdlResolverRestController.java
@@ -10,10 +10,10 @@ package org.dspace.app.rest.hdlresolver;
 import java.text.MessageFormat;
 import java.util.List;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -63,7 +63,7 @@ public class HdlResolverRestController {
                     request,
                     Optional.ofNullable(request.getRequestURI().split(LISTHANDLES))
                         .filter(split -> split.length > 1)
-                        .map(splitted -> splitted[1])
+                        .map(split -> split[1])
                         .orElse(null)
             );
         } else if (LISTPREFIXES.contains(hdlService)) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/health/SolrHealthIndicator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/health/SolrHealthIndicator.java
new file mode 100644
index 0000000000..1d9f4fee24
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/health/SolrHealthIndicator.java
@@ -0,0 +1,123 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.health;
+
+import org.apache.solr.client.solrj.SolrClient;
+import org.apache.solr.client.solrj.impl.BaseHttpSolrClient.RemoteSolrException;
+import org.apache.solr.client.solrj.request.CoreAdminRequest;
+import org.apache.solr.common.params.CoreAdminParams;
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.Status;
+
+/**
+ * {@link HealthIndicator} for Apache Solr.
+ *
+ * This is copied from the 'org.springframework.boot.actuate.solr.SolrHealthIndicator' in Spring Boot v2,
+ * as that class was removed in Spring Boot v3. See https://github.com/spring-projects/spring-boot/issues/31054
+ *
+ * This HealthIndicator has updated by DSpace to support later versions of Spring Boot and Solr.
+ */
+public class SolrHealthIndicator extends AbstractHealthIndicator {
+
+    private static final int HTTP_NOT_FOUND_STATUS = 404;
+
+    private final SolrClient solrClient;
+
+    private volatile StatusCheck statusCheck;
+
+    public SolrHealthIndicator(SolrClient solrClient) {
+        super("Solr health check failed");
+        this.solrClient = solrClient;
+    }
+
+    @Override
+    protected void doHealthCheck(Health.Builder builder) throws Exception {
+        int statusCode = initializeStatusCheck();
+        Status status = (statusCode != 0) ? Status.DOWN : Status.UP;
+        builder.status(status).withDetail("status", statusCode).withDetail("detectedPathType",
+                                                                           this.statusCheck.getPathType());
+    }
+
+    private int initializeStatusCheck() throws Exception {
+        StatusCheck statusCheck = this.statusCheck;
+        if (statusCheck != null) {
+            // Already initialized
+            return statusCheck.getStatus(this.solrClient);
+        }
+        try {
+            return initializeStatusCheck(new RootStatusCheck());
+        } catch (RemoteSolrException ex) {
+            // 404 is thrown when SolrClient has a baseUrl pointing to a particular core.
+            if (ex.code() == HTTP_NOT_FOUND_STATUS) {
+                return initializeStatusCheck(new ParticularCoreStatusCheck());
+            }
+            throw ex;
+        }
+    }
+
+    private int initializeStatusCheck(StatusCheck statusCheck) throws Exception {
+        int result = statusCheck.getStatus(this.solrClient);
+        this.statusCheck = statusCheck;
+        return result;
+    }
+
+    /**
+     * Strategy used to perform the status check.
+     */
+    private abstract static class StatusCheck {
+
+        private final String pathType;
+
+        StatusCheck(String pathType) {
+            this.pathType = pathType;
+        }
+
+        abstract int getStatus(SolrClient client) throws Exception;
+
+        String getPathType() {
+            return this.pathType;
+        }
+
+    }
+
+    /**
+     * {@link StatusCheck} used when {@code baseUrl} points to the root context.
+     */
+    private static class RootStatusCheck extends StatusCheck {
+
+        RootStatusCheck() {
+            super("root");
+        }
+
+        @Override
+        public int getStatus(SolrClient client) throws Exception {
+            CoreAdminRequest request = new CoreAdminRequest();
+            request.setAction(CoreAdminParams.CoreAdminAction.STATUS);
+            return request.process(client).getStatus();
+        }
+
+    }
+
+    /**
+     * {@link StatusCheck} used when {@code baseUrl} points to the particular core.
+     */
+    private static class ParticularCoreStatusCheck extends StatusCheck {
+
+        ParticularCoreStatusCheck() {
+            super("particular core");
+        }
+
+        @Override
+        public int getStatus(SolrClient client) throws Exception {
+            return client.ping().getStatus();
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/BrowseEntryHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/BrowseEntryHalLinkFactory.java
index 9e515984fe..9928efb735 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/BrowseEntryHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/BrowseEntryHalLinkFactory.java
@@ -9,7 +9,6 @@ package org.dspace.app.rest.link;
 
 import java.util.LinkedList;
 
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.RestResourceController;
 import org.dspace.app.rest.model.BrowseEntryRest;
 import org.dspace.app.rest.model.BrowseIndexRest;
@@ -36,7 +35,7 @@ public class BrowseEntryHalLinkFactory extends HalLinkFactory<BrowseEntryResourc
 
             UriComponentsBuilder baseLink = uriBuilder(
                 getMethodOn(bix.getCategory(), bix.getType()).findRel(null, null, bix.getCategory(),
-                                                                      English.plural(bix.getType()), bix.getId(),
+                                                                      bix.getTypePlural(), bix.getId(),
                                                                       BrowseIndexRest.LINK_ITEMS, null, null));
 
             addFilterParams(baseLink, data);
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 c306691eb3..30404e030a 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.RestModel;
 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 @@ import org.springframework.stereotype.Component;
  * @author Tom Desair (tom dot desair at atmire dot com)
  */
 @Component
+@Order(Ordered.HIGHEST_PRECEDENCE)
 public class DSpaceResourceHalLinkFactory extends HalLinkFactory<DSpaceResource, RestResourceController> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java
index 813ddf58db..9e679bb0a2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/OrcidQueueHalLinkFactory.java
@@ -11,7 +11,6 @@ import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 
 import java.util.LinkedList;
 
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.RestResourceController;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.OrcidQueueRest;
@@ -37,7 +36,7 @@ public class OrcidQueueHalLinkFactory extends HalLinkFactory<OrcidQueueResource,
         OrcidQueueRest orcidQueueRest = halResource.getContent();
         if (orcidQueueRest.getProfileItemId() != null) {
             UriComponentsBuilder uriComponentsBuilder = linkTo(getMethodOn(ItemRest.CATEGORY, ItemRest.NAME)
-                                       .findRel(null, null, ItemRest.CATEGORY, English.plural(ItemRest.NAME),
+                                       .findRel(null, null, ItemRest.CATEGORY, ItemRest.PLURAL_NAME,
                                         orcidQueueRest.getProfileItemId(), "", null, null)).toUriComponentsBuilder();
             String uribuilder = uriComponentsBuilder.build().toString();
             list.add(buildLink("profileItem", uribuilder.substring(0, uribuilder.lastIndexOf("/"))));
@@ -45,7 +44,7 @@ public class OrcidQueueHalLinkFactory extends HalLinkFactory<OrcidQueueResource,
 
         if (orcidQueueRest.getEntityId() != null) {
             UriComponentsBuilder uriComponentsBuilder = linkTo(getMethodOn(ItemRest.CATEGORY, ItemRest.NAME)
-                                       .findRel(null, null, ItemRest.CATEGORY, English.plural(ItemRest.NAME),
+                                       .findRel(null, null, ItemRest.CATEGORY, ItemRest.PLURAL_NAME,
                                         orcidQueueRest.getEntityId(), "", null, null)).toUriComponentsBuilder();
             String uribuilder = uriComponentsBuilder.build().toString();
             list.add(buildLink("entity", uribuilder.substring(0, uribuilder.lastIndexOf("/"))));
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/SubmissionSectionHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/SubmissionSectionHalLinkFactory.java
index 4cce63ed69..e66f01d401 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/SubmissionSectionHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/SubmissionSectionHalLinkFactory.java
@@ -11,7 +11,6 @@ import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 
 import java.util.LinkedList;
 
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.RestResourceController;
 import org.dspace.app.rest.model.SubmissionAccessOptionRest;
 import org.dspace.app.rest.model.SubmissionFormRest;
@@ -37,19 +36,22 @@ public class SubmissionSectionHalLinkFactory extends HalLinkFactory<SubmissionSe
         SubmissionSectionRest sd = halResource.getContent();
 
         if (SubmissionStepConfig.INPUT_FORM_STEP_NAME.equals(sd.getSectionType())) {
-            buildLink(list, sd, SubmissionFormRest.CATEGORY, SubmissionFormRest.NAME);
+            buildLink(list, sd, SubmissionFormRest.CATEGORY, SubmissionFormRest.NAME, SubmissionFormRest.PLURAL_NAME);
         }
         if (SubmissionStepConfig.UPLOAD_STEP_NAME.equals(sd.getSectionType())) {
-            buildLink(list, sd, SubmissionUploadRest.CATEGORY, SubmissionUploadRest.NAME);
+            buildLink(list, sd, SubmissionUploadRest.CATEGORY, SubmissionUploadRest.NAME,
+                      SubmissionUploadRest.PLURAL_NAME);
         }
         if (SubmissionStepConfig.ACCESS_CONDITION_STEP_NAME.equals(sd.getSectionType())) {
-            buildLink(list, sd, SubmissionAccessOptionRest.CATEGORY, SubmissionAccessOptionRest.NAME);
+            buildLink(list, sd, SubmissionAccessOptionRest.CATEGORY, SubmissionAccessOptionRest.NAME,
+                      SubmissionAccessOptionRest.PLURAL_NAME);
         }
     }
 
-    private void buildLink(final LinkedList<Link> list, SubmissionSectionRest sd, String category, String name) {
+    private void buildLink(final LinkedList<Link> list, SubmissionSectionRest sd, String category, String name,
+                           String plural) {
         UriComponentsBuilder uriComponentsBuilder = linkTo(getMethodOn(category, name)
-                    .findRel(null, null, category, English.plural(name), sd.getId(), "", null, null))
+                    .findRel(null, null, category, plural, sd.getId(), "", null, null))
                     .toUriComponentsBuilder();
         String uribuilder = uriComponentsBuilder.build().toString();
         list.add(buildLink(NAME_LINK_ON_PANEL, uribuilder.substring(0, uribuilder.lastIndexOf("/"))));
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/contentreport/ContentReportSupportHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/contentreport/ContentReportSupportHalLinkFactory.java
new file mode 100644
index 0000000000..b31feb3b02
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/contentreport/ContentReportSupportHalLinkFactory.java
@@ -0,0 +1,47 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.link.contentreport;
+
+import java.util.LinkedList;
+
+import org.dspace.app.rest.ContentReportRestController;
+import org.dspace.app.rest.link.HalLinkFactory;
+import org.dspace.app.rest.model.hateoas.ContentReportSupportResource;
+import org.springframework.data.domain.Pageable;
+import org.springframework.hateoas.IanaLinkRelations;
+import org.springframework.hateoas.Link;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class adds the self and report links to the ContentReportSupportResource.
+ * @author Jean-François Morin (Université Laval)
+ */
+@Component
+public class ContentReportSupportHalLinkFactory
+    extends HalLinkFactory<ContentReportSupportResource, ContentReportRestController> {
+
+    @Override
+    protected void addLinks(ContentReportSupportResource halResource, Pageable pageable, LinkedList<Link> list)
+        throws Exception {
+
+        list.add(buildLink(IanaLinkRelations.SELF.value(), getMethodOn().getContentReportSupport()));
+        list.add(buildLink("filteredcollections", getMethodOn().getFilteredCollections(null, null, null)));
+        list.add(buildLink("filtereditems", getMethodOn()
+                .getFilteredItems(null, null, null, null, null, null, null, null, null)));
+    }
+
+    @Override
+    protected Class<ContentReportRestController> getControllerClass() {
+        return ContentReportRestController.class;
+    }
+
+    @Override
+    protected Class<ContentReportSupportResource> getResourceClass() {
+        return ContentReportSupportResource.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/process/SubmissionCCLicenseUrlResourceHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/process/SubmissionCCLicenseUrlResourceHalLinkFactory.java
index 07d5e46c61..7ecd8fc3ec 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/process/SubmissionCCLicenseUrlResourceHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/process/SubmissionCCLicenseUrlResourceHalLinkFactory.java
@@ -51,8 +51,8 @@ public class SubmissionCCLicenseUrlResourceHalLinkFactory
 
 
         UriComponentsBuilder uriComponentsBuilder = uriBuilder(getMethodOn().executeSearchMethods(
-                SubmissionCCLicenseUrlRest.CATEGORY, SubmissionCCLicenseUrlRest.PLURAL, "rightsByQuestions", null, null,
-                null, null, new LinkedMultiValueMap<>()));
+            SubmissionCCLicenseUrlRest.CATEGORY, SubmissionCCLicenseUrlRest.PLURAL_NAME, "rightsByQuestions", null,
+            null, null, null, new LinkedMultiValueMap<>()));
         for (String key : parameterMap.keySet()) {
             uriComponentsBuilder.queryParam(key, parameterMap.get(key));
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/relation/RelationshipHalLinkFactory.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/relation/RelationshipHalLinkFactory.java
index 9d4e4291f5..e319428f0e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/relation/RelationshipHalLinkFactory.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/link/relation/RelationshipHalLinkFactory.java
@@ -9,7 +9,6 @@ package org.dspace.app.rest.link.relation;
 
 import java.util.LinkedList;
 
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.RestResourceController;
 import org.dspace.app.rest.link.HalLinkFactory;
 import org.dspace.app.rest.model.ItemRest;
@@ -29,10 +28,10 @@ public class RelationshipHalLinkFactory extends HalLinkFactory<RelationshipResou
         throws Exception {
 
         list.add(buildLink("leftItem", getMethodOn()
-            .findOne(ItemRest.CATEGORY, English.plural(ItemRest.NAME), halResource.getContent().getLeftId())));
+            .findOne(ItemRest.CATEGORY, ItemRest.PLURAL_NAME, halResource.getContent().getLeftId())));
 
         list.add(buildLink("rightItem", getMethodOn()
-            .findOne(ItemRest.CATEGORY, English.plural(ItemRest.NAME), halResource.getContent().getRightId())));
+            .findOne(ItemRest.CATEGORY, ItemRest.PLURAL_NAME, halResource.getContent().getRightId())));
     }
 
     @Override
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
index 1450c12f90..8521da970b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/login/impl/ResearcherProfileAutomaticClaim.java
@@ -18,6 +18,8 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.login.PostLoggedInAction;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
@@ -27,8 +29,6 @@ import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.profile.service.ResearcherProfileService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 
@@ -43,7 +43,7 @@ import org.springframework.util.Assert;
  */
 public class ResearcherProfileAutomaticClaim implements PostLoggedInAction {
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(ResearcherProfileAutomaticClaim.class);
+    private final static Logger LOGGER = LogManager.getLogger();
 
     @Autowired
     private ResearcherProfileService researcherProfileService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java
index c7dc2d1198..85993f9a92 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AccessStatusRest.java
@@ -7,7 +7,6 @@
  */
 package org.dspace.app.rest.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty.Access;
 
@@ -16,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonProperty.Access;
  */
 public class AccessStatusRest implements RestModel {
     public static final String NAME = "accessStatus";
+    public static final String PLURAL_NAME = NAME;
 
     String status;
 
@@ -25,10 +25,12 @@ public class AccessStatusRest implements RestModel {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
     @Override
-    @JsonIgnore
     public String getTypePlural() {
-        return getType();
+        return PLURAL_NAME;
     }
 
     public AccessStatusRest() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationTokenRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationTokenRest.java
index 0599e09565..6fbeeb219a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationTokenRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthenticationTokenRest.java
@@ -15,6 +15,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class AuthenticationTokenRest extends RestAddressableModel {
     public static final String NAME = "shortlivedtoken";
+    public static final String PLURAL_NAME = "shortlivedtokens";
     public static final String CATEGORY = RestAddressableModel.AUTHENTICATION;
 
     private String token;
@@ -34,6 +35,11 @@ public class AuthenticationTokenRest extends RestAddressableModel {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getToken() {
         return token;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthnRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthnRest.java
index fade90fe4d..8c873ccc12 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthnRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthnRest.java
@@ -18,6 +18,7 @@ import org.dspace.app.rest.AuthenticationRestController;
 public class AuthnRest extends BaseObjectRest<Integer> {
 
     public static final String NAME = "authn";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestAddressableModel.AUTHENTICATION;
 
     public String getCategory() {
@@ -28,6 +29,14 @@ public class AuthnRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return AuthenticationRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationFeatureRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationFeatureRest.java
index cf602e2fb3..775b10d619 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationFeatureRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationFeatureRest.java
@@ -21,6 +21,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class AuthorizationFeatureRest extends BaseObjectRest<String> {
     public static final String NAME = "feature";
+    public static final String PLURAL_NAME = "features";
     public static final String CATEGORY = RestAddressableModel.AUTHORIZATION;
 
     private String description;
@@ -34,6 +35,11 @@ public class AuthorizationFeatureRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationRest.java
index 95f2888313..cd3e33b9e2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/AuthorizationRest.java
@@ -18,12 +18,13 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(method = "getEperson", name = AuthorizationRest.EPERSON),
-        @LinkRest(method = "getFeature", name = AuthorizationRest.FEATURE),
-        @LinkRest(method = "getObject", name = AuthorizationRest.OBJECT)
+    @LinkRest(method = "getEperson", name = AuthorizationRest.EPERSON),
+    @LinkRest(method = "getFeature", name = AuthorizationRest.FEATURE),
+    @LinkRest(method = "getObject", name = AuthorizationRest.OBJECT)
 })
 public class AuthorizationRest extends BaseObjectRest<String> {
     public static final String NAME = "authorization";
+    public static final String PLURAL_NAME = "authorizations";
     public static final String CATEGORY = RestAddressableModel.AUTHORIZATION;
 
     public static final String EPERSON = "eperson";
@@ -36,6 +37,14 @@ public class AuthorizationRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java
index 1b02a1d89a..486eb02cad 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamFormatRest.java
@@ -20,6 +20,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class BitstreamFormatRest extends BaseObjectRest<Integer> {
     public static final String NAME = "bitstreamformat";
+    public static final String PLURAL_NAME = "bitstreamformats";
 
     public static final String CATEGORY = RestAddressableModel.CORE;
 
@@ -96,6 +97,11 @@ public class BitstreamFormatRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     @JsonIgnore
     public Class getController() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamRest.java
index 8e9efc2680..d456f72223 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BitstreamRest.java
@@ -16,18 +16,9 @@ import com.fasterxml.jackson.annotation.JsonProperty.Access;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = BitstreamRest.BUNDLE,
-                method = "getBundle"
-        ),
-        @LinkRest(
-                name = BitstreamRest.FORMAT,
-                method = "getFormat"
-        ),
-        @LinkRest(
-                name = BitstreamRest.THUMBNAIL,
-                method = "getThumbnail"
-        )
+    @LinkRest(name = BitstreamRest.BUNDLE, method = "getBundle"),
+    @LinkRest(name = BitstreamRest.FORMAT, method = "getFormat"),
+    @LinkRest(name = BitstreamRest.THUMBNAIL, method = "getThumbnail")
 })
 public class BitstreamRest extends DSpaceObjectRest {
     public static final String PLURAL_NAME = "bitstreams";
@@ -88,4 +79,9 @@ public class BitstreamRest extends DSpaceObjectRest {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseEntryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseEntryRest.java
index 6a569bd4c9..57f20d7c31 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseEntryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseEntryRest.java
@@ -17,6 +17,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 public class BrowseEntryRest implements RestModel {
     private static final long serialVersionUID = -3415049466402327251L;
     public static final String NAME = "browseEntry";
+    public static final String PLURAL_NAME = "browseEntries";
     private String authority;
     private String value;
     private String valueLang;
@@ -69,4 +70,9 @@ public class BrowseEntryRest implements RestModel {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java
index f7978f00fd..e5b0894799 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BrowseIndexRest.java
@@ -20,19 +20,14 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-    @LinkRest(
-            name = BrowseIndexRest.LINK_ITEMS,
-            method = "listBrowseItems"
-    ),
-    @LinkRest(
-            name = BrowseIndexRest.LINK_ENTRIES,
-            method = "listBrowseEntries"
-    )
+    @LinkRest(name = BrowseIndexRest.LINK_ITEMS, method = "listBrowseItems"),
+    @LinkRest(name = BrowseIndexRest.LINK_ENTRIES, method = "listBrowseEntries")
 })
 public class BrowseIndexRest extends BaseObjectRest<String> {
     private static final long serialVersionUID = -4870333170249999559L;
 
     public static final String NAME = "browse";
+    public static final String PLURAL_NAME = "browses";
 
     public static final String CATEGORY = RestAddressableModel.DISCOVER;
 
@@ -79,6 +74,11 @@ public class BrowseIndexRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public List<String> getMetadataList() {
         return metadataList;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BulkAccessConditionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BulkAccessConditionRest.java
index 97d35117d1..18ed4e71aa 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BulkAccessConditionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BulkAccessConditionRest.java
@@ -23,7 +23,7 @@ public class BulkAccessConditionRest extends BaseObjectRest<String> {
     private static final long serialVersionUID = -7708437586052984082L;
 
     public static final String NAME = "bulkaccessconditionoption";
-    public static final String PLURAL = "bulkaccessconditionoptions";
+    public static final String PLURAL_NAME = "bulkaccessconditionoptions";
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
     private String id;
@@ -69,6 +69,11 @@ public class BulkAccessConditionRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
@@ -81,4 +86,4 @@ public class BulkAccessConditionRest extends BaseObjectRest<String> {
         return RestResourceController.class;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BundleRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BundleRest.java
index dd4a80d488..4a417e6c54 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BundleRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/BundleRest.java
@@ -16,18 +16,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Jelle Pelgrims (jelle.pelgrims at atmire.com)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = BundleRest.ITEM,
-                method = "getItem"
-        ),
-        @LinkRest(
-                name = BundleRest.BITSTREAMS,
-                method = "getBitstreams"
-        ),
-        @LinkRest(
-                name = BundleRest.PRIMARY_BITSTREAM,
-                method = "getPrimaryBitstream"
-        )
+    @LinkRest(name = BundleRest.ITEM, method = "getItem"),
+    @LinkRest(name = BundleRest.BITSTREAMS, method = "getBitstreams"),
+    @LinkRest(name = BundleRest.PRIMARY_BITSTREAM, method = "getPrimaryBitstream")
 })
 public class BundleRest extends DSpaceObjectRest {
     public static final String NAME = "bundle";
@@ -52,4 +43,9 @@ public class BundleRest extends DSpaceObjectRest {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ClaimedTaskRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ClaimedTaskRest.java
index dd97fef44d..d29bf7a7ce 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ClaimedTaskRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ClaimedTaskRest.java
@@ -16,10 +16,7 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = ClaimedTaskRest.STEP,
-        method = "getStep"
-    )
+    @LinkRest(name = ClaimedTaskRest.STEP, method = "getStep")
 })
 public class ClaimedTaskRest extends BaseObjectRest<Integer> {
     public static final String NAME = "claimedtask";
@@ -47,6 +44,11 @@ public class ClaimedTaskRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CollectionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CollectionRest.java
index 3f5ae3bb34..34faba4cb4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CollectionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CollectionRest.java
@@ -15,38 +15,14 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = CollectionRest.LICENSE,
-                method = "getLicense"
-        ),
-        @LinkRest(
-                name = CollectionRest.LOGO,
-                method = "getLogo"
-        ),
-        @LinkRest(
-                name = CollectionRest.MAPPED_ITEMS,
-                method = "getMappedItems"
-        ),
-        @LinkRest(
-                name = CollectionRest.PARENT_COMMUNITY,
-                method = "getParentCommunity"
-        ),
-        @LinkRest(
-                name = CollectionRest.ADMIN_GROUP,
-                method = "getAdminGroup"
-        ),
-        @LinkRest(
-                name = CollectionRest.SUBMITTERS_GROUP,
-                method = "getSubmittersGroup"
-        ),
-        @LinkRest(
-                name = CollectionRest.ITEM_READ_GROUP,
-                method = "getItemReadGroup"
-        ),
-        @LinkRest(
-                name = CollectionRest.BITSTREAM_READ_GROUP,
-                method = "getBitstreamReadGroup"
-        ),
+    @LinkRest(name = CollectionRest.LICENSE, method = "getLicense"),
+    @LinkRest(name = CollectionRest.LOGO, method = "getLogo"),
+    @LinkRest(name = CollectionRest.MAPPED_ITEMS, method = "getMappedItems"),
+    @LinkRest(name = CollectionRest.PARENT_COMMUNITY, method = "getParentCommunity"),
+    @LinkRest(name = CollectionRest.ADMIN_GROUP, method = "getAdminGroup"),
+    @LinkRest(name = CollectionRest.SUBMITTERS_GROUP, method = "getSubmittersGroup"),
+    @LinkRest(name = CollectionRest.ITEM_READ_GROUP, method = "getItemReadGroup"),
+    @LinkRest(name = CollectionRest.BITSTREAM_READ_GROUP, method = "getBitstreamReadGroup"),
 })
 public class CollectionRest extends DSpaceObjectRest {
     public static final String NAME = "collection";
@@ -75,6 +51,11 @@ public class CollectionRest extends DSpaceObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private int archivedItemsCount;
 
     public int getArchivedItemsCount() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CommunityRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CommunityRest.java
index 86dc4b2c39..e70b30803d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CommunityRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CommunityRest.java
@@ -15,26 +15,11 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = CommunityRest.COLLECTIONS,
-                method = "getCollections"
-        ),
-        @LinkRest(
-                name = CommunityRest.LOGO,
-                method = "getLogo"
-        ),
-        @LinkRest(
-                name = CommunityRest.SUBCOMMUNITIES,
-                method = "getSubcommunities"
-        ),
-        @LinkRest(
-                name = CommunityRest.PARENT_COMMUNITY,
-                method = "getParentCommunity"
-        ),
-        @LinkRest(
-                name = CommunityRest.ADMIN_GROUP,
-                method = "getAdminGroup"
-        )
+    @LinkRest(name = CommunityRest.COLLECTIONS, method = "getCollections"),
+    @LinkRest(name = CommunityRest.LOGO, method = "getLogo"),
+    @LinkRest(name = CommunityRest.SUBCOMMUNITIES, method = "getSubcommunities"),
+    @LinkRest(name = CommunityRest.PARENT_COMMUNITY, method = "getParentCommunity"),
+    @LinkRest(name = CommunityRest.ADMIN_GROUP, method = "getAdminGroup")
 })
 public class CommunityRest extends DSpaceObjectRest {
     public static final String NAME = "community";
@@ -59,6 +44,11 @@ public class CommunityRest extends DSpaceObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private int archivedItemsCount;
 
     public int getArchivedItemsCount() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ContentReportSupportRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ContentReportSupportRest.java
new file mode 100644
index 0000000000..3062fdf0fa
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ContentReportSupportRest.java
@@ -0,0 +1,38 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import org.dspace.app.rest.ContentReportRestController;
+
+public class ContentReportSupportRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = 9137258312781361906L;
+    public static final String NAME = "contentreport";
+    public static final String CATEGORY = RestModel.CONTENT_REPORT;
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class<?> getController() {
+        return ContentReportRestController.class;
+    }
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return NAME;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CorrectionTypeQAEventMessageRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CorrectionTypeQAEventMessageRest.java
new file mode 100644
index 0000000000..6929f39071
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CorrectionTypeQAEventMessageRest.java
@@ -0,0 +1,29 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+/**
+ * The CorrectionTypeQAEventMessageRest class implements the QAEventMessageRest
+ * interface and represents a message structure for Quality Assurance (QA)
+ * events related to correction types.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class CorrectionTypeQAEventMessageRest implements QAEventMessageRest {
+
+    private String reason;
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CorrectionTypeRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CorrectionTypeRest.java
new file mode 100644
index 0000000000..6a26313f92
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/CorrectionTypeRest.java
@@ -0,0 +1,57 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The CorrectionType REST Resource
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class CorrectionTypeRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = -8297846719538025938L;
+
+    public static final String NAME = "correctiontype";
+    public static final String PLURAL_NAME = "correctiontypes";
+    public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
+
+    private String topic;
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/DiscoveryResultsRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/DiscoveryResultsRest.java
index bf1d513a81..e63c94edc3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/DiscoveryResultsRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/DiscoveryResultsRest.java
@@ -21,6 +21,7 @@ public abstract class DiscoveryResultsRest extends BaseObjectRest<String> {
 
     @JsonIgnore
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
     private String scope;
     private String query;
@@ -40,6 +41,14 @@ public abstract class DiscoveryResultsRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return DiscoveryRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EPersonRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EPersonRest.java
index 7b4c683322..db24340025 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EPersonRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EPersonRest.java
@@ -20,13 +20,11 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = EPersonRest.GROUPS,
-                method = "getGroups"
-        )
+    @LinkRest(name = EPersonRest.GROUPS, method = "getGroups")
 })
 public class EPersonRest extends DSpaceObjectRest {
     public static final String NAME = "eperson";
+    public static final String PLURAL_NAME = "epersons";
     public static final String CATEGORY = RestAddressableModel.EPERSON;
 
     public static final String GROUPS = "groups";
@@ -52,6 +50,11 @@ public class EPersonRest extends DSpaceObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getNetid() {
         return netid;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EntityTypeRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EntityTypeRest.java
index f777b3a29c..e73aa70918 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EntityTypeRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/EntityTypeRest.java
@@ -15,18 +15,15 @@ import org.dspace.app.rest.RestResourceController;
  * Refer to {@link org.dspace.content.EntityType} for explanation of the properties
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = EntityTypeRest.RELATION_SHIP_TYPES,
-                method = "getEntityTypeRelationship"
-        )
+    @LinkRest(name = EntityTypeRest.RELATION_SHIP_TYPES, method = "getEntityTypeRelationship")
 })
 public class EntityTypeRest extends BaseObjectRest<Integer> {
 
     private static final long serialVersionUID = 8166078961459192770L;
 
     public static final String NAME = "entitytype";
-    public static final String NAME_PLURAL = "entitytypes";
-    public static final String CATEGORY = "core";
+    public static final String PLURAL_NAME = "entitytypes";
+    public static final String CATEGORY = RestModel.CORE;
     public static final String RELATION_SHIP_TYPES = "relationshiptypes";
 
     public String getCategory() {
@@ -41,6 +38,11 @@ public class EntityTypeRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private String label;
 
     public String getLabel() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceEntryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceEntryRest.java
index 06af7e2227..34253d538a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceEntryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceEntryRest.java
@@ -33,6 +33,11 @@ public class ExternalSourceEntryRest extends RestAddressableModel {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private String id;
     private String display;
     private String value;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceRest.java
index 639c2cf72e..21f41241b2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ExternalSourceRest.java
@@ -13,10 +13,7 @@ import org.dspace.app.rest.RestResourceController;
  * This class serves as a REST representation for an External Source
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = ExternalSourceRest.ENTITY_TYPES,
-                method = "getSupportedEntityTypes"
-        )
+    @LinkRest(name = ExternalSourceRest.ENTITY_TYPES, method = "getSupportedEntityTypes")
 })
 public class ExternalSourceRest extends BaseObjectRest<String> {
 
@@ -42,6 +39,11 @@ public class ExternalSourceRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private String id;
     private String name;
     private boolean hierarchical;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FacetConfigurationRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FacetConfigurationRest.java
index 4b8244eba2..06068b34e0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FacetConfigurationRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FacetConfigurationRest.java
@@ -21,6 +21,7 @@ import org.dspace.app.rest.DiscoveryRestController;
 public class FacetConfigurationRest extends BaseObjectRest<String> {
 
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
 
     private String scope;
@@ -38,6 +39,14 @@ public class FacetConfigurationRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return DiscoveryRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FeedbackRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FeedbackRest.java
index 00f1e92c87..434f5755e8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FeedbackRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FeedbackRest.java
@@ -19,6 +19,7 @@ public class FeedbackRest extends BaseObjectRest<Integer> {
     private static final long serialVersionUID = 1L;
 
     public static final String NAME = "feedback";
+    public static final String PLURAL_NAME = "feedbacks";
     public static final String CATEGORY = RestAddressableModel.TOOLS;
 
     private String page;
@@ -61,6 +62,11 @@ public class FeedbackRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
@@ -72,4 +78,4 @@ public class FeedbackRest extends BaseObjectRest<Integer> {
         return RestResourceController.class;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionRest.java
new file mode 100644
index 0000000000..47ff61db64
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionRest.java
@@ -0,0 +1,104 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.EnumMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dspace.contentreport.Filter;
+import org.dspace.contentreport.FilteredCollection;
+
+/**
+ * This class serves as a REST representation of a single Collection in a {@link FilteredCollectionsRest}
+ * from the DSpace statistics. It takes its values from a @link FilteredCollection} instance.
+ * It must not extend BaseObjectRest<?>.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredCollectionRest {
+
+    public static final String NAME = "filtered-collection";
+    public static final String CATEGORY = RestModel.CONTENT_REPORT;
+
+    /** Name of the collection */
+    private String label;
+    /** Handle of the collection, used to make it clickable from the generated report */
+    private String handle;
+    /** Name of the owning community */
+    @JsonProperty("community_label")
+    private String communityLabel;
+    /** Handle of the owning community, used to make it clickable from the generated report */
+    @JsonProperty("community_handle")
+    private String communityHandle;
+    /** Total number of items in the collection */
+    @JsonProperty("nb_total_items")
+    private int totalItems;
+    /** Number of filtered items per requested filter in the collection */
+    private Map<Filter, Integer> values = new EnumMap<>(Filter.class);
+    /** Number of items in the collection that match all requested filters */
+    @JsonProperty("all_filters_value")
+    private int allFiltersValue;
+
+    /**
+     * Builds a FilteredCollectionRest instance from a {@link FilteredCollection} instance.
+     * @param model the FilteredCollection instance that provides values to the
+     * FilteredCollectionRest instance to be created
+     * @return a FilteredCollectionRest instance built from the provided model object
+     */
+    public static FilteredCollectionRest of(FilteredCollection model) {
+        Objects.requireNonNull(model);
+
+        var coll = new FilteredCollectionRest();
+        coll.label = model.getLabel();
+        coll.handle = model.getHandle();
+        coll.communityLabel = model.getCommunityLabel();
+        coll.communityHandle = model.getCommunityHandle();
+        coll.totalItems = model.getTotalItems();
+        coll.allFiltersValue = model.getAllFiltersValue();
+        Optional.ofNullable(model.getValues()).ifPresent(coll.values::putAll);
+
+        return coll;
+    }
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    public Map<Filter, Integer> getValues() {
+        return values;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public String getHandle() {
+        return handle;
+    }
+
+    public String getCommunityLabel() {
+        return communityLabel;
+    }
+
+    public String getCommunityHandle() {
+        return communityHandle;
+    }
+
+    public int getTotalItems() {
+        return totalItems;
+    }
+
+    public int getAllFiltersValue() {
+        return allFiltersValue;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionsQuery.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionsQuery.java
new file mode 100644
index 0000000000..059516da13
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionsQuery.java
@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Collection;
+import java.util.EnumSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.dspace.contentreport.Filter;
+
+/**
+ * Structured query contents for the Filtered Collections report
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredCollectionsQuery {
+
+    private Set<Filter> filters = EnumSet.noneOf(Filter.class);
+
+    /**
+     * Shortcut method that builds a FilteredCollectionsQuery instance
+     * from its building blocks.
+     * @param filters filters to apply to existing items.
+     * The filters mapping to true will be applied, others (either missing or
+     * mapping to false) will not.
+     * @return a FilteredCollectionsQuery instance built from the provided parameters
+     */
+    public static FilteredCollectionsQuery of(Collection<Filter> filters) {
+        var query = new FilteredCollectionsQuery();
+        Optional.ofNullable(filters).ifPresent(query.filters::addAll);
+        return query;
+    }
+
+    public Set<Filter> getFilters() {
+        return filters;
+    }
+
+    public void setFilters(Set<Filter> filters) {
+        this.filters = filters;
+    }
+
+    public String toQueryString() {
+        return filters.stream()
+                .map(f -> "filters=" + f.getId())
+                .collect(Collectors.joining("&"));
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionsRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionsRest.java
new file mode 100644
index 0000000000..2d808e4a31
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredCollectionsRest.java
@@ -0,0 +1,82 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+
+import org.dspace.app.rest.ContentReportRestController;
+import org.dspace.contentreport.FilteredCollections;
+
+/**
+ * This class serves as a REST representation of a Filtered Collections Report.
+ * The name must match that of the associated resource class (FilteredCollectionsResource) except for
+ * the suffix. This is why it is not named something like FilteredCollectionsReportRest.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredCollectionsRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = -1109226348211060786L;
+    /** Type of instances of this class, used by the DSpace REST infrastructure */
+    public static final String NAME = "filteredcollectionsreport";
+    /** Category of instances of this class, used by the DSpace REST infrastructure */
+    public static final String CATEGORY = RestModel.CONTENT_REPORT;
+
+    /** Collections included in the report */
+    private List<FilteredCollectionRest> collections = new ArrayList<>();
+    /** Report summary */
+    private FilteredCollectionRest summary;
+
+    /**
+     * Builds a FilteredCollectionsRest instance from a {@link FilteredCollections} instance.
+     * Each underlying FilteredCollection is converted to a FilteredCollectionRest instance.
+     * @param model the FilteredCollections instance that provides values to the
+     * FilteredCollectionsRest instance to be created
+     * @return a FilteredCollectionsRest instance built from the provided model object
+     */
+    public static FilteredCollectionsRest of(FilteredCollections model) {
+        var colls = new FilteredCollectionsRest();
+        Optional.ofNullable(model.getCollections()).ifPresent(cs ->
+                cs.stream()
+                        .map(FilteredCollectionRest::of)
+                        .forEach(colls.collections::add));
+        colls.summary = FilteredCollectionRest.of(model.getSummary());
+        return colls;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class<?> getController() {
+        return ContentReportRestController.class;
+    }
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return getType();
+    }
+
+    public List<FilteredCollectionRest> getCollections() {
+        return collections;
+    }
+
+    public FilteredCollectionRest getSummary() {
+        return summary;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemRest.java
new file mode 100644
index 0000000000..b5d5129492
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemRest.java
@@ -0,0 +1,128 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Specialization of ItemRest dedicated to the Filtered Items report.
+ * This class adds the owning collection property required to properly
+ * display search results without compromising the expected behaviour
+ * of standard ItemRest instances, in all other contexts, especially
+ * when it comes to embedded contents, a criterion that is widely checked
+ * against in several integration tests.
+ *
+ * @author Jean-François Morin (jean-francois.morin@bibl.ulaval.ca)
+ */
+public class FilteredItemRest {
+
+    public static final String NAME = "filtered-item";
+    public static final String CATEGORY = RestAddressableModel.CONTENT_REPORT;
+
+    public static final String OWNING_COLLECTION = "owningCollection";
+
+    private String uuid;
+    private String name;
+    private String handle;
+    MetadataRest metadata = new MetadataRest();
+    private boolean inArchive = false;
+    private boolean discoverable = false;
+    private boolean withdrawn = false;
+    private Date lastModified = new Date();
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    private String entityType = null;
+    private CollectionRest owningCollection;
+
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getHandle() {
+        return handle;
+    }
+
+    public void setHandle(String handle) {
+        this.handle = handle;
+    }
+
+    public MetadataRest getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(MetadataRest metadata) {
+        this.metadata = metadata;
+    }
+
+    public boolean getInArchive() {
+        return inArchive;
+    }
+
+    public void setInArchive(boolean inArchive) {
+        this.inArchive = inArchive;
+    }
+
+    public boolean getDiscoverable() {
+        return discoverable;
+    }
+
+    public void setDiscoverable(boolean discoverable) {
+        this.discoverable = discoverable;
+    }
+
+    public boolean getWithdrawn() {
+        return withdrawn;
+    }
+
+    public void setWithdrawn(boolean withdrawn) {
+        this.withdrawn = withdrawn;
+    }
+
+    public Date getLastModified() {
+        return lastModified;
+    }
+
+    public void setLastModified(Date lastModified) {
+        this.lastModified = lastModified;
+    }
+
+    public String getEntityType() {
+        return entityType;
+    }
+
+    public void setEntityType(String entityType) {
+        this.entityType = entityType;
+    }
+
+    public CollectionRest getOwningCollection() {
+        return owningCollection;
+    }
+
+    public void setOwningCollection(CollectionRest owningCollection) {
+        this.owningCollection = owningCollection;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsQueryPredicate.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsQueryPredicate.java
new file mode 100644
index 0000000000..fe7192e562
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsQueryPredicate.java
@@ -0,0 +1,74 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Optional;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.contentreport.QueryOperator;
+
+/**
+ * Data structure representing a query predicate used by the Filtered Items report
+ * to filter items to retrieve. This version is specific to the REST layer and its
+ * property types are detached from the persistence layer.
+ * @see org.dspace.contentreport.QueryPredicate
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredItemsQueryPredicate {
+
+    private String field;
+    private QueryOperator operator;
+    private String value;
+
+    /**
+     * Shortcut method that builds a FilteredItemsQueryPredicate from a single field, an operator, and a value.
+     * @param field Predicate subject
+     * @param operator Predicate operator
+     * @param value Predicate object
+     * @return a FilteredItemsQueryPredicate instance built from the provided parameters
+     */
+    public static FilteredItemsQueryPredicate of(String field, QueryOperator operator, String value) {
+        var predicate = new FilteredItemsQueryPredicate();
+        predicate.field = field;
+        predicate.operator = operator;
+        predicate.value = value;
+        return predicate;
+    }
+
+    /**
+     * Shortcut method that builds a FilteredItemsQueryPredicate from a colon-separated string value.
+     * @param value Colon-separated string value (field:operator:object or field:operator)
+     * @return a FilteredItemsQueryPredicate instance built from the provided value
+     */
+    public static FilteredItemsQueryPredicate of(String value) {
+        String[] tokens = value.split("\\:");
+        String field = tokens.length > 0 ? tokens[0].trim() : "";
+        QueryOperator operator = tokens.length > 1 ? QueryOperator.get(tokens[1].trim()) : null;
+        String object = tokens.length > 2 ? StringUtils.trimToEmpty(tokens[2]) : "";
+        return of(field, operator, object);
+    }
+
+    public String getField() {
+        return field;
+    }
+
+    public QueryOperator getOperator() {
+        return operator;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        String op = Optional.ofNullable(operator).map(QueryOperator::getCode).orElse("");
+        return field + ":" + op + ":" + value;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsQueryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsQueryRest.java
new file mode 100644
index 0000000000..973dc9738b
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsQueryRest.java
@@ -0,0 +1,148 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.contentreport.Filter;
+import org.dspace.contentreport.QueryOperator;
+
+/**
+ * REST-based version of structured query contents for the Filtered Items report
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredItemsQueryRest {
+
+    private List<String> collections = new ArrayList<>();
+    private List<FilteredItemsQueryPredicate> queryPredicates = new ArrayList<>();
+    private int pageLimit;
+    private Set<Filter> filters = EnumSet.noneOf(Filter.class);
+    private List<String> additionalFields = new ArrayList<>();
+
+    /**
+     * Shortcut method that builds a FilteredItemsQueryRest instance
+     * from its building blocks.
+     * @param collectionUuids collection UUIDs to add
+     * @param predicates query predicates used to filter existing items
+     * @param pageLimit number of items per page
+     * @param filters filters to apply to existing items
+     * The filters mapping to true will be applied, others (either missing or
+     * mapping to false) will not.
+     * @param additionalFields additional fields to display in the resulting report
+     * @return a FilteredItemsQueryRest instance built from the provided parameters
+     */
+    public static FilteredItemsQueryRest of(Collection<String> collectionUuids,
+            Collection<FilteredItemsQueryPredicate> predicates, int pageLimit,
+            Collection<Filter> filters, Collection<String> additionalFields) {
+        var query = new FilteredItemsQueryRest();
+        Optional.ofNullable(collectionUuids).ifPresent(query.collections::addAll);
+        Optional.ofNullable(predicates).ifPresent(query.queryPredicates::addAll);
+        query.pageLimit = pageLimit;
+        Optional.ofNullable(filters).ifPresent(query.filters::addAll);
+        Optional.ofNullable(additionalFields).ifPresent(query.additionalFields::addAll);
+        return query;
+    }
+
+    public List<String> getCollections() {
+        return collections;
+    }
+
+    public void setCollections(List<String> collections) {
+        this.collections = collections;
+    }
+
+    public List<FilteredItemsQueryPredicate> getQueryPredicates() {
+        return queryPredicates;
+    }
+
+    public void setQueryPredicates(List<FilteredItemsQueryPredicate> queryPredicates) {
+        this.queryPredicates = queryPredicates;
+    }
+
+    public List<String> getPredicateFields() {
+        if (queryPredicates == null) {
+            return Collections.emptyList();
+        }
+        return queryPredicates.stream()
+                .map(FilteredItemsQueryPredicate::getField)
+                .collect(Collectors.toList());
+    }
+
+    public List<QueryOperator> getPredicateOperators() {
+        if (queryPredicates == null) {
+            return Collections.emptyList();
+        }
+        return queryPredicates.stream()
+                .map(FilteredItemsQueryPredicate::getOperator)
+                .collect(Collectors.toList());
+    }
+
+    public List<String> getPredicateValues() {
+        if (queryPredicates == null) {
+            return Collections.emptyList();
+        }
+        return queryPredicates.stream()
+                .map(FilteredItemsQueryPredicate::getValue)
+                .map(s -> s == null ? "" : s)
+                .collect(Collectors.toList());
+    }
+
+    public int getPageLimit() {
+        return pageLimit;
+    }
+
+    public void setPageLimit(int pageLimit) {
+        this.pageLimit = pageLimit;
+    }
+
+    public Set<Filter> getFilters() {
+        return filters;
+    }
+
+    public void setFilters(Set<Filter> filters) {
+        this.filters = filters;
+    }
+
+    public List<String> getAdditionalFields() {
+        return additionalFields;
+    }
+
+    public void setAdditionalFields(List<String> additionalFields) {
+        this.additionalFields = additionalFields;
+    }
+
+    public String toQueryString() {
+        String colls = collections.stream()
+                .map(coll -> "collection=" + coll)
+                .collect(Collectors.joining("&"));
+        String preds = queryPredicates.stream()
+                .map(pred -> "queryPredicates=" + pred)
+                .collect(Collectors.joining("&"));
+        String pgLimit = "pageLimit=" + pageLimit;
+        String fltrs = filters.stream()
+                .map(e -> "filters=" + e.getId())
+                .collect(Collectors.joining("&"));
+        String flds = additionalFields.stream()
+                .map(fld -> "additionalFields=" + fld)
+                .collect(Collectors.joining("&"));
+
+        return Stream.of(colls, preds, pgLimit, fltrs, flds)
+                .filter(StringUtils::isNotBlank)
+                .collect(Collectors.joining("&"));
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsRest.java
new file mode 100644
index 0000000000..e879a9b9cc
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/FilteredItemsRest.java
@@ -0,0 +1,88 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.dspace.app.rest.ContentReportRestController;
+
+/**
+ * This class serves as a REST representation of a Filtered Items Report.
+ * The name must match that of the associated resource class (FilteredItemsResource) except for
+ * the suffix. This is why it is not named something like FilteredItemsReportRest.
+ *
+ * @author Jean-François Morin (Université Laval)
+ */
+public class FilteredItemsRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = -2483812920345013458L;
+    /** Type of instances of this class, used by the DSpace REST infrastructure */
+    public static final String NAME = "filtereditemsreport";
+    /** Category of instances of this class, used by the DSpace REST infrastructure */
+    public static final String CATEGORY = RestModel.CONTENT_REPORT;
+
+    /** Items included in the report */
+    private List<FilteredItemRest> items = new ArrayList<>();
+    /** Total item count (for pagination) */
+    private long itemCount;
+
+    /**
+     * Builds a FilteredItemsRest instance from a list of items and an total item count.
+     * To avoid adding a dependency to any Spring-managed service here, the items
+     * provided here are already converted to FilteredItemRest instances.
+     * @param items the items to add to the FilteredItemsRest instance to be created
+     * @param itemCount total number of items found regardless of any pagination constraint
+     * @return a FilteredItemsRest instance built from the provided data
+     */
+    public static FilteredItemsRest of(List<FilteredItemRest> items, long itemCount) {
+        var itemsRest = new FilteredItemsRest();
+        itemsRest.items.addAll(items);
+        itemsRest.itemCount = itemCount;
+        return itemsRest;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    /**
+     * Return controller class responsible for this Rest object
+     *
+     * @return Controller class responsible for this Rest object
+     */
+    @Override
+    public Class<?> getController() {
+        return ContentReportRestController.class;
+    }
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return getType();
+    }
+
+    /**
+     * Returns a defensive copy of the items included in this report.
+     *
+     * @return the items included in this report
+     */
+    public List<FilteredItemRest> getItems() {
+        return new ArrayList<>(items);
+    }
+
+    public long getItemCount() {
+        return itemCount;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/GroupRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/GroupRest.java
index 3f60b2d61f..0a4963b66f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/GroupRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/GroupRest.java
@@ -18,24 +18,14 @@ import org.dspace.app.rest.RestResourceController;
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 @LinksRest(links = {
-        @LinkRest(
-                name = GroupRest.SUBGROUPS,
-                method = "getGroups"
-        ),
-        @LinkRest(
-                name = GroupRest.EPERSONS,
-                method = "getMembers"
-        ),
-        @LinkRest(
-                name = GroupRest.OBJECT,
-                method = "getParentObject"
-        )
+    @LinkRest(name = GroupRest.SUBGROUPS, method = "getGroups"),
+    @LinkRest(name = GroupRest.EPERSONS, method = "getMembers"),
+    @LinkRest(name = GroupRest.OBJECT, method = "getParentObject")
 })
 public class GroupRest extends DSpaceObjectRest {
     public static final String NAME = "group";
+    public static final String PLURAL_NAME = "groups";
     public static final String CATEGORY = RestAddressableModel.EPERSON;
-
-    public static final String GROUPS = "groups";
     public static final String SUBGROUPS = "subgroups";
     public static final String EPERSONS = "epersons";
     public static final String OBJECT = "object";
@@ -54,6 +44,11 @@ public class GroupRest extends DSpaceObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvestedCollectionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvestedCollectionRest.java
index a4a0aac013..ae3711b950 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvestedCollectionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvestedCollectionRest.java
@@ -20,8 +20,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  */
 public class HarvestedCollectionRest extends BaseObjectRest<Integer> {
 
-    public static final String NAME = "collections";
-    public static final String CATEGORY = "core";
+    public static final String NAME = "harvestedcollection";
+    public static final String PLURAL_NAME = "harvestedcollections";
+    public static final String CATEGORY = RestModel.CORE;
 
     @JsonProperty("harvest_type")
     private HarvestTypeEnum harvestType;
@@ -70,6 +71,11 @@ public class HarvestedCollectionRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @JsonIgnore
     public CollectionRest getCollectionRest() {
         return this.collectionRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvesterMetadataRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvesterMetadataRest.java
index a32e901d74..f130f4a819 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvesterMetadataRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/HarvesterMetadataRest.java
@@ -21,8 +21,9 @@ import org.dspace.app.rest.HarvesterMetadataController;
  */
 public class HarvesterMetadataRest extends BaseObjectRest {
 
-    public static final String CATEGORY = "config";
+    public static final String CATEGORY = RestModel.CONFIGURATION;
     public static final String NAME = "harvesterMetadata";
+    public static final String PLURAL_NAME = NAME;
 
     private List<Map<String,String>> configs;
 
@@ -42,6 +43,14 @@ public class HarvesterMetadataRest extends BaseObjectRest {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
 
     public Class getController() {
         return HarvesterMetadataController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifierRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifierRest.java
index 6cfb147ea3..cf16184acc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifierRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifierRest.java
@@ -21,6 +21,7 @@ public class IdentifierRest extends BaseObjectRest<String> implements RestModel
     // Set names used in component wiring
     public static final String NAME = "identifier";
     public static final String PLURAL_NAME = "identifiers";
+    public static final String CATEGORY = RestModel.PID;
     private String value;
     private String identifierType;
     private String identifierStatus;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifiersRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifiersRest.java
index 169e40979c..5414ac10b6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifiersRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/IdentifiersRest.java
@@ -22,6 +22,8 @@ public class IdentifiersRest  extends BaseObjectRest<String> {
 
     // Set names used in component wiring
     public static final String NAME = "identifiers";
+    public static final String PLURAL_NAME = "identifiers";
+
     private List<IdentifierRest> identifiers;
 
     // Empty constructor
@@ -37,6 +39,11 @@ public class IdentifiersRest  extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public List<IdentifierRest> getIdentifiers() {
         return identifiers;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemFilterRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemFilterRest.java
new file mode 100644
index 0000000000..5d46c62522
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemFilterRest.java
@@ -0,0 +1,42 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The ItemFilter REST Resource
+ *
+ * @author mohamed eskander (mohamed.eskander at 4science.com)
+ */
+public class ItemFilterRest extends BaseObjectRest<String> {
+    public static final String NAME = "itemfilter";
+    public static final String PLURAL_NAME = "itemfilters";
+    public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
index 1254ef8f93..a47667441c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ItemRest.java
@@ -17,42 +17,16 @@ import com.fasterxml.jackson.annotation.JsonProperty;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = ItemRest.ACCESS_STATUS,
-                method = "getAccessStatus"
-        ),
-        @LinkRest(
-                name = ItemRest.BUNDLES,
-                method = "getBundles"
-        ),
-        @LinkRest(
-                name = ItemRest.IDENTIFIERS,
-                method = "getIdentifiers"
-        ),
-        @LinkRest(
-                name = ItemRest.MAPPED_COLLECTIONS,
-                method = "getMappedCollections"
-        ),
-        @LinkRest(
-                name = ItemRest.OWNING_COLLECTION,
-                method = "getOwningCollection"
-        ),
-        @LinkRest(
-                name = ItemRest.RELATIONSHIPS,
-                method = "getRelationships"
-        ),
-        @LinkRest(
-                name = ItemRest.VERSION,
-                method = "getItemVersion"
-        ),
-        @LinkRest(
-                name = ItemRest.TEMPLATE_ITEM_OF,
-                method = "getTemplateItemOf"
-        ),
-        @LinkRest(
-                name = ItemRest.THUMBNAIL,
-                method = "getThumbnail"
-        )
+    @LinkRest(name = ItemRest.ACCESS_STATUS, method = "getAccessStatus"),
+    @LinkRest(name = ItemRest.BUNDLES, method = "getBundles"),
+    @LinkRest(name = ItemRest.IDENTIFIERS, method = "getIdentifiers"),
+    @LinkRest(name = ItemRest.MAPPED_COLLECTIONS, method = "getMappedCollections"),
+    @LinkRest(name = ItemRest.OWNING_COLLECTION, method = "getOwningCollection"),
+    @LinkRest(name = ItemRest.RELATIONSHIPS, method = "getRelationships"),
+    @LinkRest(name = ItemRest.VERSION, method = "getItemVersion"),
+    @LinkRest(name = ItemRest.TEMPLATE_ITEM_OF, method = "getTemplateItemOf"),
+    @LinkRest(name = ItemRest.THUMBNAIL, method = "getThumbnail"),
+    @LinkRest(name = ItemRest.SUBMITTER, method = "getItemSubmitter")
 })
 public class ItemRest extends DSpaceObjectRest {
     public static final String NAME = "item";
@@ -69,6 +43,8 @@ public class ItemRest extends DSpaceObjectRest {
     public static final String TEMPLATE_ITEM_OF = "templateItemOf";
     public static final String THUMBNAIL = "thumbnail";
 
+    public static final String SUBMITTER = "submitter";
+
     private boolean inArchive = false;
     private boolean discoverable = false;
     private boolean withdrawn = false;
@@ -87,6 +63,11 @@ public class ItemRest extends DSpaceObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public boolean getInArchive() {
         return inArchive;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LDNMessageEntityRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LDNMessageEntityRest.java
new file mode 100644
index 0000000000..336f2c63c3
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LDNMessageEntityRest.java
@@ -0,0 +1,200 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Date;
+import java.util.UUID;
+
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The LDN Message REST resource.
+ * @author Stefano Maffei (stefano.maffei at 4science.com)
+ */
+@SuppressWarnings("serial")
+public class LDNMessageEntityRest extends BaseObjectRest<String> {
+
+    public static final String NAME = "message";
+    public static final String NAME_PLURALS = "messages";
+    public static final String CATEGORY = RestAddressableModel.LDN;
+
+    private String notificationId;
+
+    private Integer queueStatus;
+
+    private String queueStatusLabel;
+
+    private UUID context;
+
+    private UUID object;
+
+    private Integer target;
+
+    private Integer origin;
+
+    private String inReplyTo;
+
+    private String activityStreamType;
+
+    private String coarNotifyType;
+
+    private Integer queueAttempts;
+
+    private Date queueLastStartTime;
+
+    private Date queueTimeout;
+
+    private String notificationType;
+
+    private String message;
+
+    public LDNMessageEntityRest() {
+        super();
+    }
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return NAME_PLURALS;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public String getNotificationId() {
+        return notificationId;
+    }
+
+    public void setNotificationId(String notificationId) {
+        this.notificationId = notificationId;
+    }
+
+    public Integer getQueueStatus() {
+        return queueStatus;
+    }
+
+    public void setQueueStatus(Integer queueStatus) {
+        this.queueStatus = queueStatus;
+    }
+
+    public String getQueueStatusLabel() {
+        return queueStatusLabel;
+    }
+
+    public void setQueueStatusLabel(String queueStatusLabel) {
+        this.queueStatusLabel = queueStatusLabel;
+    }
+
+    public UUID getContext() {
+        return context;
+    }
+
+    public void setContext(UUID context) {
+        this.context = context;
+    }
+
+    public UUID getObject() {
+        return object;
+    }
+
+    public void setObject(UUID object) {
+        this.object = object;
+    }
+
+    public Integer getTarget() {
+        return target;
+    }
+
+    public void setTarget(Integer target) {
+        this.target = target;
+    }
+
+    public Integer getOrigin() {
+        return origin;
+    }
+
+    public void setOrigin(Integer source) {
+        this.origin = source;
+    }
+
+    public String getActivityStreamType() {
+        return activityStreamType;
+    }
+
+    public void setActivityStreamType(String activityStreamType) {
+        this.activityStreamType = activityStreamType;
+    }
+
+    public String getCoarNotifyType() {
+        return coarNotifyType;
+    }
+
+    public void setCoarNotifyType(String coarNotifyType) {
+        this.coarNotifyType = coarNotifyType;
+    }
+
+    public Integer getQueueAttempts() {
+        return queueAttempts;
+    }
+
+    public void setQueueAttempts(Integer queueAttempts) {
+        this.queueAttempts = queueAttempts;
+    }
+
+    public Date getQueueLastStartTime() {
+        return queueLastStartTime;
+    }
+
+    public void setQueueLastStartTime(Date queueLastStartTime) {
+        this.queueLastStartTime = queueLastStartTime;
+    }
+
+    public Date getQueueTimeout() {
+        return queueTimeout;
+    }
+
+    public void setQueueTimeout(Date queueTimeout) {
+        this.queueTimeout = queueTimeout;
+    }
+
+    public String getNotificationType() {
+        return notificationType;
+    }
+
+    public void setNotificationType(String notificationType) {
+        this.notificationType = notificationType;
+    }
+
+    public String getInReplyTo() {
+        return inReplyTo;
+    }
+
+    public void setInReplyTo(String inReplyTo) {
+        this.inReplyTo = inReplyTo;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public void setMessage(String message) {
+        this.message = message;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LicenseRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LicenseRest.java
index 8f8ea51086..863335ee88 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LicenseRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/LicenseRest.java
@@ -14,6 +14,8 @@ package org.dspace.app.rest.model;
  */
 public class LicenseRest implements RestModel {
     public static final String NAME = "license";
+    public static final String PLURAL_NAME = "licenses";
+
     private boolean custom = false;
     private String text;
 
@@ -37,4 +39,9 @@ public class LicenseRest implements RestModel {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java
index 4524f82a68..f73e51cb7e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataFieldRest.java
@@ -18,7 +18,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class MetadataFieldRest extends BaseObjectRest<Integer> {
     public static final String NAME = "metadatafield";
-    public static final String NAME_PLURAL = "metadatafields";
+    public static final String PLURAL_NAME = "metadatafields";
     public static final String CATEGORY = RestAddressableModel.CORE;
 
     @JsonIgnore
@@ -68,6 +68,11 @@ public class MetadataFieldRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java
index 655d4c86d8..c762ccc65b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/MetadataSchemaRest.java
@@ -17,6 +17,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class MetadataSchemaRest extends BaseObjectRest<Integer> {
     public static final String NAME = "metadataschema";
+    public static final String PLURAL_NAME = "metadataschemas";
     public static final String CATEGORY = RestAddressableModel.CORE;
 
     private String prefix;
@@ -45,6 +46,11 @@ public class MetadataSchemaRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyQAEventMessageRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyQAEventMessageRest.java
new file mode 100644
index 0000000000..e9acb3c775
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyQAEventMessageRest.java
@@ -0,0 +1,58 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+/**
+ * Implementation of {@link QAEventMessageRest} related to COAR NOTIFY events.
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class NotifyQAEventMessageRest implements QAEventMessageRest {
+
+    private String serviceName;
+
+    private String serviceId;
+
+    private String href;
+
+    private String relationship;
+
+    public String getServiceName() {
+        return serviceName;
+    }
+
+    public void setServiceName(String serviceName) {
+        this.serviceName = serviceName;
+    }
+
+    public String getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(String serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public String getHref() {
+        return href;
+    }
+
+    public void setHref(String href) {
+        this.href = href;
+    }
+
+    public String getRelationship() {
+        return relationship;
+    }
+
+    public void setRelationship(String relationship) {
+        this.relationship = relationship;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyRequestStatusRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyRequestStatusRest.java
new file mode 100644
index 0000000000..c8b5070de3
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyRequestStatusRest.java
@@ -0,0 +1,83 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import org.dspace.app.ldn.model.RequestStatus;
+import org.dspace.app.rest.NotifyRequestStatusRestController;
+
+
+/**
+ * Rest entity for LDN requests targeting items
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+@JsonPropertyOrder(value = {
+    "notifyStatus",
+    "itemuuid"
+})
+public class NotifyRequestStatusRest extends RestAddressableModel {
+
+    private static final long serialVersionUID = 1L;
+    public static final String CATEGORY = RestAddressableModel.LDN;
+    public static final String NAME = "notifyrequests";
+    public static final String PLURAL_NAME = "notifyrequests";
+
+    private List<RequestStatus> notifyStatus;
+    private UUID itemuuid;
+
+    public NotifyRequestStatusRest(NotifyRequestStatusRest instance) {
+        this.notifyStatus = instance.getNotifyStatus();
+    }
+
+    public NotifyRequestStatusRest() {
+        this.notifyStatus = new ArrayList<RequestStatus>();
+    }
+
+    public UUID getItemuuid() {
+        return itemuuid;
+    }
+
+    public void setItemuuid(UUID itemuuid) {
+        this.itemuuid = itemuuid;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    public Class getController() {
+        return NotifyRequestStatusRestController.class;
+    }
+
+    public List<RequestStatus> getNotifyStatus() {
+        return notifyStatus;
+    }
+
+    public void setNotifyStatus(List<RequestStatus> notifyStatus) {
+        this.notifyStatus = notifyStatus;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyServiceInboundPatternRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyServiceInboundPatternRest.java
new file mode 100644
index 0000000000..4309083869
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyServiceInboundPatternRest.java
@@ -0,0 +1,57 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+
+/**
+ * representation of the Notify Service Inbound Pattern
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceInboundPatternRest {
+
+    /**
+     * https://notify.coar-repositories.org/patterns/
+     */
+    private String pattern;
+
+    /**
+     * the id of a bean implementing the ItemFilter
+     */
+    private String constraint;
+
+    /**
+     * means that the pattern is triggered automatically
+     * by dspace if the item respect the filter
+     */
+    private boolean automatic;
+
+    public String getPattern() {
+        return pattern;
+    }
+
+    public void setPattern(String pattern) {
+        this.pattern = pattern;
+    }
+
+    public String getConstraint() {
+        return constraint;
+    }
+
+    public void setConstraint(String constraint) {
+        this.constraint = constraint;
+    }
+
+    public boolean isAutomatic() {
+        return automatic;
+    }
+
+    public void setAutomatic(boolean automatic) {
+        this.automatic = automatic;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyServiceRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyServiceRest.java
new file mode 100644
index 0000000000..8a50c913d5
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/NotifyServiceRest.java
@@ -0,0 +1,129 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The NotifyServiceEntity REST Resource
+ *
+ * @author mohamed eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceRest extends BaseObjectRest<Integer> {
+    public static final String NAME = "ldnservice";
+    public static final String PLURAL_NAME = "ldnservices";
+    public static final String CATEGORY = RestAddressableModel.LDN;
+
+    private String name;
+    private String description;
+    private String url;
+    private String ldnUrl;
+    private boolean enabled;
+    private BigDecimal score;
+    private String lowerIp;
+    private String upperIp;
+
+    private List<NotifyServiceInboundPatternRest> notifyServiceInboundPatterns;
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getLdnUrl() {
+        return ldnUrl;
+    }
+
+    public void setLdnUrl(String ldnUrl) {
+        this.ldnUrl = ldnUrl;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+    public List<NotifyServiceInboundPatternRest> getNotifyServiceInboundPatterns() {
+        return notifyServiceInboundPatterns;
+    }
+
+    public void setNotifyServiceInboundPatterns(
+        List<NotifyServiceInboundPatternRest> notifyServiceInboundPatterns) {
+        this.notifyServiceInboundPatterns = notifyServiceInboundPatterns;
+    }
+
+    public BigDecimal getScore() {
+        return score;
+    }
+
+    public void setScore(BigDecimal score) {
+        this.score = score;
+    }
+
+    public String getLowerIp() {
+        return lowerIp;
+    }
+
+    public void setLowerIp(String lowerIp) {
+        this.lowerIp = lowerIp;
+    }
+
+    public String getUpperIp() {
+        return upperIp;
+    }
+
+    public void setUpperIp(String upperIp) {
+        this.upperIp = upperIp;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OpenaireQAEventMessageRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OpenaireQAEventMessageRest.java
new file mode 100644
index 0000000000..53976b49b6
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OpenaireQAEventMessageRest.java
@@ -0,0 +1,115 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Implementation of {@link QAEventMessageRest} related to OPENAIRE events.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class OpenaireQAEventMessageRest implements QAEventMessageRest {
+
+    // pids
+    private String type;
+
+    private String value;
+
+    private String pidHref;
+
+    // abstract
+    @JsonProperty(value = "abstract")
+    private String abstractValue;
+
+    // project
+    private String openaireId;
+
+    private String acronym;
+
+    private String code;
+
+    private String funder;
+
+    private String fundingProgram;
+
+    private String jurisdiction;
+
+    private String title;
+
+    public String getType() {
+        return type;
+    }
+    public void setType(String type) {
+        this.type = type;
+    }
+    public String getValue() {
+        return value;
+    }
+    public void setValue(String value) {
+        this.value = value;
+    }
+    public String getAbstractValue() {
+        return abstractValue;
+    }
+    public void setAbstractValue(String abstractValue) {
+        this.abstractValue = abstractValue;
+    }
+    public String getOpenaireId() {
+        return openaireId;
+    }
+    public void setOpenaireId(String openaireId) {
+        this.openaireId = openaireId;
+    }
+    public String getAcronym() {
+        return acronym;
+    }
+    public void setAcronym(String acronym) {
+        this.acronym = acronym;
+    }
+    public String getCode() {
+        return code;
+    }
+    public void setCode(String code) {
+        this.code = code;
+    }
+    public String getFunder() {
+        return funder;
+    }
+    public void setFunder(String funder) {
+        this.funder = funder;
+    }
+    public String getFundingProgram() {
+        return fundingProgram;
+    }
+    public void setFundingProgram(String fundingProgram) {
+        this.fundingProgram = fundingProgram;
+    }
+    public String getJurisdiction() {
+        return jurisdiction;
+    }
+    public void setJurisdiction(String jurisdiction) {
+        this.jurisdiction = jurisdiction;
+    }
+    public String getTitle() {
+        return title;
+    }
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getPidHref() {
+        return pidHref;
+    }
+
+    public void setPidHref(String pidHref) {
+        this.pidHref = pidHref;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java
index 02e0f47062..433d5626ca 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidHistoryRest.java
@@ -25,6 +25,7 @@ public class OrcidHistoryRest extends BaseObjectRest<Integer> {
 
     public static final String CATEGORY = RestModel.EPERSON;
     public static final String NAME = "orcidhistory";
+    public static final String PLURAL_NAME = "orcidhistories";
 
     private UUID profileItemId;
 
@@ -38,7 +39,7 @@ public class OrcidHistoryRest extends BaseObjectRest<Integer> {
 
     private String responseMessage;
 
-    public OrcidHistoryRest(){}
+    public OrcidHistoryRest() {}
 
     @Override
     @JsonProperty(access = JsonProperty.Access.READ_ONLY)
@@ -46,6 +47,11 @@ public class OrcidHistoryRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java
index ba7c300628..13a0b474b6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/OrcidQueueRest.java
@@ -35,6 +35,11 @@ public class OrcidQueueRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ParameterValueRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ParameterValueRest.java
index 6c236fa176..72bfeb8a83 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ParameterValueRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ParameterValueRest.java
@@ -10,7 +10,7 @@ package org.dspace.app.rest.model;
 import org.apache.commons.lang3.StringUtils;
 
 /**
- * This class serves as a REST representation for a paramater with a value given to the script
+ * This class serves as a REST representation for a parameter with a value given to the script
  */
 public class ParameterValueRest {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PoolTaskRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PoolTaskRest.java
index c32c2c9578..94c7003733 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PoolTaskRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PoolTaskRest.java
@@ -17,10 +17,7 @@ import org.dspace.xmlworkflow.storedcomponents.PoolTask;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = PoolTaskRest.STEP,
-        method = "getStep"
-    )
+    @LinkRest(name = PoolTaskRest.STEP, method = "getStep")
 })
 public class PoolTaskRest extends BaseObjectRest<Integer> {
     public static final String NAME = "pooltask";
@@ -50,6 +47,11 @@ public class PoolTaskRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PotentialDuplicateRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PotentialDuplicateRest.java
new file mode 100644
index 0000000000..9d706a8d57
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PotentialDuplicateRest.java
@@ -0,0 +1,199 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.UUID;
+
+/**
+ * REST Model defining a Potential Duplicate for serialisation to JSON
+ * This is used in lists of potential duplicates for submission section data and item link / embeds.
+ *
+ * @author Kim Shepherd
+ */
+public class PotentialDuplicateRest extends RestAddressableModel {
+
+    public static final String CATEGORY = RestModel.SUBMISSION;
+    public static final String NAME = RestModel.DUPLICATES;
+
+    /**
+     * Type of REST resource
+     */
+    private static final String TYPE = "DUPLICATE";
+    /**
+     * Plural type of REST resource
+     */
+    private static final String TYPE_PLURAL = "DUPLICATES";
+    /**
+     * Title of duplicate object
+     */
+    private String title;
+    /**
+     * UUID of duplicate object
+     */
+    private UUID uuid;
+    /**
+     * Owning collection name (title) for duplicate item
+     */
+    private String owningCollectionName;
+    /**
+     * Workspace item ID, if the duplicate is a workspace item
+     */
+    private Integer workspaceItemId;
+    /**
+     * Workflow item ID, if the duplicate is a workflow item
+     */
+    private Integer workflowItemId;
+    /**
+     * List of configured metadata copied across from the duplicate item
+     */
+    private MetadataRest metadata;
+
+    /**
+     * Default constructor
+     */
+    public PotentialDuplicateRest() {
+    }
+
+    /**
+     * Get UUID of duplicate item
+     * @return UUID of duplicate item
+     */
+    public UUID getUuid() {
+        return uuid;
+    }
+
+    /**
+     * Set UUID of duplicate item
+     * @param uuid UUID of duplicate item
+     */
+    public void setUuid(UUID uuid) {
+        this.uuid = uuid;
+    }
+
+    /**
+     * Get title of duplicate item
+     * @return title of duplicate item
+     */
+    public String getTitle() {
+        return title;
+    }
+
+    /**
+     * Set title of duplicate item
+     * @param title of duplicate item
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    /**
+     * Get owning collection name (title) of duplicate item
+     * @return owning collection name (title) of duplicate item
+     */
+    public String getOwningCollectionName() {
+        return owningCollectionName;
+    }
+
+    /**
+     * Set owning collection name (title) of duplicate item
+     * @param owningCollectionName owning collection name (title) of duplicate item
+     */
+    public void setOwningCollectionName(String owningCollectionName) {
+        this.owningCollectionName = owningCollectionName;
+    }
+
+    /**
+     * Get metadata (sorted, field->value list) for duplicate item
+     * @return (sorted, field->value list) for duplicate item
+     */
+    public MetadataRest getMetadata() {
+        return metadata;
+    }
+
+    /**
+     * Set metadata (sorted, field->value list) for duplicate item
+     * @param metadata MetadataRest list of values mapped to field keys
+     */
+    public void setMetadata(MetadataRest metadata) {
+        this.metadata = metadata;
+    }
+
+    /**
+     * Get workspace ID for duplicate item, if any
+     * @return workspace item ID or null
+     */
+    public Integer getWorkspaceItemId() {
+        return workspaceItemId;
+    }
+
+    /**
+     * Set workspace ID for duplicate item
+     * @param workspaceItemId workspace item ID
+     */
+    public void setWorkspaceItemId(Integer workspaceItemId) {
+        this.workspaceItemId = workspaceItemId;
+    }
+
+    /**
+     * Get workflow ID for duplicate item, if anh
+     * @return workflow item ID or null
+     */
+    public Integer getWorkflowItemId() {
+        return workflowItemId;
+    }
+
+    /**
+     * Set workflow ID for duplicate item
+     * @param workflowItemId workspace item ID
+     */
+    public void setWorkflowItemId(Integer workflowItemId) {
+        this.workflowItemId = workflowItemId;
+    }
+
+    /**
+     * Get REST resource type name
+     * @return REST resource type (see static final string)
+     */
+    @Override
+    public String getType() {
+        return TYPE;
+    }
+
+    /**
+     * Get REST resource type plural name
+     * @return REST resource type plural name (see static final string)
+     */
+    @Override
+    public String getTypePlural() {
+        return TYPE_PLURAL;
+    }
+
+    /**
+     * Get REST resource category.
+     * Not implemented as this model is intended for use only as an ItemLink repository and submission section data,
+     * it is actually a simple RestModel but has to 'implement' RestAddressableModel to serialize correctly
+     *
+     * @return null (not implemented)
+     */
+    @Override
+    public String getCategory() {
+        return null;
+    }
+
+    /**
+     * Get REST controller for this model.
+     * Not implemented as this model is intended for use only as an ItemLink repository and submission section data,
+     * it is actually a simple RestModel but has to 'implement' RestAddressableModel to serialize correctly
+     *
+     * @return null (not implemented)
+     */
+    @Override
+    public Class getController() {
+        return null;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessFileTypesRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessFileTypesRest.java
index ecceea107e..eec9390388 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessFileTypesRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessFileTypesRest.java
@@ -65,4 +65,9 @@ public class ProcessFileTypesRest extends BaseObjectRest<String> {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessRest.java
index 8216e16171..fee104b4e3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ProcessRest.java
@@ -21,18 +21,9 @@ import org.dspace.scripts.Process;
  * This class serves as a REST representation for the {@link Process} class
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = ProcessRest.FILES,
-        method = "getFilesFromProcess"
-    ),
-    @LinkRest(
-        name = ProcessRest.FILE_TYPES,
-        method = "getFileTypesFromProcess"
-    ),
-    @LinkRest(
-        name = ProcessRest.OUTPUT,
-        method = "getOutputFromProcess"
-    )
+    @LinkRest(name = ProcessRest.FILES, method = "getFilesFromProcess"),
+    @LinkRest(name = ProcessRest.FILE_TYPES, method = "getFileTypesFromProcess"),
+    @LinkRest(name = ProcessRest.OUTPUT, method = "getOutputFromProcess")
 })
 public class ProcessRest extends BaseObjectRest<Integer> {
     public static final String NAME = "process";
@@ -55,11 +46,17 @@ public class ProcessRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private String scriptName;
     private UUID userId;
     private Integer processId;
     private Date startTime;
     private Date endTime;
+    private Date creationTime;
     private ProcessStatus processStatus;
     @JsonProperty(value = "parameters")
     private List<ParameterValueRest> parameterRestList;
@@ -104,6 +101,14 @@ public class ProcessRest extends BaseObjectRest<Integer> {
         this.startTime = startTime;
     }
 
+    public Date getCreationTime() {
+        return creationTime;
+    }
+
+    public void setCreationTime(Date creationTime) {
+        this.creationTime = creationTime;
+    }
+
     public String getScriptName() {
         return scriptName;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PropertyRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PropertyRest.java
index 365a679019..c0e846fbb1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PropertyRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/PropertyRest.java
@@ -18,6 +18,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class PropertyRest extends BaseObjectRest<String> {
     public static final String NAME = "property";
+    public static final String PLURAL_NAME = "properties";
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
     public String getName() {
@@ -59,4 +60,9 @@ public class PropertyRest extends BaseObjectRest<String> {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QAEventMessageRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QAEventMessageRest.java
new file mode 100644
index 0000000000..cc460f604c
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QAEventMessageRest.java
@@ -0,0 +1,18 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+/**
+ * Interface for classes that model a message with the details of a QA event.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public interface QAEventMessageRest {
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QAEventRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QAEventRest.java
new file mode 100644
index 0000000000..5a74d33531
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QAEventRest.java
@@ -0,0 +1,142 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Date;
+
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * QA event Rest object.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@LinksRest(
+        links = {
+            @LinkRest(name = "topic", method = "getTopic"),
+            @LinkRest(name = "target", method = "getTarget"),
+            @LinkRest(name = "related", method = "getRelated")
+        })
+public class QAEventRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = -5001130073350654793L;
+    public static final String NAME = "qualityassuranceevent";
+    public static final String PLURAL_NAME = "qualityassuranceevents";
+    public static final String CATEGORY = RestAddressableModel.INTEGRATION;
+
+    public static final String TOPIC = "topic";
+    public static final String TARGET = "target";
+    public static final String RELATED = "related";
+    private String source;
+    private String originalId;
+    private String title;
+    private String topic;
+    private String trust;
+    private Date eventDate;
+    private QAEventMessageRest message;
+    private String status;
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getOriginalId() {
+        return originalId;
+    }
+
+    public void setOriginalId(String originalId) {
+        this.originalId = originalId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public String getTrust() {
+        return trust;
+    }
+
+    public void setTrust(String trust) {
+        this.trust = trust;
+    }
+
+    public Date getEventDate() {
+        return eventDate;
+    }
+
+    public void setEventDate(Date eventDate) {
+        this.eventDate = eventDate;
+    }
+
+    public QAEventMessageRest getMessage() {
+        return message;
+    }
+
+    public void setMessage(QAEventMessageRest message) {
+        this.message = message;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * @return the source
+     */
+    public String getSource() {
+        return source;
+    }
+
+    /**
+     * @param source the source to set
+     */
+    public void setSource(String source) {
+        this.source = source;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QASourceRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QASourceRest.java
new file mode 100644
index 0000000000..f62bd19f2d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QASourceRest.java
@@ -0,0 +1,66 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Date;
+
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * REST Representation of a quality assurance broker source
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4Science)
+ *
+ */
+public class QASourceRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = -7455358581579629244L;
+
+    public static final String NAME = "qualityassurancesource";
+    public static final String PLURAL_NAME = "qualityassurancesources";
+    public static final String CATEGORY = RestAddressableModel.INTEGRATION;
+
+    private Date lastEvent;
+    private long totalEvents;
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public Date getLastEvent() {
+        return lastEvent;
+    }
+
+    public void setLastEvent(Date lastEvent) {
+        this.lastEvent = lastEvent;
+    }
+
+    public long getTotalEvents() {
+        return totalEvents;
+    }
+
+    public void setTotalEvents(long totalEvents) {
+        this.totalEvents = totalEvents;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QATopicRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QATopicRest.java
new file mode 100644
index 0000000000..54bf3c8141
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/QATopicRest.java
@@ -0,0 +1,84 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.Date;
+
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * REST Representation of a quality assurance broker topic
+ * 
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QATopicRest extends BaseObjectRest<String> {
+
+    private static final long serialVersionUID = -7455358581579629244L;
+
+    public static final String NAME = "qualityassurancetopic";
+    public static final String PLURAL_NAME = "qualityassurancetopics";
+    public static final String CATEGORY = RestAddressableModel.INTEGRATION;
+
+    private String id;
+    private String name;
+    private Date lastEvent;
+    private long totalEvents;
+
+    @Override
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Date getLastEvent() {
+        return lastEvent;
+    }
+
+    public void setLastEvent(Date lastEvent) {
+        this.lastEvent = lastEvent;
+    }
+
+    public long getTotalEvents() {
+        return totalEvents;
+    }
+
+    public void setTotalEvents(long totalEvents) {
+        this.totalEvents = totalEvents;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RegistrationRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RegistrationRest.java
index e8397f8ca7..eb7c58a18c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RegistrationRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RegistrationRest.java
@@ -21,7 +21,7 @@ import org.dspace.app.rest.RestResourceController;
 public class RegistrationRest extends RestAddressableModel {
 
     public static final String NAME = "registration";
-    public static final String NAME_PLURAL = "registrations";
+    public static final String PLURAL_NAME = "registrations";
     public static final String CATEGORY = EPERSON;
 
     private String email;
@@ -74,4 +74,9 @@ public class RegistrationRest extends RestAddressableModel {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
index dd35a0726e..723f7e148b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipRest.java
@@ -19,14 +19,12 @@ import org.dspace.app.rest.RestResourceController;
  * Refer to {@link org.dspace.content.Relationship} for explanation about the properties
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = RelationshipRest.RELATIONSHIP_TYPE,
-        method = "getRelationshipType"
-    )
+    @LinkRest(name = RelationshipRest.RELATIONSHIP_TYPE, method = "getRelationshipType")
 })
 public class RelationshipRest extends BaseObjectRest<Integer> {
     public static final String NAME = "relationship";
-    public static final String CATEGORY = "core";
+    public static final String PLURAL_NAME = "relationships";
+    public static final String CATEGORY = RestModel.CORE;
 
     public static final String RELATIONSHIP_TYPE = "relationshipType";
 
@@ -47,6 +45,11 @@ public class RelationshipRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getCategory() {
         return CATEGORY;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipTypeRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipTypeRest.java
index e3943643a5..48a9cf499a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipTypeRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RelationshipTypeRest.java
@@ -18,7 +18,8 @@ import org.dspace.app.rest.RestResourceController;
 public class RelationshipTypeRest extends BaseObjectRest<Integer> {
 
     public static final String NAME = "relationshiptype";
-    public static final String CATEGORY = "core";
+    public static final String PLURAL_NAME = "relationshiptypes";
+    public static final String CATEGORY = RestModel.CORE;
 
     private String leftwardType;
     private String rightwardType;
@@ -35,6 +36,11 @@ public class RelationshipTypeRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getCategory() {
         return CATEGORY;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RequestItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RequestItemRest.java
index 616a2d631d..677405bda0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RequestItemRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RequestItemRest.java
@@ -21,11 +21,10 @@ import org.dspace.app.rest.RestResourceController;
 @LinksRest(links = {
     @LinkRest(name = "bitstream", method = "getUuid"),
     @LinkRest(name = "item", method = "getUuid")
-    })
-public class RequestItemRest
-        extends BaseObjectRest<Integer> {
+})
+public class RequestItemRest extends BaseObjectRest<Integer> {
     public static final String NAME = "itemrequest";
-    public static final String PLURAL_NAME = NAME + "s";
+    public static final String PLURAL_NAME = "itemrequests";
 
     public static final String CATEGORY = RestAddressableModel.TOOLS;
 
@@ -230,6 +229,6 @@ public class RequestItemRest
 
     @Override
     public String getTypePlural() {
-        return super.getTypePlural();
+        return PLURAL_NAME;
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java
index 4224cfeeb9..629dbdf858 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResearcherProfileRest.java
@@ -20,14 +20,15 @@ import org.dspace.app.rest.RestResourceController;
  *
  */
 @LinksRest(links = {
-        @LinkRest(name = ResearcherProfileRest.ITEM, method = "getItem"),
-        @LinkRest(name = ResearcherProfileRest.EPERSON, method = "getEPerson")
+    @LinkRest(name = ResearcherProfileRest.ITEM, method = "getItem"),
+    @LinkRest(name = ResearcherProfileRest.EPERSON, method = "getEPerson")
 })
 public class ResearcherProfileRest extends BaseObjectRest<UUID> {
 
     private static final long serialVersionUID = 1L;
     public static final String CATEGORY = RestModel.EPERSON;
     public static final String NAME = "profile";
+    public static final String PLURAL_NAME = "profiles";
 
     public static final String ITEM = "item";
     public static final String EPERSON = "eperson";
@@ -69,6 +70,11 @@ public class ResearcherProfileRest extends BaseObjectRest<UUID> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
@@ -129,4 +135,4 @@ public class ResearcherProfileRest extends BaseObjectRest<UUID> {
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResourcePolicyRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResourcePolicyRest.java
index a75c17b136..564782c251 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResourcePolicyRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ResourcePolicyRest.java
@@ -63,6 +63,11 @@ public class ResourcePolicyRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RestModel.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RestModel.java
index 5bc85a58b2..72aae3b25a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RestModel.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RestModel.java
@@ -10,7 +10,6 @@ package org.dspace.app.rest.model;
 import java.io.Serializable;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import org.atteo.evo.inflector.English;
 
 /**
  * A REST resource directly or indirectly (in a collection) exposed must have at
@@ -21,9 +20,11 @@ import org.atteo.evo.inflector.English;
 public interface RestModel extends Serializable {
 
     public static final String ROOT = "root";
+    public static final String CONTENT_REPORT = "contentreport";
     public static final String CORE = "core";
     public static final String EPERSON = "eperson";
     public static final String DISCOVER = "discover";
+    public static final String DUPLICATES = "duplicates";
     public static final String CONFIGURATION = "config";
     public static final String INTEGRATION = "integration";
     public static final String STATISTICS = "statistics";
@@ -34,11 +35,11 @@ public interface RestModel extends Serializable {
     public static final String VERSIONING = "versioning";
     public static final String AUTHENTICATION = "authn";
     public static final String TOOLS = "tools";
+    public static final String LDN = "ldn";
+    public static final String PID = "pid";
 
     public String getType();
 
     @JsonIgnore
-    default public String getTypePlural() {
-        return English.plural(getType());
-    }
+    String getTypePlural();
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RootRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RootRest.java
index cef8965601..a4ca592cd5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RootRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/RootRest.java
@@ -16,6 +16,7 @@ import org.dspace.app.rest.RootRestResourceController;
  */
 public class RootRest extends RestAddressableModel {
     public static final String NAME = "root";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.ROOT;
     private String dspaceUI;
     private String dspaceName;
@@ -30,6 +31,14 @@ public class RootRest extends RestAddressableModel {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return RootRestResourceController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ScriptRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ScriptRest.java
index e9c0eb4203..58c68b37bd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ScriptRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ScriptRest.java
@@ -39,6 +39,11 @@ public class ScriptRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getName() {
         return name;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchConfigurationRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchConfigurationRest.java
index b25d827e75..f8a6e698d1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchConfigurationRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchConfigurationRest.java
@@ -22,6 +22,7 @@ import org.dspace.discovery.configuration.DiscoverySearchFilter;
 public class SearchConfigurationRest extends BaseObjectRest<String> {
 
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
     @JsonIgnore
     private String scope;
@@ -41,6 +42,14 @@ public class SearchConfigurationRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return DiscoveryRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchEventRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchEventRest.java
index 46827711f2..d2a61ef8c0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchEventRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchEventRest.java
@@ -19,6 +19,7 @@ import org.dspace.app.rest.RestResourceController;
 public class SearchEventRest extends BaseObjectRest<UUID> {
 
     public static final String NAME = "searchevent";
+    public static final String PLURAL_NAME = "searchevents";
     public static final String CATEGORY = RestAddressableModel.STATISTICS;
 
     private String query;
@@ -43,6 +44,11 @@ public class SearchEventRest extends BaseObjectRest<UUID> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getQuery() {
         return query;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetEntryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetEntryRest.java
index 513b4ad54a..aafa3a1108 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetEntryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetEntryRest.java
@@ -21,6 +21,7 @@ import org.dspace.discovery.configuration.DiscoverySearchFilterFacet;
 public class SearchFacetEntryRest extends RestAddressableModel {
 
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
 
     private String name;
@@ -54,6 +55,14 @@ public class SearchFacetEntryRest extends RestAddressableModel {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return DiscoveryRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetValueRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetValueRest.java
index 3f5be08712..97860eff4c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetValueRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchFacetValueRest.java
@@ -16,6 +16,7 @@ import org.dspace.app.rest.DiscoveryRestController;
 public class SearchFacetValueRest extends RestAddressableModel {
 
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
 
     private String label;
@@ -36,6 +37,14 @@ public class SearchFacetValueRest extends RestAddressableModel {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return DiscoveryRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchResultEntryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchResultEntryRest.java
index ac1d94f5f5..ac4918833c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchResultEntryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchResultEntryRest.java
@@ -20,6 +20,7 @@ import org.dspace.app.rest.DiscoveryRestController;
 public class SearchResultEntryRest extends RestAddressableModel {
 
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
 
     private Map<String, List<String>> hitHighlights;
@@ -35,6 +36,14 @@ public class SearchResultEntryRest extends RestAddressableModel {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @JsonIgnore
     public Class getController() {
         return DiscoveryRestController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchSupportRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchSupportRest.java
index 52c07ab13a..a0743b8cbb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchSupportRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SearchSupportRest.java
@@ -16,6 +16,7 @@ import org.dspace.app.rest.DiscoveryRestController;
  */
 public class SearchSupportRest extends BaseObjectRest<String> {
     public static final String NAME = "discover";
+    public static final String PLURAL_NAME = NAME;
     public static final String CATEGORY = RestModel.DISCOVER;
 
     public String getCategory() {
@@ -26,6 +27,14 @@ public class SearchSupportRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    /**
+     * The plural name is the same as the singular name
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public Class getController() {
         return DiscoveryRestController.class;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SiteRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SiteRest.java
index 533ad47df0..6217505edb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SiteRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SiteRest.java
@@ -17,6 +17,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
  */
 public class SiteRest extends DSpaceObjectRest {
     public static final String NAME = "site";
+    public static final String PLURAL_NAME = "sites";
     public static final String CATEGORY = RestAddressableModel.CORE;
 
     @Override
@@ -29,6 +30,11 @@ public class SiteRest extends DSpaceObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public boolean equals(Object object) {
         return (object instanceof SiteRest &&
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/StatisticsSupportRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/StatisticsSupportRest.java
index 55df71e8e6..e2d42c60a9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/StatisticsSupportRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/StatisticsSupportRest.java
@@ -12,6 +12,7 @@ import org.dspace.app.rest.StatisticsRestController;
 public class StatisticsSupportRest extends BaseObjectRest<String> {
 
     public static final String NAME = "statistics";
+    public static final String PLURAL_NAME = "statistics";
     public static final String CATEGORY = RestModel.STATISTICS;
 
     public String getCategory() {
@@ -25,4 +26,9 @@ public class StatisticsSupportRest extends BaseObjectRest<String> {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return null;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionAccessOptionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionAccessOptionRest.java
index 08f4c82f43..ad8fa68cdb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionAccessOptionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionAccessOptionRest.java
@@ -23,7 +23,7 @@ public class SubmissionAccessOptionRest extends BaseObjectRest<String> {
     private static final long serialVersionUID = -7708437586052984082L;
 
     public static final String NAME = "submissionaccessoption";
-    public static final String PLURAL = "submissionaccessoptions";
+    public static final String PLURAL_NAME = "submissionaccessoptions";
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
     private String id;
@@ -64,6 +64,11 @@ public class SubmissionAccessOptionRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
@@ -76,4 +81,4 @@ public class SubmissionAccessOptionRest extends BaseObjectRest<String> {
         return RestResourceController.class;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseRest.java
index 23589d5a46..7cc3c124d5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseRest.java
@@ -20,7 +20,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class SubmissionCCLicenseRest extends BaseObjectRest<String> {
     public static final String NAME = "submissioncclicense";
-    public static final String PLURAL = "submissioncclicenses";
+    public static final String PLURAL_NAME = "submissioncclicenses";
 
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
@@ -66,6 +66,11 @@ public class SubmissionCCLicenseRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     @JsonIgnore
     public Class getController() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseUrlRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseUrlRest.java
index 77263ba317..409cad5f52 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseUrlRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCCLicenseUrlRest.java
@@ -17,7 +17,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class SubmissionCCLicenseUrlRest extends BaseObjectRest<String> {
     public static final String NAME = "submissioncclicenseUrl";
-    public static final String PLURAL = "submissioncclicenseUrls";
+    public static final String PLURAL_NAME = "submissioncclicenseUrls";
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
 
@@ -47,6 +47,11 @@ public class SubmissionCCLicenseUrlRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return SubmissionCCLicenseUrlRest.CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCOARNotifyRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCOARNotifyRest.java
new file mode 100644
index 0000000000..3767186f76
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionCOARNotifyRest.java
@@ -0,0 +1,70 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dspace.app.rest.RestResourceController;
+import org.dspace.coarnotify.NotifyPattern;
+import org.dspace.coarnotify.NotifySubmissionConfiguration;
+/**
+ * This class is the REST representation of the COARNotifySubmissionConfiguration model object
+ * and acts as a data object for the SubmissionCOARNotifyResource class.
+ *
+ * Refer to {@link NotifySubmissionConfiguration} for explanation of the properties
+ */
+public class SubmissionCOARNotifyRest extends BaseObjectRest<String> {
+    public static final String NAME = "submissioncoarnotifyconfig";
+    public static final String PLURAL_NAME = "submissioncoarnotifyconfigs";
+    public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
+
+    private String id;
+
+    private List<NotifyPattern> patterns;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(final String id) {
+        this.id = id;
+    }
+
+    public List<NotifyPattern> getPatterns() {
+        return patterns;
+    }
+
+    public void setPatterns(final List<NotifyPattern> patterns) {
+        this.patterns = patterns;
+    }
+
+    @JsonIgnore
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    @JsonProperty(access = JsonProperty.Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    @JsonIgnore
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionDefinitionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionDefinitionRest.java
index fb440345c2..958701b5d6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionDefinitionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionDefinitionRest.java
@@ -20,6 +20,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class SubmissionDefinitionRest extends BaseObjectRest<String> {
     public static final String NAME = "submissiondefinition";
+    public static final String PLURAL_NAME = "submissiondefinitions";
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
     private String name;
@@ -59,6 +60,11 @@ public class SubmissionDefinitionRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public void setDefaultConf(boolean isDefault) {
         this.defaultConf = isDefault;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormRest.java
index 8dededdabb..5ef3c87fb3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionFormRest.java
@@ -18,6 +18,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class SubmissionFormRest extends BaseObjectRest<String> {
     public static final String NAME = "submissionform";
+    public static final String PLURAL_NAME = "submissionforms";
     public static final String NAME_LINK_ON_PANEL = RestAddressableModel.CONFIGURATION;
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
@@ -61,6 +62,11 @@ public class SubmissionFormRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionSectionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionSectionRest.java
index 55f7fc035a..9c5a1c8629 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionSectionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionSectionRest.java
@@ -23,6 +23,7 @@ import org.dspace.app.rest.RestResourceController;
 public class SubmissionSectionRest extends BaseObjectRest<String> {
 
     public static final String NAME = "submissionsection";
+    public static final String PLURAL_NAME = "submissionsections";
     public static final String ATTRIBUTE_NAME = "sections";
 
     private String header;
@@ -51,6 +52,11 @@ public class SubmissionSectionRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public ScopeEnum getScope() {
         return scope;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
index 4d8504fa0b..48d01a86d7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubmissionUploadRest.java
@@ -21,6 +21,7 @@ import org.dspace.app.rest.RestResourceController;
 public class SubmissionUploadRest extends BaseObjectRest<String> {
 
     public static final String NAME = "submissionupload";
+    public static final String PLURAL_NAME = "submissionuploads";
     public static final String NAME_LINK_ON_PANEL = RestAddressableModel.CONFIGURATION;
     public static final String CATEGORY = RestAddressableModel.CONFIGURATION;
 
@@ -53,6 +54,11 @@ public class SubmissionUploadRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubscriptionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubscriptionRest.java
index 78a81c38b1..bec1be5fc0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubscriptionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SubscriptionRest.java
@@ -21,8 +21,8 @@ public class SubscriptionRest extends BaseObjectRest<Integer> {
     private static final long serialVersionUID = 1L;
 
     public static final String NAME = "subscription";
-    public static final String NAME_PLURAL = "subscriptions";
-    public static final String CATEGORY = "core";
+    public static final String PLURAL_NAME = "subscriptions";
+    public static final String CATEGORY = RestModel.CORE;
     public static final String DSPACE_OBJECT = "resource";
     public static final String EPERSON = "eperson";
 
@@ -45,6 +45,11 @@ public class SubscriptionRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public void setSubscriptionType(String type) {
         this.subscriptionType = type;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionRest.java
new file mode 100644
index 0000000000..7b1a05127f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionRest.java
@@ -0,0 +1,122 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The Suggestion REST Resource. A suggestion is an object, usually a
+ * publication, proposed by a source related to a specific Person (target) to be
+ * imported in the system.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@LinksRest(links = {
+    @LinkRest(name = SuggestionRest.TARGET, method = "getTarget")
+})
+public class SuggestionRest extends BaseObjectRest<String> {
+    private static final long serialVersionUID = 1L;
+    public static final String NAME = "suggestion";
+    public static final String PLURAL_NAME = "suggestions";
+    public static final String TARGET = "target";
+    public static final String CATEGORY = RestAddressableModel.INTEGRATION;
+
+    private String display;
+    private String source;
+    private String externalSourceUri;
+    private String score;
+    private Map<String, EvidenceRest> evidences = new HashMap<String, EvidenceRest>();
+    private MetadataRest metadata = new MetadataRest();
+
+    @Override
+    @JsonProperty(access = Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(String display) {
+        this.display = display;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public String getExternalSourceUri() {
+        return externalSourceUri;
+    }
+
+    public void setExternalSourceUri(String externalSourceUri) {
+        this.externalSourceUri = externalSourceUri;
+    }
+
+    public void setScore(String score) {
+        this.score = score;
+    }
+
+    public String getScore() {
+        return score;
+    }
+
+    public Map<String, EvidenceRest> getEvidences() {
+        return evidences;
+    }
+
+    public void setEvidences(Map<String, EvidenceRest> evidences) {
+        this.evidences = evidences;
+    }
+
+    public MetadataRest getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(MetadataRest metadata) {
+        this.metadata = metadata;
+    }
+
+    /** 
+     * inner class to encapsulate score & notes
+     * and map {@link SuggestionEvidence}
+     * */
+    public static class EvidenceRest {
+        public String score;
+        public String notes;
+        public EvidenceRest(String score, String notes) {
+            this.score = score;
+            this.notes = notes;
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionSourceRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionSourceRest.java
new file mode 100644
index 0000000000..f8cc0e603f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionSourceRest.java
@@ -0,0 +1,57 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The Suggestion Source REST Resource. A suggestion source is a connector to an
+ * external system that provides suggestion for a target object of related
+ * objects to be imported in the system.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+public class SuggestionSourceRest extends BaseObjectRest<String> {
+    private static final long serialVersionUID = 1L;
+    public static final String CATEGORY = RestAddressableModel.INTEGRATION;
+    public static final String NAME = "suggestionsource";
+    public static final String PLURAL_NAME = "suggestionsources";
+
+    private int total;
+
+    @Override
+    @JsonProperty(access = Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionTargetRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionTargetRest.java
new file mode 100644
index 0000000000..b6518eff74
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SuggestionTargetRest.java
@@ -0,0 +1,79 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty.Access;
+import org.dspace.app.rest.RestResourceController;
+
+/**
+ * The Suggestion Target REST Resource. A suggestion target is a Person to whom
+ * one or more suggester sources have found related objects to be importe in the
+ * system.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@LinksRest(links = {
+    @LinkRest(name = SuggestionTargetRest.TARGET, method = "getTarget")
+})
+public class SuggestionTargetRest extends BaseObjectRest<String> {
+    private static final long serialVersionUID = 1L;
+    public static final String NAME = "suggestiontarget";
+    public static final String PLURAL_NAME = "suggestiontargets";
+    public static final String TARGET = "target";
+    public static final String CATEGORY = RestAddressableModel.INTEGRATION;
+
+    private String display;
+    private String source;
+    private int total;
+
+    @Override
+    @JsonProperty(access = Access.READ_ONLY)
+    public String getType() {
+        return NAME;
+    }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
+    @Override
+    public String getCategory() {
+        return CATEGORY;
+    }
+
+    @Override
+    public Class getController() {
+        return RestResourceController.class;
+    }
+
+    public String getDisplay() {
+        return display;
+    }
+
+    public void setDisplay(String display) {
+        this.display = display;
+    }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SupervisionOrderRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SupervisionOrderRest.java
index e114fdeb39..f5e75f1751 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SupervisionOrderRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SupervisionOrderRest.java
@@ -19,6 +19,7 @@ import org.dspace.supervision.SupervisionOrder;
 public class SupervisionOrderRest extends BaseObjectRest<Integer> {
 
     public static final String NAME = "supervisionorder";
+    public static final String PLURAL_NAME = "supervisionorders";
     public static final String CATEGORY = RestAddressableModel.CORE;
 
     private Integer id;
@@ -69,4 +70,9 @@ public class SupervisionOrderRest extends BaseObjectRest<Integer> {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SystemWideAlertRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SystemWideAlertRest.java
index 995ec8e934..b0f3e9da4e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SystemWideAlertRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/SystemWideAlertRest.java
@@ -19,6 +19,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class SystemWideAlertRest extends BaseObjectRest<Integer> {
     public static final String NAME = "systemwidealert";
+    public static final String PLURAL_NAME = "systemwidealerts";
     public static final String CATEGORY = RestAddressableModel.SYSTEM;
 
     public String getCategory() {
@@ -34,6 +35,11 @@ public class SystemWideAlertRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     private Integer alertId;
     private String message;
     private String allowSessions;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/TemplateItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/TemplateItemRest.java
index cc6b11d12a..d48c713d64 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/TemplateItemRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/TemplateItemRest.java
@@ -21,6 +21,7 @@ public class TemplateItemRest extends BaseObjectRest<UUID> {
     private UUID uuid;
 
     public static final String NAME = "itemtemplate";
+    public static final String PLURAL_NAME = "itemtemplates";
     public static final String CATEGORY = RestAddressableModel.CORE;
     @JsonIgnore
     private CollectionRest templateItemOf;
@@ -67,6 +68,11 @@ public class TemplateItemRest extends BaseObjectRest<UUID> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public UUID getId() {
         return uuid;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCityRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCityRest.java
index 369bcce4d1..0198aaf0cc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCityRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCityRest.java
@@ -15,12 +15,18 @@ package org.dspace.app.rest.model;
  */
 public class UsageReportPointCityRest extends UsageReportPointRest {
     public static final String NAME = "city";
+    public static final String PLURAL_NAME = "cities";
 
     @Override
     public String getType() {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public void setId(String id) {
         super.id = id;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCountryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCountryRest.java
index 1d6723503e..fbfe9b9ee6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCountryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointCountryRest.java
@@ -19,6 +19,7 @@ import org.dspace.statistics.util.LocationUtils;
  */
 public class UsageReportPointCountryRest extends UsageReportPointRest {
     public static final String NAME = "country";
+    public static final String PLURAL_NAME = "countries";
 
     @Override
     public void setLabel(String label) {
@@ -36,4 +37,9 @@ public class UsageReportPointCountryRest extends UsageReportPointRest {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDateRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDateRest.java
index e9b4ddea15..d3ccb0163d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDateRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDateRest.java
@@ -15,12 +15,18 @@ package org.dspace.app.rest.model;
  */
 public class UsageReportPointDateRest extends UsageReportPointRest {
     public static final String NAME = "date";
+    public static final String PLURAL_NAME = "dates";
 
     @Override
     public String getType() {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public void setId(String id) {
         super.id = id;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDsoTotalVisitsRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDsoTotalVisitsRest.java
index fd8d334786..721d0b8dc2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDsoTotalVisitsRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointDsoTotalVisitsRest.java
@@ -7,6 +7,8 @@
  */
 package org.dspace.app.rest.model;
 
+import org.atteo.evo.inflector.English;
+
 /**
  * This class serves as a REST representation of a TotalVisit data Point of a DSO's {@link UsageReportRest} from the
  * DSpace statistics
@@ -25,6 +27,11 @@ public class UsageReportPointDsoTotalVisitsRest extends UsageReportPointRest {
         return this.type;
     }
 
+    @Override
+    public String getTypePlural() {
+        return English.plural(getType());
+    }
+
     /**
      * Sets the type of this {@link UsageReportPointRest} object, should be type of dso concerned (e.g. item, bitstream, ...)
      *
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointRest.java
index feb006486f..50a8fc46ba 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportPointRest.java
@@ -17,8 +17,9 @@ import org.dspace.app.rest.RestResourceController;
  *
  * @author Maria Verdonck (Atmire) on 08/06/2020
  */
-public class UsageReportPointRest extends BaseObjectRest<String> {
+public abstract class UsageReportPointRest extends BaseObjectRest<String> {
     public static final String NAME = "point";
+    public static final String PLURAL_NAME = "points";
     public static final String CATEGORY = RestModel.STATISTICS;
     protected String id;
     protected String label;
@@ -54,6 +55,16 @@ public class UsageReportPointRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    /**
+     * Returns the plural type of this {@link UsageReportPointRest} object
+     *
+     * @return Plural type of this {@link UsageReportPointRest} object
+     */
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     /**
      * Returns the values of this {@link UsageReportPointRest} object, containing the amount of views
      *
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportRest.java
index a59535fb94..a8b267daaf 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/UsageReportRest.java
@@ -20,6 +20,7 @@ import org.dspace.app.rest.RestResourceController;
  */
 public class UsageReportRest extends BaseObjectRest<String> {
     public static final String NAME = "usagereport";
+    public static final String PLURAL_NAME = "usagereports";
     public static final String CATEGORY = RestModel.STATISTICS;
 
     @JsonProperty(value = "report-type")
@@ -56,6 +57,11 @@ public class UsageReportRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     /**
      * Returns the report type of this UsageReport, options listed in
      * {@link org.dspace.app.rest.utils.UsageReportUtils}, e.g.
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionHistoryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionHistoryRest.java
index e93e131aad..80f704c779 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionHistoryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionHistoryRest.java
@@ -13,14 +13,8 @@ import org.dspace.app.rest.RestResourceController;
  * The REST object for the {@link org.dspace.versioning.VersionHistory} object
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = VersionHistoryRest.VERSIONS,
-        method = "getVersions"
-        ),
-        @LinkRest(
-                name = VersionHistoryRest.DRAFT_VERSION,
-                method = "getDraftVersion"
-        )
+    @LinkRest(name = VersionHistoryRest.VERSIONS, method = "getVersions"),
+    @LinkRest(name = VersionHistoryRest.DRAFT_VERSION, method = "getDraftVersion")
 })
 public class VersionHistoryRest extends BaseObjectRest<Integer> {
 
@@ -32,6 +26,7 @@ public class VersionHistoryRest extends BaseObjectRest<Integer> {
     private Boolean draftVersion;
 
     public static final String NAME = "versionhistory";
+    public static final String PLURAL_NAME = "versionhistories";
     public static final String CATEGORY = RestAddressableModel.VERSIONING;
     public static final String VERSIONS = "versions";
     public static final String DRAFT_VERSION = "draftVersion";
@@ -51,6 +46,11 @@ public class VersionHistoryRest extends BaseObjectRest<Integer> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     /**
      * Generic getter for the id
      * @return the id value of this VersionHistoryRest
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionRest.java
index abdc64295f..d9ebdd67e4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VersionRest.java
@@ -16,18 +16,13 @@ import org.dspace.app.rest.RestResourceController;
  * The REST object for the {@link org.dspace.versioning.Version} objects
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = VersionRest.VERSION_HISTORY,
-        method = "getVersionHistory"
-    ),
-    @LinkRest(
-        name = VersionRest.ITEM,
-        method = "getVersionItem"
-    )
+    @LinkRest(name = VersionRest.VERSION_HISTORY, method = "getVersionHistory"),
+    @LinkRest(name = VersionRest.ITEM, method = "getVersionItem")
 })
 public class VersionRest extends BaseObjectRest<Integer> {
 
     public static final String NAME = "version";
+    public static final String PLURAL_NAME = "versions";
     public static final String CATEGORY = RestAddressableModel.VERSIONING;
 
     public static final String VERSION_HISTORY = "versionhistory";
@@ -137,4 +132,9 @@ public class VersionRest extends BaseObjectRest<Integer> {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ViewEventRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ViewEventRest.java
index 897a3f86ae..2806f7ed87 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ViewEventRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/ViewEventRest.java
@@ -19,6 +19,7 @@ import org.dspace.app.rest.RestResourceController;
 public class ViewEventRest extends BaseObjectRest<UUID> {
 
     public static final String NAME = "viewevent";
+    public static final String PLURAL_NAME = "viewevents";
     public static final String CATEGORY = RestAddressableModel.STATISTICS;
 
     private UUID targetId;
@@ -67,4 +68,9 @@ public class ViewEventRest extends BaseObjectRest<UUID> {
     public String getType() {
         return NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryDetailsRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryDetailsRest.java
index 30e5eb71cb..884e14642c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryDetailsRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryDetailsRest.java
@@ -18,9 +18,9 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(name = VocabularyEntryDetailsRest.PARENT, method = "getParent"),
-        @LinkRest(name = VocabularyEntryDetailsRest.CHILDREN, method = "getChildren")
-        })
+    @LinkRest(name = VocabularyEntryDetailsRest.PARENT, method = "getParent"),
+    @LinkRest(name = VocabularyEntryDetailsRest.CHILDREN, method = "getChildren")
+})
 public class VocabularyEntryDetailsRest extends BaseObjectRest<String> {
     public static final String PLURAL_NAME = "vocabularyEntryDetails";
     public static final String NAME = "vocabularyEntryDetail";
@@ -82,6 +82,11 @@ public class VocabularyEntryDetailsRest extends BaseObjectRest<String> {
         return VocabularyEntryDetailsRest.NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryRest.java
index 713d4c5209..3977026efa 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyEntryRest.java
@@ -20,6 +20,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include;
  */
 public class VocabularyEntryRest implements RestModel {
     public static final String NAME = "vocabularyEntry";
+    public static final String PLURAL_NAME = "vocabularyEntries";
 
     @JsonInclude(Include.NON_NULL)
     private String authority;
@@ -77,4 +78,9 @@ public class VocabularyEntryRest implements RestModel {
     public String getType() {
         return VocabularyEntryRest.NAME;
     }
+
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyRest.java
index cc848b945b..a54d93c643 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/VocabularyRest.java
@@ -15,13 +15,12 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-    @LinkRest(name = VocabularyRest.ENTRIES,
-            method = "filter"
-    ),
+    @LinkRest(name = VocabularyRest.ENTRIES, method = "filter"),
 })
 public class VocabularyRest extends BaseObjectRest<String> {
 
     public static final String NAME = "vocabulary";
+    public static final String PLURAL_NAME = "vocabularies";
     public static final String CATEGORY = RestAddressableModel.SUBMISSION;
     public static final String ENTRIES = "entries";
 
@@ -75,6 +74,11 @@ public class VocabularyRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowActionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowActionRest.java
index 07a2c36cff..c240bee2fb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowActionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowActionRest.java
@@ -21,9 +21,9 @@ import org.dspace.xmlworkflow.state.actions.ActionAdvancedInfo;
  */
 public class WorkflowActionRest extends BaseObjectRest<String> {
 
-    public static final String CATEGORY = "config";
+    public static final String CATEGORY = RestModel.CONFIGURATION;
     public static final String NAME = "workflowaction";
-    public static final String NAME_PLURAL = "workflowactions";
+    public static final String PLURAL_NAME = "workflowactions";
 
     private List<String> options;
     private List<String> advancedOptions;
@@ -44,6 +44,11 @@ public class WorkflowActionRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public List<String> getOptions() {
         return options;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowDefinitionRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowDefinitionRest.java
index 7c2de7071b..9cef79aaf3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowDefinitionRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowDefinitionRest.java
@@ -18,20 +18,14 @@ import org.dspace.app.rest.RestResourceController;
  * @author Maria Verdonck (Atmire) on 11/12/2019
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = WorkflowDefinitionRest.COLLECTIONS_MAPPED_TO,
-        method = "getCollections"
-    ),
-    @LinkRest(
-        name = WorkflowDefinitionRest.STEPS,
-        method = "getSteps"
-    )
+    @LinkRest(name = WorkflowDefinitionRest.COLLECTIONS_MAPPED_TO, method = "getCollections"),
+    @LinkRest(name = WorkflowDefinitionRest.STEPS, method = "getSteps")
 })
 public class WorkflowDefinitionRest extends BaseObjectRest<String> {
 
-    public static final String CATEGORY = "config";
+    public static final String CATEGORY = RestModel.CONFIGURATION;
     public static final String NAME = "workflowdefinition";
-    public static final String NAME_PLURAL = "workflowdefinitions";
+    public static final String PLURAL_NAME = "workflowdefinitions";
 
     public static final String COLLECTIONS_MAPPED_TO = "collections";
     public static final String STEPS = "steps";
@@ -55,6 +49,11 @@ public class WorkflowDefinitionRest extends BaseObjectRest<String> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     @JsonIgnore
     public String getId() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowItemRest.java
index 4a840a0bb7..d08abb3546 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowItemRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowItemRest.java
@@ -15,25 +15,14 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-        @LinkRest(
-                name = WorkflowItemRest.STEP,
-                method = "getStep"
-        ),
-        @LinkRest(
-                name = WorkflowItemRest.SUBMITTER,
-                method = "getWorkflowItemSubmitter"
-        ),
-        @LinkRest(
-                name = WorkflowItemRest.ITEM,
-                method = "getWorkflowItemItem"
-        ),
-        @LinkRest(
-                name = WorkflowItemRest.COLLECTION,
-                method = "getWorkflowItemCollection"
-        )
+    @LinkRest(name = WorkflowItemRest.STEP, method = "getStep"),
+    @LinkRest(name = WorkflowItemRest.SUBMITTER, method = "getWorkflowItemSubmitter"),
+    @LinkRest(name = WorkflowItemRest.ITEM, method = "getWorkflowItemItem"),
+    @LinkRest(name = WorkflowItemRest.COLLECTION, method = "getWorkflowItemCollection")
 })
 public class WorkflowItemRest extends AInprogressSubmissionRest {
     public static final String NAME = "workflowitem";
+    public static final String PLURAL_NAME = "workflowitems";
     public static final String CATEGORY = RestAddressableModel.WORKFLOW;
 
     public static final String STEP = "step";
@@ -53,6 +42,11 @@ public class WorkflowItemRest extends AInprogressSubmissionRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowStepRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowStepRest.java
index 648cffbca8..53ddf38709 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowStepRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkflowStepRest.java
@@ -18,16 +18,13 @@ import org.dspace.app.rest.RestResourceController;
  * @author Maria Verdonck (Atmire) on 10/01/2020
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = WorkflowStepRest.ACTIONS,
-        method = "getActions"
-    ),
+    @LinkRest(name = WorkflowStepRest.ACTIONS, method = "getActions"),
 })
 public class WorkflowStepRest extends BaseObjectRest {
 
-    public static final String CATEGORY = "config";
+    public static final String CATEGORY = RestModel.CONFIGURATION;
     public static final String NAME = "workflowstep";
-    public static final String NAME_PLURAL = "workflowsteps";
+    public static final String PLURAL_NAME = "workflowsteps";
 
     public static final String ACTIONS = "workflowactions";
 
@@ -48,6 +45,11 @@ public class WorkflowStepRest extends BaseObjectRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @JsonIgnore
     public List<WorkflowActionRest> getWorkflowactions() {
         return workflowactions;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java
index b40d1a4494..8e0d52123f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/WorkspaceItemRest.java
@@ -15,25 +15,14 @@ import org.dspace.app.rest.RestResourceController;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @LinksRest(links = {
-    @LinkRest(
-        name = WorkspaceItemRest.SUPERVISION_ORDERS,
-        method = "getSupervisionOrders"
-    ),
-    @LinkRest(
-        name = WorkspaceItemRest.SUBMITTER,
-        method = "getWorkspaceItemSubmitter"
-    ),
-    @LinkRest(
-        name = WorkspaceItemRest.ITEM,
-        method = "getWorkspaceItemItem"
-    ),
-    @LinkRest(
-        name = WorkspaceItemRest.COLLECTION,
-        method = "getWorkspaceItemCollection"
-    )
+    @LinkRest(name = WorkspaceItemRest.SUPERVISION_ORDERS, method = "getSupervisionOrders"),
+    @LinkRest(name = WorkspaceItemRest.SUBMITTER, method = "getWorkspaceItemSubmitter"),
+    @LinkRest(name = WorkspaceItemRest.ITEM, method = "getWorkspaceItemItem"),
+    @LinkRest(name = WorkspaceItemRest.COLLECTION, method = "getWorkspaceItemCollection")
 })
 public class WorkspaceItemRest extends AInprogressSubmissionRest {
     public static final String NAME = "workspaceitem";
+    public static final String PLURAL_NAME = "workspaceitems";
     public static final String CATEGORY = RestAddressableModel.SUBMISSION;
 
     public static final String SUPERVISION_ORDERS = "supervisionOrders";
@@ -51,6 +40,11 @@ public class WorkspaceItemRest extends AInprogressSubmissionRest {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public Class getController() {
         return RestResourceController.class;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/BrowseIndexResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/BrowseIndexResource.java
index 61158704ea..de3c605139 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/BrowseIndexResource.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/BrowseIndexResource.java
@@ -10,7 +10,6 @@ package org.dspace.app.rest.model.hateoas;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.linkTo;
 import static org.springframework.hateoas.server.mvc.WebMvcLinkBuilder.methodOn;
 
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.RestResourceController;
 import org.dspace.app.rest.model.BrowseIndexRest;
 import org.dspace.app.rest.model.VocabularyRest;
@@ -47,13 +46,13 @@ public class BrowseIndexResource extends DSpaceResource<BrowseIndexRest> {
         }
         if (bix.getBrowseType().equals(BrowseIndexRest.BROWSE_TYPE_HIERARCHICAL)) {
             ChoiceAuthorityService choiceAuthorityService =
-                    ContentAuthorityServiceFactory.getInstance().getChoiceAuthorityService();
+                ContentAuthorityServiceFactory.getInstance().getChoiceAuthorityService();
             ChoiceAuthority source = choiceAuthorityService.getChoiceAuthorityByAuthorityName(bix.getVocabulary());
             UriComponentsBuilder baseLink = linkTo(
-                    methodOn(RestResourceController.class, VocabularyRest.AUTHENTICATION).findRel(null,
-                            null, VocabularyRest.CATEGORY,
-                            English.plural(VocabularyRest.NAME), source.getPluginInstanceName(),
-                            "", null, null)).toUriComponentsBuilder();
+                methodOn(RestResourceController.class, VocabularyRest.AUTHENTICATION).findRel(
+                    null, null, VocabularyRest.CATEGORY, VocabularyRest.PLURAL_NAME,
+                    source.getPluginInstanceName(), "", null, null)
+            ).toUriComponentsBuilder();
 
             add(Link.of(baseLink.build().encode().toUriString(), BrowseIndexRest.LINK_VOCABULARY));
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ContentReportSupportResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ContentReportSupportResource.java
new file mode 100644
index 0000000000..363a5e704a
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ContentReportSupportResource.java
@@ -0,0 +1,18 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.ContentReportSupportRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+
+@RelNameDSpaceResource(ContentReportSupportRest.NAME)
+public class ContentReportSupportResource extends HALResource<ContentReportSupportRest> {
+    public ContentReportSupportResource(ContentReportSupportRest content) {
+        super(content);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/CorrectionTypeResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/CorrectionTypeResource.java
new file mode 100644
index 0000000000..cb1ba5552f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/CorrectionTypeResource.java
@@ -0,0 +1,27 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.CorrectionTypeRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * CorrectionType Rest HAL Resource. The HAL Resource wraps the REST Resource
+ * adding support for the links and embedded resources
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@RelNameDSpaceResource(CorrectionTypeRest.NAME)
+public class CorrectionTypeResource extends DSpaceResource<CorrectionTypeRest> {
+
+    public CorrectionTypeResource(CorrectionTypeRest target, Utils utils) {
+        super(target, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/FilteredCollectionsResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/FilteredCollectionsResource.java
new file mode 100644
index 0000000000..9bb2346485
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/FilteredCollectionsResource.java
@@ -0,0 +1,21 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.FilteredCollectionsRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+@RelNameDSpaceResource(FilteredCollectionsRest.NAME)
+public class FilteredCollectionsResource extends DSpaceResource<FilteredCollectionsRest> {
+
+    public FilteredCollectionsResource(FilteredCollectionsRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/FilteredItemsResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/FilteredItemsResource.java
new file mode 100644
index 0000000000..8758b9db5a
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/FilteredItemsResource.java
@@ -0,0 +1,21 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.FilteredItemsRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+@RelNameDSpaceResource(FilteredItemsRest.NAME)
+public class FilteredItemsResource extends DSpaceResource<FilteredItemsRest> {
+
+    public FilteredItemsResource(FilteredItemsRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ItemFilterResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ItemFilterResource.java
new file mode 100644
index 0000000000..666531e816
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/ItemFilterResource.java
@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.ItemFilterRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * ItemFilter Rest HAL Resource. The HAL Resource wraps the REST Resource adding
+ * support for the links and embedded resources
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@RelNameDSpaceResource(ItemFilterRest.NAME)
+public class ItemFilterResource extends DSpaceResource<ItemFilterRest> {
+    public ItemFilterResource(ItemFilterRest data, Utils utils) {
+        super(data, utils);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/LDNMessageEntityResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/LDNMessageEntityResource.java
new file mode 100644
index 0000000000..2ac899fa4b
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/LDNMessageEntityResource.java
@@ -0,0 +1,27 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.LDNMessageEntityRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * Browse Entry Rest HAL Resource. The HAL Resource wraps the REST Resource
+ * adding support for the links and embedded resources
+ *
+ * @author Stefano Maffei (stefano.maffei at 4science.com)
+ */
+@RelNameDSpaceResource(LDNMessageEntityRest.NAME)
+public class LDNMessageEntityResource extends DSpaceResource<LDNMessageEntityRest> {
+
+    public LDNMessageEntityResource(LDNMessageEntityRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/NotifyServiceResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/NotifyServiceResource.java
new file mode 100644
index 0000000000..8b2cf509d7
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/NotifyServiceResource.java
@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.NotifyServiceRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * NotifyService Rest HAL Resource. The HAL Resource wraps the REST Resource adding
+ * support for the links and embedded resources
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@RelNameDSpaceResource(NotifyServiceRest.NAME)
+public class NotifyServiceResource extends DSpaceResource<NotifyServiceRest> {
+    public NotifyServiceResource(NotifyServiceRest data, Utils utils) {
+        super(data, utils);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/PotentialDuplicateResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/PotentialDuplicateResource.java
new file mode 100644
index 0000000000..e753126133
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/PotentialDuplicateResource.java
@@ -0,0 +1,22 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.PotentialDuplicateRest;
+
+/**
+ *
+ * Wrap PotentialDuplicatesRest REST resource in a very simple HALResource class
+ *
+ * @author Kim Shepherd <kim@shepherd.nz>
+ */
+public class PotentialDuplicateResource extends HALResource<PotentialDuplicateRest> {
+    public PotentialDuplicateResource(PotentialDuplicateRest data) {
+        super(data);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QAEventResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QAEventResource.java
new file mode 100644
index 0000000000..43e1584a25
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QAEventResource.java
@@ -0,0 +1,27 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * QA event Rest resource.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@RelNameDSpaceResource(QAEventRest.NAME)
+public class QAEventResource extends DSpaceResource<QAEventRest> {
+
+    public QAEventResource(QAEventRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QASourceResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QASourceResource.java
new file mode 100644
index 0000000000..860e16cee3
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QASourceResource.java
@@ -0,0 +1,27 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.QASourceRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * QA source Rest resource.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4Science)
+ *
+ */
+@RelNameDSpaceResource(QASourceRest.NAME)
+public class QASourceResource extends DSpaceResource<QASourceRest> {
+
+    public QASourceResource(QASourceRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QATopicResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QATopicResource.java
new file mode 100644
index 0000000000..139d1e59eb
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/QATopicResource.java
@@ -0,0 +1,27 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.QATopicRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * QA topic Rest resource.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@RelNameDSpaceResource(QATopicRest.NAME)
+public class QATopicResource extends DSpaceResource<QATopicRest> {
+
+    public QATopicResource(QATopicRest data, Utils utils) {
+        super(data, utils);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SubmissionCOARNotifyResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SubmissionCOARNotifyResource.java
new file mode 100644
index 0000000000..b49451f8e8
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SubmissionCOARNotifyResource.java
@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.SubmissionCOARNotifyRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * COARNotify HAL Resource. This resource adds the data from the REST object together with embedded objects
+ * and a set of links if applicable
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@RelNameDSpaceResource(SubmissionCOARNotifyRest.NAME)
+public class SubmissionCOARNotifyResource extends DSpaceResource<SubmissionCOARNotifyRest> {
+    public SubmissionCOARNotifyResource(SubmissionCOARNotifyRest submissionCOARNotifyRest, Utils utils) {
+        super(submissionCOARNotifyRest, utils);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionResource.java
new file mode 100644
index 0000000000..66165f8698
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionResource.java
@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.SuggestionRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * Suggestion Rest HAL Resource. The HAL Resource wraps the REST Resource
+ * adding support for the links and embedded resources
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@RelNameDSpaceResource(SuggestionRest.NAME)
+public class SuggestionResource extends DSpaceResource<SuggestionRest> {
+    public SuggestionResource(SuggestionRest target, Utils utils) {
+        super(target, utils);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionSourceResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionSourceResource.java
new file mode 100644
index 0000000000..1f01f27d86
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionSourceResource.java
@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.SuggestionSourceRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * Suggestion Source Rest HAL Resource. The HAL Resource wraps the REST Resource
+ * adding support for the links and embedded resources
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@RelNameDSpaceResource(SuggestionSourceRest.NAME)
+public class SuggestionSourceResource extends DSpaceResource<SuggestionSourceRest> {
+    public SuggestionSourceResource(SuggestionSourceRest target, Utils utils) {
+        super(target, utils);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionTargetResource.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionTargetResource.java
new file mode 100644
index 0000000000..26cd7c3c34
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/hateoas/SuggestionTargetResource.java
@@ -0,0 +1,25 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.hateoas;
+
+import org.dspace.app.rest.model.SuggestionTargetRest;
+import org.dspace.app.rest.model.hateoas.annotations.RelNameDSpaceResource;
+import org.dspace.app.rest.utils.Utils;
+
+/**
+ * Suggestion Target Rest HAL Resource. The HAL Resource wraps the REST Resource
+ * adding support for the links and embedded resources
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+@RelNameDSpaceResource(SuggestionTargetRest.NAME)
+public class SuggestionTargetResource extends DSpaceResource<SuggestionTargetRest> {
+    public SuggestionTargetResource(SuggestionTargetRest target, Utils utils) {
+        super(target, utils);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/patch/JsonValueEvaluator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/patch/JsonValueEvaluator.java
index 07d488f518..67127ccf8f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/patch/JsonValueEvaluator.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/patch/JsonValueEvaluator.java
@@ -7,10 +7,9 @@
  */
 package org.dspace.app.rest.model.patch;
 
-import javax.annotation.Nonnull;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.annotation.Nonnull;
 import org.springframework.data.rest.webmvc.json.patch.PatchException;
 
 /**
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/query/RestSearchOperator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/query/RestSearchOperator.java
index ae8713bc69..9dba4021b4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/query/RestSearchOperator.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/query/RestSearchOperator.java
@@ -23,18 +23,18 @@ import java.util.regex.Pattern;
 public enum RestSearchOperator {
 
     /**
-     * The notcontains operator can be used by adding a - (minus) infront of the search query
+     * The notcontains operator can be used by adding a - (minus) in front of the search query
      * and a * at the end
      * It then becomes -VALUE* to call for a search on the notcontains operator for VALUE
      */
     NOTCONTAINS("-(.+)\\*", "notcontains"),
     /**
-     * The notauthority operator can be used by adding a -id: infront of the search query
+     * The notauthority operator can be used by adding a -id: in front of the search query
      * It then becomes -id:VALUE to call for a search on the notauthority operator for VALUE
      */
     NOTAUTHORITY("-id:(.+)", "notauthority"),
     /**
-     * The notequals operator can be used by adding a - infront of the search query
+     * The notequals operator can be used by adding a - in front of the search query
      * It then becomes -VALUE to call for a search on the notequals operator for VALUE
      */
     NOTEQUALS("-(.+)", "notequals"),
@@ -44,7 +44,7 @@ public enum RestSearchOperator {
      */
     CONTAINS("(.+)\\*", "contains"),
     /**
-     * The authority operator can be used by adding an id: infront of the search query
+     * The authority operator can be used by adding an id: in front of the search query
      * It then becomes id:VALUE to call for a search on the authority operator for VALUE
      */
     AUTHORITY("id:(.+)", "authority"),
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataDuplicateDetection.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataDuplicateDetection.java
new file mode 100644
index 0000000000..9506e9676e
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataDuplicateDetection.java
@@ -0,0 +1,46 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.step;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonUnwrapped;
+import org.dspace.app.rest.model.PotentialDuplicateRest;
+
+/**
+ * Section data model for potential duplicate items detected during submission
+ * 
+ * @author Kim Shepherd
+ */
+public class DataDuplicateDetection implements SectionData {
+    public DataDuplicateDetection() {
+    }
+
+    /**
+     * A list of potential duplicate items found by DuplicateDetectionService, in their REST model form
+     */
+    @JsonUnwrapped
+    private List<PotentialDuplicateRest> potentialDuplicates;
+
+    /**
+     * Return the list of detected potential duplicates in REST model form
+     * @return list of potential duplicate REST models
+     */
+    public List<PotentialDuplicateRest> getPotentialDuplicates() {
+        return potentialDuplicates;
+    }
+
+    /**
+     * Set list of potential duplicates.
+     * @see org.dspace.app.rest.converter.PotentialDuplicateConverter
+     * @param potentialDuplicates list of potential duplicates
+     */
+    public void setPotentialDuplicates(List<PotentialDuplicateRest> potentialDuplicates) {
+        this.potentialDuplicates = potentialDuplicates;
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataIdentifiers.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataIdentifiers.java
index 01e0eabdd3..f0eeaf2c22 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataIdentifiers.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataIdentifiers.java
@@ -20,7 +20,7 @@ import org.dspace.app.rest.model.IdentifierRest;
 public class DataIdentifiers implements SectionData {
     // Map of identifier types and values
     List<IdentifierRest> identifiers;
-    // Types to display, a hint for te UI
+    // Types to display, a hint for the UI
     List<String> displayTypes;
 
     public DataIdentifiers() {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataNotify.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataNotify.java
new file mode 100644
index 0000000000..0ae1fa5717
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataNotify.java
@@ -0,0 +1,49 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.model.step;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Java Bean to expose the COAR Notify Section during in progress submission.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class DataNotify implements SectionData {
+
+    private Map<String, List<Integer>> patterns = new HashMap<>();
+
+    public DataNotify() {
+
+    }
+
+    @JsonAnySetter
+    public void add(String key, List<Integer> values) {
+        patterns.put(key, values);
+    }
+
+    public DataNotify(Map<String, List<Integer>> patterns) {
+        this.patterns = patterns;
+    }
+
+    @JsonIgnore
+    public void setPatterns(Map<String, List<Integer>> patterns) {
+        this.patterns = patterns;
+    }
+
+    @JsonAnyGetter
+    public Map<String, List<Integer>> getPatterns() {
+        return patterns;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataUpload.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataUpload.java
index d1cbdeb4b4..a28a5f3ad3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataUpload.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/step/DataUpload.java
@@ -9,6 +9,7 @@ package org.dspace.app.rest.model.step;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.UUID;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
@@ -19,6 +20,11 @@ import com.fasterxml.jackson.annotation.JsonUnwrapped;
  */
 public class DataUpload implements SectionData {
 
+    /*
+     * primary bitstream uuid
+     */
+    private UUID primary;
+
     @JsonUnwrapped
     private List<UploadBitstreamRest> files;
 
@@ -32,4 +38,13 @@ public class DataUpload implements SectionData {
     public void setFiles(List<UploadBitstreamRest> files) {
         this.files = files;
     }
+
+    public UUID getPrimary() {
+        return primary;
+    }
+
+    public void setPrimary(UUID primary) {
+        this.primary = primary;
+    }
+
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/wrapper/SubmissionCCLicenseUrl.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/wrapper/SubmissionCCLicenseUrl.java
index 68ff1166b4..9024779b03 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/wrapper/SubmissionCCLicenseUrl.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/model/wrapper/SubmissionCCLicenseUrl.java
@@ -16,7 +16,7 @@ package org.dspace.app.rest.model.wrapper;
 public class SubmissionCCLicenseUrl {
 
     /**
-     * The url for ths object
+     * The url for this object
      */
     private String url;
     /**
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/Projection.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/Projection.java
index 19b67d851d..42314897a8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/Projection.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/projection/Projection.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.projection;
 
-import javax.persistence.Entity;
-
+import jakarta.persistence.Entity;
 import org.dspace.app.rest.model.LinkRest;
 import org.dspace.app.rest.model.RestAddressableModel;
 import org.dspace.app.rest.model.RestModel;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationEpersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationEpersonLinkRepository.java
index 5ffbd95a77..ca123d2de8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationEpersonLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationEpersonLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.authorization.AuthorizationRestUtil;
 import org.dspace.app.rest.model.AuthorizationRest;
 import org.dspace.app.rest.model.EPersonRest;
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "eperson" subresource of an individual authorization.
  */
-@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.NAME + "." + AuthorizationRest.EPERSON)
+@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.PLURAL_NAME + "." + AuthorizationRest.EPERSON)
 public class AuthorizationEpersonLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureLinkRepository.java
index cbfa848df3..f450aa61b5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureLinkRepository.java
@@ -7,9 +7,8 @@
  */
 package org.dspace.app.rest.repository;
 
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureService;
 import org.dspace.app.rest.authorization.AuthorizationRestUtil;
@@ -24,7 +23,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "feature" subresource of an individual authorization.
  */
-@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.NAME + "." + AuthorizationRest.FEATURE)
+@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.PLURAL_NAME + "." + AuthorizationRest.FEATURE)
 public class AuthorizationFeatureLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureRestRepository.java
index 62781fe8e8..e161b07ed0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationFeatureRestRepository.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(AuthorizationFeatureRest.CATEGORY + "." + AuthorizationFeatureRest.NAME)
+@Component(AuthorizationFeatureRest.CATEGORY + "." + AuthorizationFeatureRest.PLURAL_NAME)
 public class AuthorizationFeatureRestRepository extends DSpaceRestRepository<AuthorizationFeatureRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationObjectLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationObjectLinkRepository.java
index f010b28fa5..6c9697d442 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationObjectLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationObjectLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.authorization.AuthorizationRestUtil;
 import org.dspace.app.rest.model.AuthorizationRest;
 import org.dspace.app.rest.model.BaseObjectRest;
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "object" subresource of an individual authorization.
  */
-@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.NAME + "." + AuthorizationRest.OBJECT)
+@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.PLURAL_NAME + "." + AuthorizationRest.OBJECT)
 public class AuthorizationObjectLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java
index 1379528669..371733003d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/AuthorizationRestRepository.java
@@ -18,6 +18,8 @@ import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
 import org.dspace.app.rest.authorization.Authorization;
@@ -34,8 +36,6 @@ import org.dspace.core.Context;
 import org.dspace.discovery.SearchServiceException;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -49,10 +49,10 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.NAME)
+@Component(AuthorizationRest.CATEGORY + "." + AuthorizationRest.PLURAL_NAME)
 public class AuthorizationRestRepository extends DSpaceRestRepository<AuthorizationRest, String> {
 
-    private static final Logger log = LoggerFactory.getLogger(AuthorizationRestRepository.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private AuthorizationFeatureService authorizationFeatureService;
@@ -79,7 +79,7 @@ public class AuthorizationRestRepository extends DSpaceRestRepository<Authorizat
         try {
             featureName = authorizationRestUtil.getFeatureName(id);
         } catch (IllegalArgumentException e) {
-            log.warn(e.getMessage(), e);
+            log.warn(e::getMessage, e);
             return null;
         }
         try {
@@ -87,7 +87,7 @@ public class AuthorizationRestRepository extends DSpaceRestRepository<Authorizat
             try {
                 object = authorizationRestUtil.getObject(context, id);
             } catch (IllegalArgumentException e) {
-                log.warn("Object informations not found in the specified id " + id, e);
+                log.warn("Object information not found in the specified id {}", id, e);
                 return null;
             }
 
@@ -104,7 +104,7 @@ public class AuthorizationRestRepository extends DSpaceRestRepository<Authorizat
             try {
                 user = authorizationRestUtil.getEperson(context, id);
             } catch (IllegalArgumentException e) {
-                log.warn("Invalid eperson informations in the specified id " + id, e);
+                log.warn("Invalid eperson information in the specified id {}", id, e);
                 return null;
             }
             EPerson currUser = context.getCurrentUser();
@@ -136,7 +136,7 @@ public class AuthorizationRestRepository extends DSpaceRestRepository<Authorizat
     /**
      * It returns the list of matching available authorizations granted to the specified eperson or to the anonymous
      * user. Only administrators and the user identified by the epersonUuid parameter can access this method
-     * 
+     *
      * @param uri
      *            the uri of the object to check the authorization against
      * @param epersonUuid
@@ -283,7 +283,7 @@ public class AuthorizationRestRepository extends DSpaceRestRepository<Authorizat
 
     /**
      * Return the user specified in the request parameter if valid
-     * 
+     *
      * @param context
      * @param epersonUuid
      * @return
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamBundleLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamBundleLinkRepository.java
index bcef1ef33d..a2c3ab95be 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamBundleLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamBundleLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.BundleRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "bundle" subresource of an individual bitstream.
  */
-@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.NAME + "." + BitstreamRest.BUNDLE)
+@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.PLURAL_NAME + "." + BitstreamRest.BUNDLE)
 public class BitstreamBundleLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatLinkRepository.java
index 74454161a0..d86128c344 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamFormatRest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "format" subresource of an individual bitstream.
  */
-@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.NAME + "." + BitstreamRest.FORMAT)
+@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.PLURAL_NAME + "." + BitstreamRest.FORMAT)
 public class BitstreamFormatLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatRestRepository.java
index 49585ee9db..1ae8600a5c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamFormatRestRepository.java
@@ -10,11 +10,11 @@ package org.dspace.app.rest.repository;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BitstreamFormatRest;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(BitstreamFormatRest.CATEGORY + "." + BitstreamFormatRest.NAME)
+@Component(BitstreamFormatRest.CATEGORY + "." + BitstreamFormatRest.PLURAL_NAME)
 public class BitstreamFormatRestRepository extends DSpaceRestRepository<BitstreamFormatRest, Integer> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamRestRepository.java
index 12e27dccac..0350a5178e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamRestRepository.java
@@ -13,10 +13,10 @@ import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
@@ -56,7 +56,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.NAME)
+@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.PLURAL_NAME)
 public class BitstreamRestRepository extends DSpaceObjectRestRepository<Bitstream, BitstreamRest> {
 
     private final BitstreamService bs;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamThumbnailLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamThumbnailLinkRepository.java
index afe864a866..eab0ba1940 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamThumbnailLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BitstreamThumbnailLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Bitstream;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for the thumbnail Bitstream of a Bitstream
  */
-@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.NAME + "." + BitstreamRest.THUMBNAIL)
+@Component(BitstreamRest.CATEGORY + "." + BitstreamRest.PLURAL_NAME + "." + BitstreamRest.THUMBNAIL)
 public class BitstreamThumbnailLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
     @Autowired
     BitstreamService bitstreamService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java
index f608595c3d..52fcbeecfd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseEntryLinkRepository.java
@@ -10,8 +10,8 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Iterator;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.converter.BrowseEntryConverter;
 import org.dspace.app.rest.model.BrowseEntryRest;
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(BrowseIndexRest.CATEGORY + "." + BrowseIndexRest.NAME + "." + BrowseIndexRest.LINK_ENTRIES)
+@Component(BrowseIndexRest.CATEGORY + "." + BrowseIndexRest.PLURAL_NAME + "." + BrowseIndexRest.LINK_ENTRIES)
 public class BrowseEntryLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java
index 6aedcee6c0..315ea8dbe2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseIndexRestRepository.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(BrowseIndexRest.CATEGORY + "." + BrowseIndexRest.NAME)
+@Component(BrowseIndexRest.CATEGORY + "." + BrowseIndexRest.PLURAL_NAME)
 public class BrowseIndexRestRepository extends DSpaceRestRepository<BrowseIndexRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
index baa79bc80a..286a3216bf 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BrowseItemLinkRepository.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.BrowseIndexRest;
 import org.dspace.app.rest.model.ItemRest;
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(BrowseIndexRest.CATEGORY + "." + BrowseIndexRest.NAME + "." + BrowseIndexRest.LINK_ITEMS)
+@Component(BrowseIndexRest.CATEGORY + "." + BrowseIndexRest.PLURAL_NAME + "." + BrowseIndexRest.LINK_ITEMS)
 public class BrowseItemLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BulkAccessConditionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BulkAccessConditionRestRepository.java
index 2bf25978ef..7d46031134 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BulkAccessConditionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BulkAccessConditionRestRepository.java
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Mohamed Eskander (mohamed.eskander at 4science.it)
  */
-@Component(BulkAccessConditionRest.CATEGORY + "." + BulkAccessConditionRest.NAME)
+@Component(BulkAccessConditionRest.CATEGORY + "." + BulkAccessConditionRest.PLURAL_NAME)
 public class BulkAccessConditionRestRepository extends DSpaceRestRepository<BulkAccessConditionRest, String> {
 
     @Autowired
@@ -82,4 +82,4 @@ public class BulkAccessConditionRestRepository extends DSpaceRestRepository<Bulk
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleBitstreamLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleBitstreamLinkRepository.java
index b0a4488e03..3893ef561b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleBitstreamLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleBitstreamLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.BundleRest;
 import org.dspace.app.rest.projection.Projection;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "bitstreams" subresource of an individual bundle.
  */
-@Component(BundleRest.CATEGORY + "." + BundleRest.NAME + "." + BundleRest.BITSTREAMS)
+@Component(BundleRest.CATEGORY + "." + BundleRest.PLURAL_NAME + "." + BundleRest.BITSTREAMS)
 public class BundleBitstreamLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleItemLinkRepository.java
index 4df81d5054..d23e9e96e6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleItemLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BundleRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "item" subresource of an individual bundle.
  */
-@Component(BundleRest.CATEGORY + "." + BundleRest.NAME + "." + BundleRest.ITEM)
+@Component(BundleRest.CATEGORY + "." + BundleRest.PLURAL_NAME + "." + BundleRest.ITEM)
 public class BundleItemLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundlePrimaryBitstreamLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundlePrimaryBitstreamLinkRepository.java
index 3d11379cd3..e6f0e1cd2e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundlePrimaryBitstreamLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundlePrimaryBitstreamLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BitstreamRest;
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "primaryBitstream" subresource of an individual bundle.
  */
-@Component(BundleRest.CATEGORY + "." + BundleRest.NAME + "." + BundleRest.PRIMARY_BITSTREAM)
+@Component(BundleRest.CATEGORY + "." + BundleRest.PLURAL_NAME + "." + BundleRest.PRIMARY_BITSTREAM)
 public class BundlePrimaryBitstreamLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleRestRepository.java
index f750743db6..dbc67dd015 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/BundleRestRepository.java
@@ -12,9 +12,9 @@ import java.io.InputStream;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -49,7 +49,7 @@ import org.springframework.stereotype.Component;
  * @author Jelle Pelgrims (jelle.pelgrims at atmire.com)
  */
 
-@Component(BundleRest.CATEGORY + "." + BundleRest.NAME)
+@Component(BundleRest.CATEGORY + "." + BundleRest.PLURAL_NAME)
 public class BundleRestRepository extends DSpaceObjectRestRepository<Bundle, BundleRest> {
 
     private static final Logger log = LogManager.getLogger();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java
index dbd37093a9..f68cb85c2b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskRestRepository.java
@@ -12,9 +12,9 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -64,7 +64,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(PoolTaskRest.CATEGORY + "." + ClaimedTaskRest.NAME)
+@Component(PoolTaskRest.CATEGORY + "." + ClaimedTaskRest.PLURAL_NAME)
 public class ClaimedTaskRestRepository extends DSpaceRestRepository<ClaimedTaskRest, Integer>
                                        implements InitializingBean {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskStepLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskStepLinkRepository.java
index 9ee277171e..3079d03609 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskStepLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ClaimedTaskStepLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ClaimedTaskRest;
 import org.dspace.app.rest.model.WorkflowStepRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for the Steps subresources for an individual ClaimedTask
  */
-@Component(ClaimedTaskRest.CATEGORY + "." + ClaimedTaskRest.NAME + "." + ClaimedTaskRest.STEP)
+@Component(ClaimedTaskRest.CATEGORY + "." + ClaimedTaskRest.PLURAL_NAME + "." + ClaimedTaskRest.STEP)
 public class ClaimedTaskStepLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionAdminGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionAdminGroupLinkRepository.java
index b239dc0457..22a6c31f1e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionAdminGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionAdminGroupLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * Link repository for "admingroup" subresource of an individual collection.
  *
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.ADMIN_GROUP)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.ADMIN_GROUP)
 public class CollectionAdminGroupLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionBitstreamReadGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionBitstreamReadGroupLinkRepository.java
index c1b322a490..f96af09cb9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionBitstreamReadGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionBitstreamReadGroupLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  * Link repository for "BitstreamReadGroup" subresource of an individual collection.
  *
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.BITSTREAM_READ_GROUP)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.BITSTREAM_READ_GROUP)
 public class CollectionBitstreamReadGroupLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionItemReadGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionItemReadGroupLinkRepository.java
index 77acb8e359..5badc4cb7b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionItemReadGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionItemReadGroupLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  * Link repository for "ItemReadGroup" subresource of an individual collection.
  *
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.ITEM_READ_GROUP)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.ITEM_READ_GROUP)
 public class CollectionItemReadGroupLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLicenseLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLicenseLinkRepository.java
index 4aceea599c..ed0b253bd7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLicenseLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLicenseLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.LicenseRest;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.LICENSE)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.LICENSE)
 public class CollectionLicenseLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLogoLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLogoLinkRepository.java
index 94bf99fc1f..3549e4972d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLogoLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionLogoLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "logo" subresource of an individual collection.
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.LOGO)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.LOGO)
 public class CollectionLogoLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionMappedItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionMappedItemLinkRepository.java
index 1118d0bd7b..892130239e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionMappedItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionMappedItemLinkRepository.java
@@ -11,9 +11,9 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "mappedItems" subresource of an individual collection.
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.MAPPED_ITEMS)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.MAPPED_ITEMS)
 public class CollectionMappedItemLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionParentCommunityLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionParentCommunityLinkRepository.java
index fd21397b36..bbec0aa1d4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionParentCommunityLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionParentCommunityLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.projection.Projection;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
 /**
  * LinkRepository for the ParentCommunity object for a Collection
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.PARENT_COMMUNITY)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.PARENT_COMMUNITY)
 public class CollectionParentCommunityLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
index ba3163a444..0d59aeb254 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionRestRepository.java
@@ -14,11 +14,11 @@ import java.util.List;
 import java.util.Objects;
 import java.util.SortedMap;
 import java.util.UUID;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -81,7 +81,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME)
 public class CollectionRestRepository extends DSpaceObjectRestRepository<Collection, CollectionRest> {
 
     public static Logger log = org.apache.logging.log4j.LogManager.getLogger(CollectionRestRepository.class);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionSubmitterGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionSubmitterGroupLinkRepository.java
index 4e6d901387..48acc2b832 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionSubmitterGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CollectionSubmitterGroupLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * Link repository for "submittergroup" subresource of an individual collection.
  *
  */
-@Component(CollectionRest.CATEGORY + "." + CollectionRest.NAME + "." + CollectionRest.SUBMITTERS_GROUP)
+@Component(CollectionRest.CATEGORY + "." + CollectionRest.PLURAL_NAME + "." + CollectionRest.SUBMITTERS_GROUP)
 public class CollectionSubmitterGroupLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityAdminGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityAdminGroupLinkRepository.java
index b2ca20a7bc..cf36b8c915 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityAdminGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityAdminGroupLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * Link repository for "admingroup" subresource of an individual community.
  *
  */
-@Component(CommunityRest.CATEGORY + "." + CommunityRest.NAME + "." + CommunityRest.ADMIN_GROUP)
+@Component(CommunityRest.CATEGORY + "." + CommunityRest.PLURAL_NAME + "." + CommunityRest.ADMIN_GROUP)
 public class CommunityAdminGroupLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java
index 3c728d8c31..1fa3468a51 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityCollectionLinkRepository.java
@@ -12,9 +12,9 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.projection.Projection;
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "collections" subresource of an individual community.
  */
-@Component(CommunityRest.CATEGORY + "." + CommunityRest.NAME + "." + CommunityRest.COLLECTIONS)
+@Component(CommunityRest.CATEGORY + "." + CommunityRest.PLURAL_NAME + "." + CommunityRest.COLLECTIONS)
 public class CommunityCollectionLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityLogoLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityLogoLinkRepository.java
index e3892462a3..1c828f81de 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityLogoLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityLogoLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "logo" subresource of an individual community.
  */
-@Component(CommunityRest.CATEGORY + "." + CommunityRest.NAME + "." + CommunityRest.LOGO)
+@Component(CommunityRest.CATEGORY + "." + CommunityRest.PLURAL_NAME + "." + CommunityRest.LOGO)
 public class CommunityLogoLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityParentCommunityLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityParentCommunityLinkRepository.java
index ab23f3afed..a9c7785015 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityParentCommunityLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityParentCommunityLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Community;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * LinkRepository for the ParentCommunity object for a Community
  */
-@Component(CommunityRest.CATEGORY + "." + CommunityRest.NAME + "." + CommunityRest.PARENT_COMMUNITY)
+@Component(CommunityRest.CATEGORY + "." + CommunityRest.PLURAL_NAME + "." + CommunityRest.PARENT_COMMUNITY)
 public class CommunityParentCommunityLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
@@ -51,7 +51,7 @@ public class CommunityParentCommunityLinkRepository extends AbstractDSpaceRestRe
             Context context = obtainContext();
             Community community = communityService.find(context, communityId);
             if (community == null) {
-                throw new ResourceNotFoundException("No such community: " + community);
+                throw new ResourceNotFoundException("No such community: " + communityId);
             }
             Community parentCommunity = (Community) communityService.getParentObject(context, community);
             if (parentCommunity == null) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityRestRepository.java
index 927b6a0b98..0d4e6be133 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunityRestRepository.java
@@ -13,11 +13,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.SortedMap;
 import java.util.UUID;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -61,7 +61,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(CommunityRest.CATEGORY + "." + CommunityRest.NAME)
+@Component(CommunityRest.CATEGORY + "." + CommunityRest.PLURAL_NAME)
 public class CommunityRestRepository extends DSpaceObjectRestRepository<Community, CommunityRest> {
 
     private static final Logger log = org.apache.logging.log4j.LogManager
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunitySubcommunityLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunitySubcommunityLinkRepository.java
index 135d964f3f..e47e684080 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunitySubcommunityLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CommunitySubcommunityLinkRepository.java
@@ -12,9 +12,9 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CommunityRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.content.Community;
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "subcommunities" subresource of an individual community.
  */
-@Component(CommunityRest.CATEGORY + "." + CommunityRest.NAME + "." + CommunityRest.SUBCOMMUNITIES)
+@Component(CommunityRest.CATEGORY + "." + CommunityRest.PLURAL_NAME + "." + CommunityRest.SUBCOMMUNITIES)
 public class CommunitySubcommunityLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java
index caadb9f6f3..b524ca776d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ConfigurationRestRepository.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the repository responsible of exposing configuration properties
  */
-@Component(PropertyRest.CATEGORY + "." + PropertyRest.NAME)
+@Component(PropertyRest.CATEGORY + "." + PropertyRest.PLURAL_NAME)
 public class ConfigurationRestRepository extends DSpaceRestRepository<PropertyRest, String> {
 
     private ConfigurationService configurationService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ContentReportRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ContentReportRestRepository.java
new file mode 100644
index 0000000000..567fa79a44
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ContentReportRestRepository.java
@@ -0,0 +1,97 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.dspace.app.rest.converter.FilteredItemConverter;
+import org.dspace.app.rest.model.ContentReportSupportRest;
+import org.dspace.app.rest.model.FilteredCollectionsQuery;
+import org.dspace.app.rest.model.FilteredCollectionsRest;
+import org.dspace.app.rest.model.FilteredItemRest;
+import org.dspace.app.rest.model.FilteredItemsQueryPredicate;
+import org.dspace.app.rest.model.FilteredItemsQueryRest;
+import org.dspace.app.rest.model.FilteredItemsRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.MetadataField;
+import org.dspace.contentreport.Filter;
+import org.dspace.contentreport.FilteredCollection;
+import org.dspace.contentreport.FilteredCollections;
+import org.dspace.contentreport.FilteredItems;
+import org.dspace.contentreport.FilteredItemsQuery;
+import org.dspace.contentreport.QueryPredicate;
+import org.dspace.contentreport.service.ContentReportService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Component;
+
+/**
+ * This repository serves the content reports ported from DSpace 6.x
+ * (Filtered Collections and Filtered Items).
+ * @author Jean-François Morin (Université Laval)
+ */
+@Component(ContentReportSupportRest.CATEGORY + "." + ContentReportSupportRest.NAME)
+public class ContentReportRestRepository extends AbstractDSpaceRestRepository {
+
+    @Autowired
+    private ContentReportService contentReportService;
+    @Autowired
+    private FilteredItemConverter itemConverter;
+
+    public ContentReportSupportRest getContentReportSupport() {
+        return new ContentReportSupportRest();
+    }
+
+    public FilteredCollectionsRest findFilteredCollections(Context context, FilteredCollectionsQuery query) {
+        Set<Filter> filters = query.getFilters();
+
+        List<FilteredCollection> colls = contentReportService.findFilteredCollections(context, filters);
+        FilteredCollections report = FilteredCollections.of(colls);
+
+        FilteredCollectionsRest reportRest = FilteredCollectionsRest.of(report);
+        reportRest.setId("filteredcollections");
+        return reportRest;
+    }
+
+    public FilteredItemsRest findFilteredItems(Context context, FilteredItemsQueryRest queryRest, Pageable pageable) {
+        List<QueryPredicate> predicates = queryRest.getQueryPredicates().stream()
+                .map(pred -> convertPredicate(context, pred))
+                .collect(Collectors.toList());
+        FilteredItemsQuery query = new FilteredItemsQuery();
+        query.setCollections(queryRest.getCollections());
+        query.setQueryPredicates(predicates);
+        query.setFilters(queryRest.getFilters());
+        query.setAdditionalFields(queryRest.getAdditionalFields());
+        query.setOffset(pageable.getOffset());
+        query.setPageLimit(pageable.getPageSize());
+
+        FilteredItems items = contentReportService.findFilteredItems(context, query);
+
+        List<FilteredItemRest> filteredItemsRest = items.getItems().stream()
+                .map(item -> itemConverter.convert(item, Projection.DEFAULT))
+                .collect(Collectors.toList());
+        FilteredItemsRest report = FilteredItemsRest.of(filteredItemsRest, items.getItemCount());
+        report.setId("filtereditems");
+
+        return report;
+    }
+
+    private QueryPredicate convertPredicate(Context context, FilteredItemsQueryPredicate predicate) {
+        try {
+            List<MetadataField> fields = contentReportService.getMetadataFields(context, predicate.getField());
+            return QueryPredicate.of(fields, predicate.getOperator(), predicate.getValue());
+        } catch (SQLException e) {
+            throw new IllegalArgumentException(e.getMessage(), e);
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CorrectionTypeRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CorrectionTypeRestRepository.java
new file mode 100644
index 0000000000..14dc7d9fb2
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/CorrectionTypeRestRepository.java
@@ -0,0 +1,93 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RESTAuthorizationException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.CorrectionTypeRest;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.correctiontype.CorrectionType;
+import org.dspace.correctiontype.service.CorrectionTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * The CorrectionType REST Repository
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component(CorrectionTypeRest.CATEGORY + "." + CorrectionTypeRest.PLURAL_NAME)
+public class CorrectionTypeRestRepository extends DSpaceRestRepository<CorrectionTypeRest, String> {
+
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private CorrectionTypeService correctionTypeService;
+
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    @Override
+    public CorrectionTypeRest findOne(Context context, String id) {
+        CorrectionType correctionType = correctionTypeService.findOne(id);
+        return Objects.nonNull(correctionType) ? converter.toRest(correctionType, utils.obtainProjection()) : null;
+    }
+
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    @Override
+    public Page<CorrectionTypeRest> findAll(Context context, Pageable pageable) {
+        return converter.toRestPage(correctionTypeService.findAll(), pageable, utils.obtainProjection());
+    }
+
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    @SearchRestMethod(name = "findByItem")
+    public Page<CorrectionTypeRest> findByItem(@Parameter(value = "uuid",required = true) UUID uuid,Pageable pageable) {
+        Context context = obtainContext();
+        try {
+            Item item = itemService.find(context, uuid);
+            if (Objects.isNull(item)) {
+                throw new UnprocessableEntityException("Item with uuid:" + uuid + " not found");
+            }
+
+            List<CorrectionType> correctionTypes;
+            try {
+                correctionTypes = correctionTypeService.findByItem(context, item);
+            } catch (AuthorizeException e) {
+                throw new RESTAuthorizationException(e);
+            }
+
+            return converter.toRestPage(correctionTypes, pageable, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    @SearchRestMethod(name = "findByTopic")
+    public CorrectionTypeRest findByTopic(@Parameter(value = "topic", required = true) String topic) {
+        CorrectionType correctionType = correctionTypeService.findByTopic(topic);
+        return Objects.nonNull(correctionType) ? converter.toRest(correctionType, utils.obtainProjection()) : null;
+    }
+
+    @Override
+    public Class<CorrectionTypeRest> getDomainClass() {
+        return CorrectionTypeRest.class;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
index a93f5e55dc..cf7c556e3a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
@@ -14,10 +14,9 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import org.apache.logging.log4j.Logger;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.RESTAuthorizationException;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
@@ -26,7 +25,6 @@ import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.RestAddressableModel;
 import org.dspace.app.rest.model.patch.Patch;
 import org.dspace.authorize.AuthorizeException;
-import org.dspace.content.service.MetadataFieldService;
 import org.dspace.core.Context;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,8 +32,8 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.PagingAndSortingRepository;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -48,9 +46,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID extends Serializable>
     extends AbstractDSpaceRestRepository
-    implements PagingAndSortingRepository<T, ID>, BeanNameAware {
-
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(DSpaceRestRepository.class);
+    implements CrudRepository<T, ID>, PagingAndSortingRepository<T, ID>, BeanNameAware {
 
     private String thisRepositoryBeanName;
     private DSpaceRestRepository<T, ID> thisRepository;
@@ -58,9 +54,6 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
     @Autowired
     private ApplicationContext applicationContext;
 
-    @Autowired
-    private MetadataFieldService metadataFieldService;
-
     /**
      * From BeanNameAware. Allows us to capture the name of the bean, so we can load it into thisRepository.
      * See getThisRepository() method.
@@ -152,13 +145,12 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
      *            the rest object id
      * @return the REST object identified by its ID
      */
-    @PreAuthorize("hasAuthority('ADMIN')")
     public abstract T findOne(Context context, ID id);
 
     @Override
     /**
      * Return true if an object exist for the specified ID. The default implementation is inefficient as it retrieves
-     * the actual object to state that it exists. This could lead to retrieve and inizialize lot of linked objects
+     * the actual object to state that it exists. This could lead to retrieve and initialize lot of linked objects
      */
     public boolean existsById(ID id) {
         return findById(id).isPresent();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
index 4b9b7d7644..fb2bff8e55 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DiscoveryRestRepository.java
@@ -44,7 +44,7 @@ import org.springframework.stereotype.Component;
  * information lookup
  * that has to be done for the endpoint
  */
-@Component(SearchResultsRest.CATEGORY + "." + SearchResultsRest.NAME)
+@Component(SearchResultsRest.CATEGORY + "." + SearchResultsRest.PLURAL_NAME)
 public class DiscoveryRestRepository extends AbstractDSpaceRestRepository {
 
     private static final Logger log = LogManager.getLogger();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DuplicateRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DuplicateRestRepository.java
new file mode 100644
index 0000000000..8730211a5e
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DuplicateRestRepository.java
@@ -0,0 +1,186 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.DiscoverableEndpointsService;
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.model.PotentialDuplicateRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.Item;
+import org.dspace.content.service.DuplicateDetectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.virtual.PotentialDuplicate;
+import org.dspace.core.Context;
+import org.dspace.discovery.SearchServiceException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.hateoas.Link;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * The REST repository for the api/submission/duplicates endpoint, which handles requests for finding
+ * potential duplicates of a given item (archived or in-progress).
+ *
+ * Find one and find all are not implemented as actual REST methods because a duplicate is the result
+ * of comparing an item with other indexed items, not an object that can be referenced by some kind of ID, but
+ * we must at least implement the Java methods here in order to extend DSpaceRestRepository and implement
+ * SearchRestMethods.
+ *
+ * @author Kim Shepherd
+ */
+@ConditionalOnProperty("duplicate.enable")
+@Component(PotentialDuplicateRest.CATEGORY + "." + PotentialDuplicateRest.NAME)
+public class DuplicateRestRepository extends DSpaceRestRepository<PotentialDuplicateRest, String>
+        implements InitializingBean {
+
+    /**
+     * Discoverable endpoints service
+     */
+    @Autowired
+    DiscoverableEndpointsService discoverableEndpointsService;
+
+    /**
+     * Duplicate detection service
+     */
+    @Autowired
+    DuplicateDetectionService duplicateDetectionService;
+
+    /**
+     * Item service
+     */
+    @Autowired
+    ItemService itemService;
+
+    /**
+     * Logger
+     */
+    private final static Logger log = LogManager.getLogger();
+
+    /**
+     * Register this repository endpoint as /api/submission/duplicates
+     * @throws Exception
+     */
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        discoverableEndpointsService
+                .register(this, Arrays.asList(Link.of(
+                        "/api/" + PotentialDuplicateRest.CATEGORY + "/" + PotentialDuplicateRest.NAME + "/search",
+                        PotentialDuplicateRest.NAME + "-search")));
+    }
+
+    /**
+     * This REST method is NOT IMPLEMENTED - it does not make sense in duplicate detection, in which the only
+     * real addressable objects involved are Items.
+     *
+     * @param context
+     *            the dspace context
+     * @param name
+     *            the rest object id
+     * @return not implemented
+     * @throws RepositoryMethodNotImplementedException
+     */
+    @PreAuthorize("permitAll()")
+    @Override
+    public PotentialDuplicateRest findOne(Context context, String name) {
+        throw new RepositoryMethodNotImplementedException("Duplicate detection endpoint only implements searchBy", "");
+    }
+
+    /**
+     * This REST method is NOT IMPLEMENTED - it does not make sense in duplicate detection, where there can be no "all"
+     *
+     * @param context
+     *            the dspace context
+     * @return not implemented
+     * @throws RepositoryMethodNotImplementedException
+     */
+    @PreAuthorize("permitAll()")
+    @Override
+    public Page<PotentialDuplicateRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException("Duplicate detection endpoint only implements searchBy", "");
+    }
+
+    /**
+     * Return a paged list of potential duplicate matches for the given item ID. This may be an item wrapped in
+     * an in-progress item wrapper like workspace or workflow, as long as the current user has READ access to this item.
+     * Results from the service search method will only contain matches that lead to items which are readable by
+     * the current user.
+     *
+     * @param uuid The item UUID to search
+     * @param pageable Pagination options
+     * @return Paged list of potential duplicates
+     * @throws Exception
+     */
+    @PreAuthorize("hasPermission(#uuid, 'ITEM', 'READ')")
+    @SearchRestMethod(name = "findByItem")
+    public Page<PotentialDuplicateRest> findByItem(@Parameter(value = "uuid", required = true) UUID uuid,
+                                                       Pageable pageable) {
+        // Instantiate object to represent this item
+        Item item;
+        // Instantiate list of potential duplicates which we will convert and return as paged ItemRest list
+        List<PotentialDuplicate> potentialDuplicates = new LinkedList<>();
+        // Instantiate total count
+        int total = 0;
+        // Obtain context
+        Context context = ContextUtil.obtainCurrentRequestContext();
+
+        // Try to get item based on UUID parameter
+        try {
+            item = itemService.find(context, uuid);
+        } catch (SQLException e) {
+            throw new ResourceNotFoundException(e.getMessage());
+        }
+
+        // If the item is null or otherwise invalid (template, etc) then throw an appropriate error
+        if (item == null) {
+            throw new ResourceNotFoundException("No such item: " + uuid);
+        }
+        if (item.getTemplateItemOf() != null) {
+            throw new IllegalArgumentException("Cannot get duplicates for template item");
+        }
+
+        try {
+            // Search for the list of potential duplicates
+            potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item);
+        } catch (SearchServiceException e) {
+            // If the search fails, log an error and return an empty list rather than throwing a fatal error
+            log.error("Search service error retrieving duplicates: {}", e.getMessage());
+        }
+
+        // Construct rest pages and return
+        Page<PotentialDuplicateRest> restPage = converter.toRestPage(potentialDuplicates, pageable, total,
+                utils.obtainProjection());
+
+        return restPage;
+
+    }
+
+    /**
+     * Return the domain class for potential duplicate objects
+     * @return PotentialDuplicateRest.class
+     */
+    @Override
+    public Class<PotentialDuplicateRest> getDomainClass() {
+        return PotentialDuplicateRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonGroupLinkRepository.java
index 0aeda20678..5825fa003e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonGroupLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for the direct "groups" subresource of an individual eperson.
  */
-@Component(EPersonRest.CATEGORY + "." + EPersonRest.NAME + "." + EPersonRest.GROUPS)
+@Component(EPersonRest.CATEGORY + "." + EPersonRest.PLURAL_NAME + "." + EPersonRest.GROUPS)
 public class EPersonGroupLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java
index bd42b74206..ce1edc1eed 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EPersonRestRepository.java
@@ -12,9 +12,9 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -60,7 +60,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(EPersonRest.CATEGORY + "." + EPersonRest.NAME)
+@Component(EPersonRest.CATEGORY + "." + EPersonRest.PLURAL_NAME)
 public class EPersonRestRepository extends DSpaceObjectRestRepository<EPerson, EPersonRest>
                                    implements InitializingBean {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRelationshipLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRelationshipLinkRepository.java
index 3d71ddd9bb..8b30f86435 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRelationshipLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRelationshipLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.EntityTypeRest;
 import org.dspace.app.rest.model.RelationshipTypeRest;
 import org.dspace.app.rest.projection.Projection;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
  * 
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
-@Component(EntityTypeRest.CATEGORY + "." + EntityTypeRest.NAME + "." + EntityTypeRest.RELATION_SHIP_TYPES)
+@Component(EntityTypeRest.CATEGORY + "." + EntityTypeRest.PLURAL_NAME + "." + EntityTypeRest.RELATION_SHIP_TYPES)
 public class EntityTypeRelationshipLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
@@ -70,4 +70,4 @@ public class EntityTypeRelationshipLinkRepository extends AbstractDSpaceRestRepo
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRestRepository.java
index eec67b6fc9..4ad7aa092c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/EntityTypeRestRepository.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the repository that is responsible to manage EntityType Rest objects
  */
-@Component(EntityTypeRest.CATEGORY + "." + EntityTypeRest.NAME)
+@Component(EntityTypeRest.CATEGORY + "." + EntityTypeRest.PLURAL_NAME)
 public class EntityTypeRestRepository extends DSpaceRestRepository<EntityTypeRest, Integer> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceEntityTypeLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceEntityTypeLinkRepository.java
index 4ed39c1893..4e371f4425 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceEntityTypeLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceEntityTypeLinkRepository.java
@@ -10,9 +10,9 @@ import java.sql.SQLException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections4.CollectionUtils;
 import org.dspace.app.rest.model.EntityTypeRest;
 import org.dspace.app.rest.model.ExternalSourceRest;
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
  * 
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
-@Component(ExternalSourceRest.CATEGORY + "." + ExternalSourceRest.NAME + "." + ExternalSourceRest.ENTITY_TYPES)
+@Component(ExternalSourceRest.CATEGORY + "." + ExternalSourceRest.PLURAL_NAME + "." + ExternalSourceRest.ENTITY_TYPES)
 public class ExternalSourceEntityTypeLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
@@ -70,4 +70,4 @@ public class ExternalSourceEntityTypeLinkRepository extends AbstractDSpaceRestRe
         return converter.toRestPage(entityTypes, pageable, total, utils.obtainProjection());
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceRestRepository.java
index 7888603f19..736261cd26 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ExternalSourceRestRepository.java
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
  * This is the Repository that is responsible for the functionality and implementations coming from
  * {@link org.dspace.app.rest.ExternalSourcesRestController}
  */
-@Component(ExternalSourceRest.CATEGORY + "." + ExternalSourceRest.NAME)
+@Component(ExternalSourceRest.CATEGORY + "." + ExternalSourceRest.PLURAL_NAME)
 public class ExternalSourceRestRepository extends DSpaceRestRepository<ExternalSourceRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/FeedbackRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/FeedbackRestRepository.java
index 4267206217..2db412e5de 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/FeedbackRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/FeedbackRestRepository.java
@@ -8,10 +8,10 @@
 package org.dspace.app.rest.repository;
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.mail.MessagingException;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.mail.MessagingException;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.DSpaceFeedbackNotFoundException;
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Component;
  * 
  * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
  */
-@Component(FeedbackRest.CATEGORY + "." + FeedbackRest.NAME)
+@Component(FeedbackRest.CATEGORY + "." + FeedbackRest.PLURAL_NAME)
 public class FeedbackRestRepository extends DSpaceRestRepository<FeedbackRest, Integer> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupEPersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupEPersonLinkRepository.java
index 1ce278893d..d1ec7f693e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupEPersonLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupEPersonLinkRepository.java
@@ -11,9 +11,9 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.core.Context;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "epersons" subresource of an individual group.
  */
-@Component(GroupRest.CATEGORY + "." + GroupRest.NAME + "." + GroupRest.EPERSONS)
+@Component(GroupRest.CATEGORY + "." + GroupRest.PLURAL_NAME + "." + GroupRest.EPERSONS)
 public class GroupEPersonLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupGroupLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupGroupLinkRepository.java
index 564e941d45..36f0c47374 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupGroupLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupGroupLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
 import org.dspace.core.Context;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "groups" subresource of an individual group.
  */
-@Component(GroupRest.CATEGORY + "." + GroupRest.NAME + "." + GroupRest.SUBGROUPS)
+@Component(GroupRest.CATEGORY + "." + GroupRest.PLURAL_NAME + "." + GroupRest.SUBGROUPS)
 public class GroupGroupLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupParentObjectLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupParentObjectLinkRepository.java
index 3d7cdf8f80..973d695d66 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupParentObjectLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupParentObjectLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.DSpaceObjectRest;
 import org.dspace.app.rest.model.GroupRest;
 import org.dspace.app.rest.projection.Projection;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for the parent object of a group.
  */
-@Component(GroupRest.CATEGORY + "." + GroupRest.NAME + "." + GroupRest.OBJECT)
+@Component(GroupRest.CATEGORY + "." + GroupRest.PLURAL_NAME + "." + GroupRest.OBJECT)
 public class GroupParentObjectLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupRestRepository.java
index a3b525387c..160f838741 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/GroupRestRepository.java
@@ -13,9 +13,9 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
 import org.dspace.app.rest.converter.MetadataConverter;
@@ -42,7 +42,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(GroupRest.CATEGORY + "." + GroupRest.NAME)
+@Component(GroupRest.CATEGORY + "." + GroupRest.PLURAL_NAME)
 public class GroupRestRepository extends DSpaceObjectRestRepository<Group, GroupRest> {
     @Autowired
     GroupService gs;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/HarvestedCollectionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/HarvestedCollectionRestRepository.java
index ccacc24418..7794e1fc91 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/HarvestedCollectionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/HarvestedCollectionRestRepository.java
@@ -13,10 +13,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.converter.HarvestedCollectionConverter;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.HarvestTypeEnum;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Jelle Pelgrims (jelle.pelgrims at atmire.com)
  */
-@Component(HarvestedCollectionRest.CATEGORY + "." + HarvestedCollectionRest.NAME)
+@Component(HarvestedCollectionRest.CATEGORY + "." + HarvestedCollectionRest.PLURAL_NAME)
 public class HarvestedCollectionRestRepository extends AbstractDSpaceRestRepository {
 
     @Autowired
@@ -148,7 +148,7 @@ public class HarvestedCollectionRestRepository extends AbstractDSpaceRestReposit
 
     /**
      * Function used to verify that the harvest settings work
-     * @param harvestedCollectionRest    A object containg the harvest settings to be tested
+     * @param harvestedCollectionRest    A object containing the harvest settings to be tested
      * @return
      */
     private List<String> testHarvestSettings(HarvestedCollectionRest harvestedCollectionRest) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/IdentifierRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/IdentifierRestRepository.java
index 1be569d18e..bbc79cbf42 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/IdentifierRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/IdentifierRestRepository.java
@@ -16,11 +16,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.NotSupportedException;
 
-import org.atteo.evo.inflector.English;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.NotSupportedException;
 import org.dspace.app.rest.DiscoverableEndpointsService;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
@@ -68,13 +67,13 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * Item REST Repository and Controller for persistent identifiers.
  * The controller annotation and endpoint registration allows the "find DSO by identifier" method which was
- * previously implmented in org.dspace.app.rest.IdentifierRestController
+ * previously implemented in org.dspace.app.rest.IdentifierRestController
  *
  * @author Kim Shepherd
  */
 @RestController
-@RequestMapping("/api/" + IdentifierRestRepository.CATEGORY)
-@Component(IdentifierRestRepository.CATEGORY + "." + IdentifierRestRepository.NAME)
+@RequestMapping("/api/" + IdentifierRest.CATEGORY)
+@Component(IdentifierRest.CATEGORY + "." + IdentifierRest.PLURAL_NAME)
 public class IdentifierRestRepository extends DSpaceRestRepository<IdentifierRest, String> implements InitializingBean {
     @Autowired
     private DiscoverableEndpointsService discoverableEndpointsService;
@@ -87,10 +86,6 @@ public class IdentifierRestRepository extends DSpaceRestRepository<IdentifierRes
     @Autowired
     private ItemService itemService;
 
-    // Set category and name for routing
-    public static final String CATEGORY = "pid";
-    public static final String NAME = IdentifierRest.NAME;
-
     /**
      * Register /api/pid/find?id=... as a discoverable endpoint service
      *
@@ -104,7 +99,7 @@ public class IdentifierRestRepository extends DSpaceRestRepository<IdentifierRes
                                                 new TemplateVariables(
                                                         new TemplateVariable("id",
                                                                 TemplateVariable.VariableType.REQUEST_PARAM))),
-                                        CATEGORY)));
+                                        IdentifierRest.CATEGORY)));
     }
 
     /**
@@ -163,7 +158,7 @@ public class IdentifierRestRepository extends DSpaceRestRepository<IdentifierRes
                 results.add(new IdentifierRest(handleUrl, "handle", null));
             }
         } catch (SQLException | IdentifierException e) {
-            throw new LinkNotFoundException(IdentifierRestRepository.CATEGORY, IdentifierRest.NAME, uuid);
+            throw new LinkNotFoundException(IdentifierRest.CATEGORY, IdentifierRest.NAME, uuid);
         }
         // Return list of identifiers for this DSpaceObject
         return new PageImpl<>(results, pageable, results.size());
@@ -281,8 +276,7 @@ public class IdentifierRestRepository extends DSpaceRestRepository<IdentifierRes
             if (dso != null) {
                 // Convert and respond with a redirect to the object itself
                 DSpaceObjectRest dsor = converter.toRest(dso, utils.obtainProjection());
-                URI link = linkTo(dsor.getController(), dsor.getCategory(),
-                        English.plural(dsor.getType()))
+                URI link = linkTo(dsor.getController(), dsor.getCategory(), dsor.getTypePlural())
                         .slash(dsor.getId()).toUri();
                 response.setStatus(HttpServletResponse.SC_FOUND);
                 response.sendRedirect(link.toString());
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java
index b2660f51e0..975171fba3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemAccessStatusLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.access.status.service.AccessStatusService;
 import org.dspace.app.rest.model.AccessStatusRest;
 import org.dspace.app.rest.model.ItemRest;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for calculating the access status of an Item
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.ACCESS_STATUS)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.ACCESS_STATUS)
 public class ItemAccessStatusLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemBundleLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemBundleLinkRepository.java
index d7525c881a..a6089c2331 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemBundleLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemBundleLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BundleRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "bundles" subresource of an individual item.
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.BUNDLES)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.BUNDLES)
 public class ItemBundleLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemFilterRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemFilterRestRepository.java
new file mode 100644
index 0000000000..cb8dc6112a
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemFilterRestRepository.java
@@ -0,0 +1,58 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import org.dspace.app.ldn.ItemFilter;
+import org.dspace.app.rest.model.ItemFilterRest;
+import org.dspace.content.ItemFilterService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible to manage ItemFilter Rest object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+
+@Component(ItemFilterRest.CATEGORY + "." + ItemFilterRest.PLURAL_NAME)
+public class ItemFilterRestRepository extends DSpaceRestRepository<ItemFilterRest, String> {
+
+    @Autowired
+    private ItemFilterService itemFilterService;
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public ItemFilterRest findOne(Context context, String id) {
+        ItemFilter itemFilter = itemFilterService.findOne(id);
+
+        if (itemFilter == null) {
+            throw new ResourceNotFoundException(
+                "No such logical item filter: " + id);
+        }
+
+        return converter.toRest(itemFilter, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public Page<ItemFilterRest> findAll(Context context, Pageable pageable) {
+        return converter.toRestPage(itemFilterService.findAll(),
+            pageable, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<ItemFilterRest> getDomainClass() {
+        return ItemFilterRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemIdentifierLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemIdentifierLinkRepository.java
index 0714b7329b..e2ad964bf4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemIdentifierLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemIdentifierLinkRepository.java
@@ -12,9 +12,9 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.IdentifierRest;
 import org.dspace.app.rest.model.IdentifiersRest;
 import org.dspace.app.rest.model.ItemRest;
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for the identifier of an Item
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.IDENTIFIERS)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.IDENTIFIERS)
 public class ItemIdentifierLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
     @Autowired
     ItemService itemService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemMappedCollectionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemMappedCollectionLinkRepository.java
index c632cd9d61..41e438427c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemMappedCollectionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemMappedCollectionLinkRepository.java
@@ -11,9 +11,9 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "mappedCollections" subresource of an individual item.
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.MAPPED_COLLECTIONS)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.MAPPED_COLLECTIONS)
 public class ItemMappedCollectionLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemOwningCollectionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemOwningCollectionLinkRepository.java
index a7ceed900d..b41ace1dd3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemOwningCollectionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemOwningCollectionLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "owningCollection" subresource of an individual item.
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.OWNING_COLLECTION)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.OWNING_COLLECTION)
 public class ItemOwningCollectionLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java
index 4a282ee466..5ae8179d0b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRelationshipLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.RelationshipRest;
 import org.dspace.app.rest.projection.Projection;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "relationships" subresource of an individual item.
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.RELATIONSHIPS)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.RELATIONSHIPS)
 public class ItemRelationshipLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
index 16ce8629d1..1a22a5f747 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemRestRepository.java
@@ -14,11 +14,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -59,7 +59,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME)
 public class ItemRestRepository extends DSpaceObjectRestRepository<Item, ItemRest> {
 
     private static final Logger log = LogManager.getLogger(ItemRestRepository.class);
@@ -365,4 +365,5 @@ public class ItemRestRepository extends DSpaceObjectRestRepository<Item, ItemRes
         Item item = uriListHandlerService.handle(context, req, stringList, Item.class);
         return converter.toRest(item, utils.obtainProjection());
     }
+
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemSubmitterLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemSubmitterLinkRepository.java
new file mode 100644
index 0000000000..a345f0abe7
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemSubmitterLinkRepository.java
@@ -0,0 +1,61 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+import javax.annotation.Nullable;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.model.EPersonRest;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "submitter" subresource of an item.
+ */
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.SUBMITTER)
+public class ItemSubmitterLinkRepository extends AbstractDSpaceRestRepository
+        implements LinkRestRepository {
+
+    @Autowired
+    ItemService itemService;
+
+    /**
+     * Retrieve the submitter for an item.
+     *
+     * @param request          - The current request
+     * @param id               - The item ID for which to retrieve the submitter
+     * @param optionalPageable - optional pageable object
+     * @param projection       - the current projection
+     * @return the submitter for the item
+     */
+    @PreAuthorize("hasPermission(#id, 'ITEM', 'READ')")
+    public EPersonRest getItemSubmitter(@Nullable HttpServletRequest request, UUID id,
+                                        @Nullable Pageable optionalPageable, Projection projection) {
+        try {
+            Context context = obtainContext();
+            Item item = itemService.find(context, id);
+            if (item == null) {
+                throw new ResourceNotFoundException("No such item: " + id);
+            }
+
+            return converter.toRest(item.getSubmitter(), projection);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemTemplateItemOfLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemTemplateItemOfLinkRepository.java
index 63f25bc668..45ac2420fa 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemTemplateItemOfLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemTemplateItemOfLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "templateItemOf" subresource of an individual item.
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.TEMPLATE_ITEM_OF)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.TEMPLATE_ITEM_OF)
 public class ItemTemplateItemOfLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemThumbnailLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemThumbnailLinkRepository.java
index 7391d410b6..fd56151d7e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemThumbnailLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemThumbnailLinkRepository.java
@@ -10,9 +10,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for the thumbnail Bitstream of an Item
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.THUMBNAIL)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.THUMBNAIL)
 public class ItemThumbnailLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
     @Autowired
     ItemService itemService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemVersionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemVersionLinkRepository.java
index 95bbddc665..abf107b822 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemVersionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ItemVersionLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the Repository that will take care of fetching the Version for a given Item
  */
-@Component(ItemRest.CATEGORY + "." + ItemRest.NAME + "." + ItemRest.VERSION)
+@Component(ItemRest.CATEGORY + "." + ItemRest.PLURAL_NAME + "." + ItemRest.VERSION)
 public class ItemVersionLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/LDNMessageRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/LDNMessageRestRepository.java
new file mode 100644
index 0000000000..d28080ab36
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/LDNMessageRestRepository.java
@@ -0,0 +1,87 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.exception.MethodNotAllowedException;
+import org.dspace.app.rest.model.LDNMessageEntityRest;
+import org.dspace.app.rest.model.patch.Patch;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible to manage LDNMessageEntry Rest object
+ *
+ * @author Stefano Maffei(stefano.maffei at 4science.com)
+ */
+
+@Component(LDNMessageEntityRest.CATEGORY + "." + LDNMessageEntityRest.NAME_PLURALS)
+public class LDNMessageRestRepository extends DSpaceRestRepository<LDNMessageEntityRest, String> {
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public LDNMessageEntityRest findOne(Context context, String id) {
+        try {
+            LDNMessageEntity ldnMessageEntity = ldnMessageService.find(context, id);
+            if (ldnMessageEntity == null) {
+                throw new ResourceNotFoundException("The LDNMessageEntity for ID: " + id + " could not be found");
+            }
+            return converter.toRest(ldnMessageEntity, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public Page<LDNMessageEntityRest> findAll(Context context, Pageable pageable) {
+        try {
+            return converter.toRestPage(ldnMessageService.findAll(context), pageable, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    protected LDNMessageEntityRest createAndReturn(Context context) throws AuthorizeException, SQLException {
+        throw new MethodNotAllowedException("Creation of LDN Message is not supported via Endpoint");
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    protected void patch(Context context, HttpServletRequest request, String apiCategory, String model, String id,
+        Patch patch) throws AuthorizeException, SQLException {
+        throw new MethodNotAllowedException("Patch of LDN Message is not supported via Endpoint");
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    protected void delete(Context context, String id) throws AuthorizeException {
+        throw new MethodNotAllowedException("Deletion of LDN Message is not supported via Endpoint");
+    }
+
+    @Override
+    public Class<LDNMessageEntityRest> getDomainClass() {
+        return LDNMessageEntityRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java
index 5152f11902..0d0bc1729a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataFieldRestRepository.java
@@ -17,11 +17,11 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -55,7 +55,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(MetadataFieldRest.CATEGORY + "." + MetadataFieldRest.NAME)
+@Component(MetadataFieldRest.CATEGORY + "." + MetadataFieldRest.PLURAL_NAME)
 public class MetadataFieldRestRepository extends DSpaceRestRepository<MetadataFieldRest, Integer> {
     /**
      * log4j logger
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java
index d9c148b71c..d7338dc314 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/MetadataSchemaRestRepository.java
@@ -13,11 +13,11 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.MetadataSchemaRest;
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(MetadataSchemaRest.CATEGORY + "." + MetadataSchemaRest.NAME)
+@Component(MetadataSchemaRest.CATEGORY + "." + MetadataSchemaRest.PLURAL_NAME)
 public class MetadataSchemaRestRepository extends DSpaceRestRepository<MetadataSchemaRest, Integer> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/NotifyServiceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/NotifyServiceRestRepository.java
new file mode 100644
index 0000000000..bff0abc961
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/NotifyServiceRestRepository.java
@@ -0,0 +1,211 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import static java.lang.String.format;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.NotifyServiceInboundPatternRest;
+import org.dspace.app.rest.model.NotifyServiceRest;
+import org.dspace.app.rest.model.patch.Patch;
+import org.dspace.app.rest.repository.patch.ResourcePatch;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * This is the repository responsible to manage NotifyService Rest object
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+
+@Component(NotifyServiceRest.CATEGORY + "." + NotifyServiceRest.PLURAL_NAME)
+public class NotifyServiceRestRepository extends DSpaceRestRepository<NotifyServiceRest, Integer> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    ResourcePatch<NotifyServiceEntity> resourcePatch;
+
+    @Override
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public NotifyServiceRest findOne(Context context, Integer id) {
+        try {
+            NotifyServiceEntity notifyServiceEntity = notifyService.find(context, id);
+            if (notifyServiceEntity == null) {
+                throw new ResourceNotFoundException("The notifyService for ID: " + id + " could not be found");
+            }
+            return converter.toRest(notifyServiceEntity, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public Page<NotifyServiceRest> findAll(Context context, Pageable pageable) {
+        try {
+            return converter.toRestPage(notifyService.findAll(context), pageable, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    protected NotifyServiceRest createAndReturn(Context context) throws AuthorizeException, SQLException {
+        HttpServletRequest req = getRequestService().getCurrentRequest().getHttpServletRequest();
+        ObjectMapper mapper = new ObjectMapper();
+        NotifyServiceRest notifyServiceRest;
+        try {
+            ServletInputStream input = req.getInputStream();
+            notifyServiceRest = mapper.readValue(input, NotifyServiceRest.class);
+        } catch (IOException e1) {
+            throw new UnprocessableEntityException("Error parsing request body", e1);
+        }
+
+        if (notifyServiceRest.getScore() != null) {
+            if (notifyServiceRest.getScore().compareTo(java.math.BigDecimal.ZERO) == -1 ||
+                notifyServiceRest.getScore().compareTo(java.math.BigDecimal.ONE) == 1) {
+                throw new UnprocessableEntityException(format("Score out of range [0, 1] %s",
+                    notifyServiceRest.getScore().setScale(4).toPlainString()));
+            }
+        }
+
+        if (notifyService.findByLdnUrl(context,notifyServiceRest.getLdnUrl()) != null) {
+            throw new UnprocessableEntityException(format("LDN url already in use %s",
+                notifyServiceRest.getLdnUrl()));
+        }
+
+        NotifyServiceEntity notifyServiceEntity = notifyService.create(context, notifyServiceRest.getName());
+        notifyServiceEntity.setDescription(notifyServiceRest.getDescription());
+        notifyServiceEntity.setUrl(notifyServiceRest.getUrl());
+        notifyServiceEntity.setLdnUrl(notifyServiceRest.getLdnUrl());
+        notifyServiceEntity.setEnabled(notifyServiceRest.isEnabled());
+        notifyServiceEntity.setLowerIp(notifyServiceRest.getLowerIp());
+        notifyServiceEntity.setUpperIp(notifyServiceRest.getUpperIp());
+
+        if (notifyServiceRest.getNotifyServiceInboundPatterns() != null) {
+            appendNotifyServiceInboundPatterns(context, notifyServiceEntity,
+                notifyServiceRest.getNotifyServiceInboundPatterns());
+        }
+
+        notifyServiceEntity.setScore(notifyServiceRest.getScore());
+
+        notifyService.update(context, notifyServiceEntity);
+
+        return converter.toRest(notifyServiceEntity, utils.obtainProjection());
+    }
+
+    private void appendNotifyServiceInboundPatterns(Context context, NotifyServiceEntity notifyServiceEntity,
+        List<NotifyServiceInboundPatternRest> inboundPatternRests) throws SQLException {
+
+        List<NotifyServiceInboundPattern> inboundPatterns = new ArrayList<>();
+
+        for (NotifyServiceInboundPatternRest inboundPatternRest : inboundPatternRests) {
+            NotifyServiceInboundPattern inboundPattern = inboundPatternService.create(context, notifyServiceEntity);
+            inboundPattern.setPattern(inboundPatternRest.getPattern());
+            inboundPattern.setConstraint(inboundPatternRest.getConstraint());
+            inboundPattern.setAutomatic(inboundPatternRest.isAutomatic());
+
+            inboundPatterns.add(inboundPattern);
+        }
+
+        notifyServiceEntity.setInboundPatterns(inboundPatterns);
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    protected void patch(Context context, HttpServletRequest request, String apiCategory, String model, Integer id,
+                         Patch patch) throws AuthorizeException, SQLException {
+        NotifyServiceEntity notifyServiceEntity = notifyService.find(context, id);
+        if (notifyServiceEntity == null) {
+            throw new ResourceNotFoundException(
+                NotifyServiceRest.CATEGORY + "." + NotifyServiceRest.NAME + " with id: " + id + " not found");
+        }
+        resourcePatch.patch(context, notifyServiceEntity, patch.getOperations());
+        notifyService.update(context, notifyServiceEntity);
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    protected void delete(Context context, Integer id) throws AuthorizeException {
+        try {
+            NotifyServiceEntity notifyServiceEntity = notifyService.find(context, id);
+            if (notifyServiceEntity == null) {
+                throw new ResourceNotFoundException(NotifyServiceRest.CATEGORY + "." +
+                    NotifyServiceRest.NAME + " with id: " + id + " not found");
+            }
+            notifyService.delete(context, notifyServiceEntity);
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @SearchRestMethod(name = "byLdnUrl")
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public NotifyServiceRest findByLdnUrl(@Parameter(value = "ldnUrl", required = true) String ldnUrl) {
+        try {
+            NotifyServiceEntity notifyServiceEntity = notifyService.findByLdnUrl(obtainContext(), ldnUrl);
+            if (notifyServiceEntity == null) {
+                return null;
+            }
+            return converter.toRest(notifyServiceEntity, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @SearchRestMethod(name = "byInboundPattern")
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public Page<NotifyServiceRest> findManualServicesByInboundPattern(
+        @Parameter(value = "pattern", required = true) String pattern,
+        Pageable pageable) {
+        try {
+            List<NotifyServiceEntity> notifyServiceEntities =
+                notifyService.findManualServicesByInboundPattern(obtainContext(), pattern)
+                .stream()
+                .filter(NotifyServiceEntity::isEnabled)
+                .collect(Collectors.toList());
+
+            return converter.toRestPage(notifyServiceEntities, pageable, utils.obtainProjection());
+        } catch (SQLException e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+    }
+
+    @Override
+    public Class<NotifyServiceRest> getDomainClass() {
+        return NotifyServiceRest.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
index 0c44baaf0d..77d7ba2361 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidHistoryRestRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
 import org.dspace.app.rest.model.OrcidHistoryRest;
 import org.dspace.app.rest.repository.handler.service.UriListHandlerService;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  *
  */
-@Component(OrcidHistoryRest.CATEGORY  + "." + OrcidHistoryRest.NAME)
+@Component(OrcidHistoryRest.CATEGORY  + "." + OrcidHistoryRest.PLURAL_NAME)
 @ConditionalOnProperty("orcid.synchronization-enabled")
 public class OrcidHistoryRestRepository extends DSpaceRestRepository<OrcidHistoryRest, Integer> {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
index 0a1614cded..9334103fb6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/OrcidQueueRestRepository.java
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
-@Component(OrcidQueueRest.CATEGORY + "." + OrcidQueueRest.NAME)
+@Component(OrcidQueueRest.CATEGORY + "." + OrcidQueueRest.PLURAL_NAME)
 @ConditionalOnProperty("orcid.synchronization-enabled")
 public class OrcidQueueRestRepository extends DSpaceRestRepository<OrcidQueueRest, Integer> {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java
index da5253608e..18995b4a02 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskRestRepository.java
@@ -48,7 +48,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(PoolTaskRest.CATEGORY + "." + PoolTaskRest.NAME)
+@Component(PoolTaskRest.CATEGORY + "." + PoolTaskRest.PLURAL_NAME)
 public class PoolTaskRestRepository extends DSpaceRestRepository<PoolTaskRest, Integer>
                                     implements InitializingBean {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskStepLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskStepLinkRepository.java
index 6e7f4f84ac..9af6a57309 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskStepLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/PoolTaskStepLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.PoolTaskRest;
 import org.dspace.app.rest.model.WorkflowStepRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repositoy for the Steps subresources of an individual PoolTask
  */
-@Component(PoolTaskRest.CATEGORY + "." + PoolTaskRest.NAME + "." + PoolTaskRest.STEP)
+@Component(PoolTaskRest.CATEGORY + "." + PoolTaskRest.PLURAL_NAME + "." + PoolTaskRest.STEP)
 public class PoolTaskStepLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFileTypesLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFileTypesLinkRepository.java
index 16c8115b29..cb83379d8b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFileTypesLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFileTypesLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ProcessFileTypesRest;
 import org.dspace.app.rest.model.ProcessRest;
 import org.dspace.app.rest.projection.Projection;
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
  * It'll retrieve all the bitstreams for the given Process and return a {@link ProcessFileTypesRest} object that holds
  * a list of Strings where each String represents a unique fileType of the Bitstreams for that Process
  */
-@Component(ProcessRest.CATEGORY + "." + ProcessRest.NAME + "." + ProcessRest.FILE_TYPES)
+@Component(ProcessRest.CATEGORY + "." + ProcessRest.PLURAL_NAME + "." + ProcessRest.FILE_TYPES)
 public class ProcessFileTypesLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFilesLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFilesLinkRepository.java
index 5d8251cf19..d981a9c797 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFilesLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessFilesLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.BitstreamRest;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
  * {@link org.dspace.content.Bitstream} objects for the Process endpoints
  *
  */
-@Component(ProcessRest.CATEGORY + "." + ProcessRest.NAME + "." + ProcessRest.FILES)
+@Component(ProcessRest.CATEGORY + "." + ProcessRest.PLURAL_NAME + "." + ProcessRest.FILES)
 public class ProcessFilesLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     private static final Logger log = LogManager.getLogger();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessOutputLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessOutputLinkRepository.java
index f5b3edced2..016450c925 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessOutputLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessOutputLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.ProcessRest;
 import org.dspace.app.rest.projection.Projection;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
  * This linkRepository will deal with calls to the /output endpoint of a given Process.
  * It'll retrieve the output for the given Process and return this as a {@link BitstreamRest} object
  */
-@Component(ProcessRest.CATEGORY + "." + ProcessRest.NAME + "." + ProcessRest.OUTPUT)
+@Component(ProcessRest.CATEGORY + "." + ProcessRest.PLURAL_NAME + "." + ProcessRest.OUTPUT)
 public class ProcessOutputLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
@@ -68,4 +68,4 @@ public class ProcessOutputLinkRepository extends AbstractDSpaceRestRepository im
         }
         return converter.toRest(bitstream, projection);
     }
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessRestRepository.java
index 2479eeda97..24152ed569 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ProcessRestRepository.java
@@ -47,7 +47,7 @@ import org.springframework.stereotype.Component;
 /**
  * The repository for the Process workload
  */
-@Component(ProcessRest.CATEGORY + "." + ProcessRest.NAME)
+@Component(ProcessRest.CATEGORY + "." + ProcessRest.PLURAL_NAME)
 public class ProcessRestRepository extends DSpaceRestRepository<ProcessRest, Integer> {
 
     private static final Logger log = LogManager.getLogger();
@@ -230,6 +230,9 @@ public class ProcessRestRepository extends DSpaceRestRepository<ProcessRest, Int
                 } else if (StringUtils.equalsIgnoreCase(order.getProperty(), "endTime")) {
                     processQueryParameterContainer.setSortProperty(Process_.FINISHED_TIME);
                     processQueryParameterContainer.setSortOrder(order.getDirection().name());
+                } else if (StringUtils.equalsIgnoreCase(order.getProperty(), "creationTime")) {
+                    processQueryParameterContainer.setSortProperty(Process_.CREATION_TIME);
+                    processQueryParameterContainer.setSortOrder(order.getDirection().name());
                 } else {
                     throw new DSpaceBadRequestException("The given sort option was invalid: " + order.getProperty());
                 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRelatedLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRelatedLinkRepository.java
new file mode 100644
index 0000000000..f4e84a233b
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRelatedLinkRepository.java
@@ -0,0 +1,77 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "related" subresource of a qa event.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component(QAEventRest.CATEGORY + "." + QAEventRest.PLURAL_NAME + "." + QAEventRest.RELATED)
+public class QAEventRelatedLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * Returns the item related to the qa event with the given id. This is another
+     * item that should be linked to the target item as part of the correction
+     *
+     * @param request    the http servlet request
+     * @param id         the qa event id
+     * @param pageable   the optional pageable
+     * @param projection the projection object
+     * @return the item rest representation of the secondary item related to qa event
+     */
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'READ')")
+    public ItemRest getRelated(@Nullable HttpServletRequest request, String id, @Nullable Pageable pageable,
+            Projection projection) {
+        Context context = obtainContext();
+        QAEvent qaEvent = qaEventService.findEventByEventId(id);
+        if (qaEvent == null) {
+            throw new ResourceNotFoundException("No qa event with ID: " + id);
+        }
+        if (qaEvent.getRelated() == null) {
+            return null;
+        }
+        UUID itemUuid = UUID.fromString(qaEvent.getRelated());
+        Item item;
+        try {
+            item = itemService.find(context, itemUuid);
+            if (item == null) {
+                throw new ResourceNotFoundException("No related item found with id : " + id);
+            }
+            return converter.toRest(item, projection);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRestRepository.java
new file mode 100644
index 0000000000..e6c25dfd9f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventRestRepository.java
@@ -0,0 +1,206 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Objects;
+import java.util.UUID;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang.StringUtils;
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.model.patch.Patch;
+import org.dspace.app.rest.repository.patch.ResourcePatch;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.correctiontype.CorrectionType;
+import org.dspace.correctiontype.service.CorrectionTypeService;
+import org.dspace.eperson.EPerson;
+import org.dspace.qaevent.dao.QAEventsDAO;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.qaevent.service.dto.CorrectionTypeMessageDTO;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Rest repository that handle QA events.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component(QAEventRest.CATEGORY + "." + QAEventRest.PLURAL_NAME)
+public class QAEventRestRepository extends DSpaceRestRepository<QAEventRest, String> {
+
+    final static String ORDER_FIELD = "trust";
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    @Autowired
+    private QAEventsDAO qaEventDao;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private ResourcePatch<QAEvent> resourcePatch;
+
+    @Autowired
+    private CorrectionTypeService correctionTypeService;
+
+    @Override
+    public Page<QAEventRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException(QAEventRest.NAME, "findAll");
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'READ')")
+    public QAEventRest findOne(Context context, String id) {
+        QAEvent qaEvent = qaEventService.findEventByEventId(id);
+        if (qaEvent == null) {
+            // check if this request is part of a patch flow
+            qaEvent = (QAEvent) requestService.getCurrentRequest().getAttribute("patchedNotificationEvent");
+            if (qaEvent != null && qaEvent.getEventId().contentEquals(id)) {
+                return converter.toRest(qaEvent, utils.obtainProjection());
+            } else {
+                return null;
+            }
+        }
+        return converter.toRest(qaEvent, utils.obtainProjection());
+    }
+
+    @SearchRestMethod(name = "findByTopic")
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public Page<QAEventRest> findByTopic(@Parameter(value = "topic", required = true) String topic,
+        Pageable pageable) {
+        Context context = obtainContext();
+        String[] topicIdSplitted = topic.split(":", 3);
+        if (topicIdSplitted.length < 2) {
+            return null;
+        }
+        String sourceName = topicIdSplitted[0];
+        String topicName = topicIdSplitted[1].replaceAll("!", "/");
+        UUID target = topicIdSplitted.length == 3 ? UUID.fromString(topicIdSplitted[2]) : null;
+        List<QAEvent> qaEvents = qaEventService.findEventsByTopicAndTarget(context, sourceName, topicName, target,
+            pageable.getOffset(), pageable.getPageSize());
+        long count = qaEventService.countEventsByTopicAndTarget(context, sourceName, topicName, target);
+        if (qaEvents == null) {
+            return null;
+        }
+        return converter.toRestPage(qaEvents, pageable, count, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'DELETE')")
+    protected void delete(Context context, String id) throws AuthorizeException {
+        Item item = findTargetItem(context, id);
+        EPerson eperson = context.getCurrentUser();
+        qaEventService.deleteEventByEventId(id);
+        qaEventDao.storeEvent(context, id, eperson, item);
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'WRITE')")
+    protected void patch(Context context, HttpServletRequest request, String apiCategory, String model,
+        String id, Patch patch) throws SQLException, AuthorizeException {
+        QAEvent qaEvent = qaEventService.findEventByEventId(id);
+        resourcePatch.patch(context, qaEvent, patch.getOperations());
+    }
+
+    private Item findTargetItem(Context context, String eventId) {
+        QAEvent qaEvent = qaEventService.findEventByEventId(eventId);
+        if (qaEvent == null) {
+            return null;
+        }
+
+        try {
+            return itemService.find(context, UUIDUtils.fromString(qaEvent.getTarget()));
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    protected QAEventRest createAndReturn(Context context) throws SQLException, AuthorizeException {
+        ServletRequest request = getRequestService().getCurrentRequest().getServletRequest();
+
+        String itemUUID = request.getParameter("target");
+        String relatedItemUUID = request.getParameter("related");
+        String correctionTypeStr = request.getParameter("correctionType");
+
+
+        if (StringUtils.isBlank(correctionTypeStr) || StringUtils.isBlank(itemUUID)) {
+            throw new UnprocessableEntityException("The target item and correctionType must be provided!");
+        }
+
+        Item targetItem = null;
+        Item relatedItem = null;
+        try {
+            targetItem = itemService.find(context, UUID.fromString(itemUUID));
+            relatedItem =  StringUtils.isNotBlank(relatedItemUUID) ?
+                                       itemService.find(context, UUID.fromString(relatedItemUUID)) : null;
+        } catch (Exception e) {
+            throw new UnprocessableEntityException(e.getMessage(), e);
+        }
+
+        if (Objects.isNull(targetItem)) {
+            throw new UnprocessableEntityException("The target item UUID is not valid!");
+        }
+
+        CorrectionType correctionType = correctionTypeService.findOne(correctionTypeStr);
+        if (Objects.isNull(correctionType)) {
+            throw new UnprocessableEntityException("The given correction type in the request is not valid!");
+        }
+
+        if (correctionType.isRequiredRelatedItem() && Objects.isNull(relatedItem)) {
+            throw new UnprocessableEntityException("The given correction type in the request is not valid!");
+        }
+
+        if (!correctionType.isAllowed(context, targetItem)) {
+            throw new UnprocessableEntityException("This item cannot be processed by this correction type!");
+        }
+
+        ObjectMapper mapper = new ObjectMapper();
+        CorrectionTypeMessageDTO reason = null;
+        try {
+            reason = mapper.readValue(request.getInputStream(), CorrectionTypeMessageDTO.class);
+        } catch (IOException exIO) {
+            throw new UnprocessableEntityException("error parsing the body " + exIO.getMessage(), exIO);
+        }
+
+        QAEvent qaEvent;
+        if (correctionType.isRequiredRelatedItem()) {
+            qaEvent = correctionType.createCorrection(context, targetItem, relatedItem, reason);
+        } else {
+            qaEvent = correctionType.createCorrection(context, targetItem, reason);
+        }
+        return converter.toRest(qaEvent, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<QAEventRest> getDomainClass() {
+        return QAEventRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventTargetLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventTargetLinkRepository.java
new file mode 100644
index 0000000000..eb2ca8317b
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventTargetLinkRepository.java
@@ -0,0 +1,73 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "target" subresource of a qa event.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component(QAEventRest.CATEGORY + "." + QAEventRest.PLURAL_NAME + "." + QAEventRest.TARGET)
+public class QAEventTargetLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * Returns the item target of the qa event with the given id.
+     *
+     * @param request    the http servlet request
+     * @param id         the qa event id
+     * @param pageable   the optional pageable
+     * @param projection the projection object
+     * @return           the item rest representation of the qa event target
+     */
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'READ')")
+    public ItemRest getTarget(@Nullable HttpServletRequest request, String id, @Nullable Pageable pageable,
+            Projection projection) {
+        Context context = obtainContext();
+        QAEvent qaEvent = qaEventService.findEventByEventId(id);
+        if (qaEvent == null) {
+            throw new ResourceNotFoundException("No qa event with ID: " + id);
+        }
+        UUID itemUuid = UUID.fromString(qaEvent.getTarget());
+        Item item;
+        try {
+            item = itemService.find(context, itemUuid);
+            if (item == null) {
+                throw new ResourceNotFoundException("No target item found with id : " + id);
+            }
+            return converter.toRest(item, projection);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventTopicLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventTopicLinkRepository.java
new file mode 100644
index 0000000000..02eeaae0d7
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QAEventTopicLinkRepository.java
@@ -0,0 +1,63 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.model.QATopicRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QATopic;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "topic" subresource of a qa event.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component(QAEventRest.CATEGORY + "." + QAEventRest.PLURAL_NAME + "." + QAEventRest.TOPIC)
+public class QAEventTopicLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    /**
+     * Returns the topic of the qa event with the given id.
+     *
+     * @param request    the http servlet request
+     * @param id         the qa event id
+     * @param pageable   the optional pageable
+     * @param projection the projection object
+     * @return           the qa topic rest representation
+     */
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCEEVENT', 'READ')")
+    public QATopicRest getTopic(@Nullable HttpServletRequest request, String id, @Nullable Pageable pageable,
+            Projection projection) {
+        Context context = obtainContext();
+        QAEvent qaEvent = qaEventService.findEventByEventId(id);
+        if (qaEvent == null) {
+            throw new ResourceNotFoundException("No qa event with ID: " + id);
+        }
+        String source = qaEvent.getSource();
+        String topicName = qaEvent.getTopic();
+        QATopic topic = qaEventService
+                .findTopicBySourceAndNameAndTarget(context, source, topicName, null);
+        if (topic == null) {
+            throw new ResourceNotFoundException("No topic found with source: " + source + " topic: " + topicName);
+        }
+        return converter.toRest(topic, projection);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QASourceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QASourceRestRepository.java
new file mode 100644
index 0000000000..a227f81dad
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QASourceRestRepository.java
@@ -0,0 +1,74 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.model.QASourceRest;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QASource;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Rest repository that handle QA sources.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@Component(QASourceRest.CATEGORY + "." + QASourceRest.PLURAL_NAME)
+public class QASourceRestRepository extends DSpaceRestRepository<QASourceRest, String> {
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCESOURCE', 'READ')")
+    public QASourceRest findOne(Context context, String id) {
+        QASource qaSource = qaEventService.findSource(context, id);
+        if (qaSource == null) {
+            return null;
+        }
+        return converter.toRest(qaSource, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public Page<QASourceRest> findAll(Context context, Pageable pageable) {
+        List<QASource> qaSources = qaEventService.findAllSources(context, pageable.getOffset(), pageable.getPageSize());
+        long count = qaEventService.countSources(context);
+        return converter.toRestPage(qaSources, pageable, count, utils.obtainProjection());
+    }
+
+    @SearchRestMethod(name = "byTarget")
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public Page<QASourceRest> findByTarget(@Parameter(value = "target", required = true) UUID target,
+           Pageable pageable) {
+        Context context = obtainContext();
+        List<QASource> topics = qaEventService.findAllSourcesByTarget(context, target,
+                                        pageable.getOffset(), pageable.getPageSize());
+        long count = qaEventService.countSourcesByTarget(context, target);
+        if (topics == null) {
+            return null;
+        }
+        return converter.toRestPage(topics, pageable, count, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<QASourceRest> getDomainClass() {
+        return QASourceRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QATopicRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QATopicRestRepository.java
new file mode 100644
index 0000000000..ccd85e81e7
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/QATopicRestRepository.java
@@ -0,0 +1,105 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.model.QATopicRest;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QATopic;
+import org.dspace.qaevent.service.QAEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Rest repository that handle QA topics.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component(QATopicRest.CATEGORY + "." + QATopicRest.PLURAL_NAME)
+public class QATopicRestRepository extends DSpaceRestRepository<QATopicRest, String> {
+
+    final static String ORDER_FIELD = "topic";
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Override
+    public Page<QATopicRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException("Method not allowed!", "");
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'QUALITYASSURANCETOPIC', 'READ')")
+    public QATopicRest findOne(Context context, String id) {
+        String[] topicIdSplitted = id.split(":", 3);
+        if (topicIdSplitted.length < 2) {
+            return null;
+        }
+        String sourceName = topicIdSplitted[0];
+        String topicName = topicIdSplitted[1].replaceAll("!", "/");
+        UUID target = topicIdSplitted.length == 3 ? UUID.fromString(topicIdSplitted[2]) : null;
+        QATopic topic = qaEventService.findTopicBySourceAndNameAndTarget(context, sourceName, topicName, target);
+        return (topic != null) ? converter.toRest(topic, utils.obtainProjection()) : null;
+    }
+
+    @SearchRestMethod(name = "bySource")
+    @PreAuthorize("hasPermission(#source, 'QUALITYASSURANCETOPIC', 'READ')")
+    public Page<QATopicRest> findBySource(@Parameter(value = "source", required = true) String source,
+           Pageable pageable) {
+        Context context = obtainContext();
+        boolean ascending = false;
+        if (pageable.getSort() != null && pageable.getSort().getOrderFor(ORDER_FIELD) != null) {
+            ascending = pageable.getSort().getOrderFor(ORDER_FIELD).getDirection() == Direction.ASC;
+        }
+        List<QATopic> topics = qaEventService.findAllTopicsBySource(context, source,
+                                              pageable.getOffset(), pageable.getPageSize(), ORDER_FIELD, ascending);
+        long count = qaEventService.countTopicsBySource(context, source);
+        if (topics == null) {
+            return null;
+        }
+        return converter.toRestPage(topics, pageable, count, utils.obtainProjection());
+    }
+
+    @SearchRestMethod(name = "byTarget")
+    @PreAuthorize("hasPermission(#target, 'ITEM', 'READ')")
+    public Page<QATopicRest> findByTarget(@Parameter(value = "target", required = true) UUID target,
+        @Parameter(value = "source", required = true) String source, Pageable pageable) {
+        Context context = obtainContext();
+        boolean ascending = false;
+        if (pageable.getSort() != null && pageable.getSort().getOrderFor(ORDER_FIELD) != null) {
+            ascending = pageable.getSort().getOrderFor(ORDER_FIELD).getDirection() == Direction.ASC;
+        }
+        List<QATopic> topics = qaEventService.findAllTopicsBySourceAndTarget(context, source, target,
+                                              pageable.getOffset(), pageable.getPageSize(), ORDER_FIELD, ascending);
+        long count = qaEventService.countTopicsBySourceAndTarget(context, source, target);
+        if (topics == null) {
+            return null;
+        }
+        return converter.toRestPage(topics, pageable, count, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<QATopicRest> getDomainClass() {
+        return QATopicRest.class;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java
index be28170d8a..9c1c3b393b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RegistrationRestRepository.java
@@ -11,11 +11,11 @@ import static org.dspace.eperson.service.CaptchaService.REGISTER_ACTION;
 
 import java.io.IOException;
 import java.sql.SQLException;
-import javax.mail.MessagingException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.mail.MessagingException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -43,12 +43,13 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
 
 /**
  * This is the repository that is responsible for managing Registration Rest objects
  */
-@Component(RegistrationRest.CATEGORY + "." + RegistrationRest.NAME)
+@Component(RegistrationRest.CATEGORY + "." + RegistrationRest.PLURAL_NAME)
 public class RegistrationRestRepository extends DSpaceRestRepository<RegistrationRest, Integer> {
 
     private static Logger log = LogManager.getLogger(RegistrationRestRepository.class);
@@ -79,6 +80,7 @@ public class RegistrationRestRepository extends DSpaceRestRepository<Registratio
     private RegistrationDataService registrationDataService;
 
     @Override
+    @PreAuthorize("permitAll()")
     public RegistrationRest findOne(Context context, Integer integer) {
         throw new RepositoryMethodNotImplementedException("No implementation found; Method not allowed!", "");
     }
@@ -127,6 +129,9 @@ public class RegistrationRestRepository extends DSpaceRestRepository<Registratio
         }
         if (eperson != null && accountType.equalsIgnoreCase(TYPE_FORGOT)) {
             try {
+                if (!AuthorizeUtil.authorizeForgotPassword()) {
+                    throw new AccessDeniedException("Password reset is not allowed!");
+                }
                 if (!AuthorizeUtil.authorizeUpdatePassword(context, eperson.getEmail())) {
                     throw new DSpaceBadRequestException("Password cannot be updated for the given EPerson with email: "
                                                             + eperson.getEmail());
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
index 6be4f390da..5d3c0b2e4e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipRestRepository.java
@@ -15,10 +15,10 @@ import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -52,7 +52,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the repository that is responsible to manage Relationship Rest objects
  */
-@Component(RelationshipRest.CATEGORY + "." + RelationshipRest.NAME)
+@Component(RelationshipRest.CATEGORY + "." + RelationshipRest.PLURAL_NAME)
 public class RelationshipRestRepository extends DSpaceRestRepository<RelationshipRest, Integer> {
 
     private static final Logger log = LogManager.getLogger();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java
index a6c31d0c16..9e1048929d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRelationshipLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.RelationshipRest;
 import org.dspace.app.rest.model.RelationshipTypeRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "relationshipType" subresource of an individual Relationship.
  */
-@Component(RelationshipRest.CATEGORY + "." + RelationshipRest.NAME + "." + RelationshipRest.RELATIONSHIP_TYPE)
+@Component(RelationshipRest.CATEGORY + "." + RelationshipRest.PLURAL_NAME + "." + RelationshipRest.RELATIONSHIP_TYPE)
 public class RelationshipTypeRelationshipLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRestRepository.java
index a4e65d75a3..31a1e09168 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RelationshipTypeRestRepository.java
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the repository that is responsible to manage RelationshipType Rest objects
  */
-@Component(RelationshipTypeRest.CATEGORY + "." + RelationshipTypeRest.NAME)
+@Component(RelationshipTypeRest.CATEGORY + "." + RelationshipTypeRest.PLURAL_NAME)
 public class RelationshipTypeRestRepository extends DSpaceRestRepository<RelationshipTypeRest, Integer> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
index 5945d51660..eaae877f28 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/RequestItemRepository.java
@@ -12,15 +12,17 @@ import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.SQLException;
 import java.util.Date;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.logging.log4j.LogManager;
@@ -53,7 +55,7 @@ import org.springframework.web.util.HtmlUtils;
  *
  * @author Mark H. Wood <mwood@iupui.edu>
  */
-@Component(RequestItemRest.CATEGORY + '.' + RequestItemRest.NAME)
+@Component(RequestItemRest.CATEGORY + '.' + RequestItemRest.PLURAL_NAME)
 public class RequestItemRepository
         extends DSpaceRestRepository<RequestItemRest, String> {
     private static final Logger LOG = LogManager.getLogger();
@@ -287,19 +289,24 @@ public class RequestItemRepository
      * Generate a link back to DSpace, to act on a request.
      *
      * @param token identifies the request.
-     * @return URL to the item request API, with the token as request parameter
-     *          "token".
+     * @return URL to the item request API, with /request-a-copy/{token} as the last URL segments
      * @throws URISyntaxException passed through.
      * @throws MalformedURLException passed through.
      */
-    private String getLinkTokenEmail(String token)
+    public String getLinkTokenEmail(String token)
             throws URISyntaxException, MalformedURLException {
         final String base = configurationService.getProperty("dspace.ui.url");
 
-        URI link = new URIBuilder(base)
-                .setPathSegments("request-a-copy", token)
-                .build();
+        // Construct the link, making sure to support sub-paths
+        URIBuilder uriBuilder = new URIBuilder(base);
+        List<String> segments = new LinkedList<>();
+        if (StringUtils.isNotBlank(uriBuilder.getPath())) {
+            segments.add(StringUtils.strip(uriBuilder.getPath(), "/"));
+        }
+        segments.add("request-a-copy");
+        segments.add(token);
 
-        return link.toURL().toExternalForm();
+        // Build and return the URL from segments (or throw exception)
+        return uriBuilder.setPathSegments(segments).build().toURL().toExternalForm();
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
index 92bbf6996d..3f0a1e84b7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileEPersonLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.model.ResearcherProfileRest;
 import org.dspace.app.rest.projection.Projection;
@@ -34,7 +34,8 @@ import org.springframework.stereotype.Component;
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
-@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.NAME + "." + ResearcherProfileRest.EPERSON)
+@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.PLURAL_NAME + "." +
+    ResearcherProfileRest.EPERSON)
 public class ResearcherProfileEPersonLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
index 5f212b966f..c46f9dbf7c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileItemLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.ResearcherProfileRest;
 import org.dspace.app.rest.projection.Projection;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
-@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.NAME + "." + ResearcherProfileRest.ITEM)
+@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.PLURAL_NAME + "." + ResearcherProfileRest.ITEM)
 public class ResearcherProfileItemLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
index 37717f6268..4212f01782 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResearcherProfileRestRepository.java
@@ -11,8 +11,8 @@ import java.net.URI;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
@@ -45,7 +45,7 @@ import org.springframework.stereotype.Component;
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
-@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.NAME)
+@Component(ResearcherProfileRest.CATEGORY + "." + ResearcherProfileRest.PLURAL_NAME)
 @ConditionalOnProperty(value = "researcher-profile.entity-type")
 public class ResearcherProfileRestRepository extends DSpaceRestRepository<ResearcherProfileRest, UUID> {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java
index a79a9fe4ea..8b598aeeae 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ResourcePolicyRestRepository.java
@@ -12,9 +12,9 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.DiscoverableEndpointsService;
 import org.dspace.app.rest.Parameter;
 import org.dspace.app.rest.SearchRestMethod;
@@ -51,7 +51,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
-@Component(ResourcePolicyRest.CATEGORY + "." + ResourcePolicyRest.NAME)
+@Component(ResourcePolicyRest.CATEGORY + "." + ResourcePolicyRest.PLURAL_NAME)
 public class ResourcePolicyRestRepository extends DSpaceRestRepository<ResourcePolicyRest, Integer>
                                           implements InitializingBean {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
index 1eea06a4ee..e26f91c889 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
@@ -46,7 +46,7 @@ import org.springframework.web.multipart.MultipartFile;
 /**
  * This is the REST repository dealing with the Script logic
  */
-@Component(ScriptRest.CATEGORY + "." + ScriptRest.NAME)
+@Component(ScriptRest.CATEGORY + "." + ScriptRest.PLURAL_NAME)
 public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, String> {
 
     private static final Logger log = LogManager.getLogger();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SearchEventRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SearchEventRestRepository.java
index b55536d75e..029047b1dc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SearchEventRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SearchEventRestRepository.java
@@ -8,10 +8,10 @@
 package org.dspace.app.rest.repository;
 
 import java.io.IOException;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.converter.SearchEventConverter;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
@@ -25,7 +25,7 @@ import org.dspace.usage.UsageSearchEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-@Component(SearchEventRest.CATEGORY + "." + SearchEventRest.NAME)
+@Component(SearchEventRest.CATEGORY + "." + SearchEventRest.PLURAL_NAME)
 public class SearchEventRestRepository extends AbstractDSpaceRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SiteRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SiteRestRepository.java
index bf13700078..1d31b98967 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SiteRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SiteRestRepository.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.SiteRest;
 import org.dspace.app.rest.model.patch.Patch;
 import org.dspace.authorize.AuthorizeException;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(SiteRest.CATEGORY + "." + SiteRest.NAME)
+@Component(SiteRest.CATEGORY + "." + SiteRest.PLURAL_NAME)
 public class SiteRestRepository extends DSpaceObjectRestRepository<Site, SiteRest> {
 
     private final SiteService sitesv;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/StatisticsRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/StatisticsRestRepository.java
index 09588a6045..d1336e5d8a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/StatisticsRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/StatisticsRestRepository.java
@@ -31,7 +31,7 @@ import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Component;
 
-@Component(StatisticsSupportRest.CATEGORY + "." + UsageReportRest.NAME)
+@Component(StatisticsSupportRest.CATEGORY + "." + UsageReportRest.PLURAL_NAME)
 public class StatisticsRestRepository extends DSpaceRestRepository<UsageReportRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionAccessOptionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionAccessOptionRestRepository.java
index a4117a6176..85893dd161 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionAccessOptionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionAccessOptionRestRepository.java
@@ -25,7 +25,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
  */
-@Component(SubmissionAccessOptionRest.CATEGORY + "." + SubmissionAccessOptionRest.NAME)
+@Component(SubmissionAccessOptionRest.CATEGORY + "." + SubmissionAccessOptionRest.PLURAL_NAME)
 public class SubmissionAccessOptionRestRepository extends DSpaceRestRepository<SubmissionAccessOptionRest, String> {
 
     @Autowired
@@ -48,4 +48,4 @@ public class SubmissionAccessOptionRestRepository extends DSpaceRestRepository<S
         return SubmissionAccessOptionRest.class;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java
index 356b3f22bf..40a9bc622d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCCLicenseRestRepository.java
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the repository that is responsible to manage CCLicense Rest objects
  */
-@Component(SubmissionCCLicenseRest.CATEGORY + "." + SubmissionCCLicenseRest.NAME)
+@Component(SubmissionCCLicenseRest.CATEGORY + "." + SubmissionCCLicenseRest.PLURAL_NAME)
 public class SubmissionCCLicenseRestRepository extends DSpaceRestRepository<SubmissionCCLicenseRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCoarNotifyRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCoarNotifyRestRepository.java
new file mode 100644
index 0000000000..305c1a4f29
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionCoarNotifyRestRepository.java
@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import org.dspace.app.rest.model.SubmissionCOARNotifyRest;
+import org.dspace.coarnotify.NotifySubmissionConfiguration;
+import org.dspace.coarnotify.service.SubmissionNotifyService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository that is responsible to manage Submission COAR Notify Rest objects
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component(SubmissionCOARNotifyRest.CATEGORY + "." + SubmissionCOARNotifyRest.PLURAL_NAME)
+public class SubmissionCoarNotifyRestRepository extends DSpaceRestRepository<SubmissionCOARNotifyRest, String> {
+
+    @Autowired
+    protected SubmissionNotifyService submissionCOARNotifyService;
+
+    @Override
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public SubmissionCOARNotifyRest findOne(final Context context, final String id) {
+        NotifySubmissionConfiguration coarNotifySubmissionConfiguration = submissionCOARNotifyService.findOne(id);
+        if (coarNotifySubmissionConfiguration == null) {
+            throw new ResourceNotFoundException(
+                "No COAR Notify Submission Configuration found for ID: " + id );
+        }
+        return converter.toRest(coarNotifySubmissionConfiguration, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('AUTHENTICATED')")
+    public Page<SubmissionCOARNotifyRest> findAll(final Context context, final Pageable pageable) {
+        return converter.toRestPage(submissionCOARNotifyService.findAll(),
+            pageable, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<SubmissionCOARNotifyRest> getDomainClass() {
+        return SubmissionCOARNotifyRest.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionDefinitionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionDefinitionRestRepository.java
index 17eb90b790..784058ae1c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionDefinitionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionDefinitionRestRepository.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(SubmissionDefinitionRest.CATEGORY + "." + SubmissionDefinitionRest.NAME)
+@Component(SubmissionDefinitionRest.CATEGORY + "." + SubmissionDefinitionRest.PLURAL_NAME)
 public class SubmissionDefinitionRestRepository extends DSpaceRestRepository<SubmissionDefinitionRest, String> {
     private SubmissionConfigService submissionConfigService;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionFormRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionFormRestRepository.java
index 76d680cf27..a5b9592aa0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionFormRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionFormRestRepository.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(SubmissionFormRest.CATEGORY + "." + SubmissionFormRest.NAME)
+@Component(SubmissionFormRest.CATEGORY + "." + SubmissionFormRest.PLURAL_NAME)
 public class SubmissionFormRestRepository extends DSpaceRestRepository<SubmissionFormRest, String> {
     private Map<Locale, DCInputsReader> inputReaders;
     private DCInputsReader defaultInputReader;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionPanelRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionPanelRestRepository.java
index 62d104c0a6..5eb02d54a5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionPanelRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionPanelRestRepository.java
@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
-@Component(SubmissionDefinitionRest.CATEGORY + "." + SubmissionSectionRest.NAME)
+@Component(SubmissionDefinitionRest.CATEGORY + "." + SubmissionSectionRest.PLURAL_NAME)
 public class SubmissionPanelRestRepository extends DSpaceRestRepository<SubmissionSectionRest, String> {
 
     private SubmissionConfigService submissionConfigService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionUploadRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionUploadRestRepository.java
index 24b6b96961..9b5bed759e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionUploadRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubmissionUploadRestRepository.java
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
-@Component(SubmissionUploadRest.CATEGORY + "." + SubmissionUploadRest.NAME)
+@Component(SubmissionUploadRest.CATEGORY + "." + SubmissionUploadRest.PLURAL_NAME)
 public class SubmissionUploadRestRepository extends DSpaceRestRepository<SubmissionUploadRest, String> {
 
     private static final Logger log = org.apache.logging.log4j.LogManager
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java
index 95c4714e9c..7e2e32eb9e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionDSpaceObjectLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.DSpaceObjectRest;
 import org.dspace.app.rest.model.SubscriptionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "DSpaceObject" of subscription
  */
-@Component(SubscriptionRest.CATEGORY + "." + SubscriptionRest.NAME + "." + SubscriptionRest.DSPACE_OBJECT)
+@Component(SubscriptionRest.CATEGORY + "." + SubscriptionRest.PLURAL_NAME + "." + SubscriptionRest.DSPACE_OBJECT)
 public class SubscriptionDSpaceObjectLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
@@ -46,4 +46,4 @@ public class SubscriptionDSpaceObjectLinkRepository extends AbstractDSpaceRestRe
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java
index dcf612e52d..25144810bc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionEPersonLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.model.SubscriptionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "eperson" of subscription
  */
-@Component(SubscriptionRest.CATEGORY + "." + SubscriptionRest.NAME + "." + SubscriptionRest.EPERSON)
+@Component(SubscriptionRest.CATEGORY + "." + SubscriptionRest.PLURAL_NAME + "." + SubscriptionRest.EPERSON)
 public class SubscriptionEPersonLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
@@ -46,4 +46,4 @@ public class SubscriptionEPersonLinkRepository extends AbstractDSpaceRestReposit
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionRestRepository.java
index ce1bcff11f..37d16414b2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SubscriptionRestRepository.java
@@ -20,11 +20,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.DiscoverableEndpointsService;
@@ -61,7 +61,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
  */
-@Component(SubscriptionRest.CATEGORY + "." + SubscriptionRest.NAME)
+@Component(SubscriptionRest.CATEGORY + "." + SubscriptionRest.PLURAL_NAME)
 public class SubscriptionRestRepository extends DSpaceRestRepository<SubscriptionRest, Integer>
                                          implements InitializingBean {
 
@@ -154,7 +154,7 @@ public class SubscriptionRestRepository extends DSpaceRestRepository<Subscriptio
         String dsoId = req.getParameter("resource");
 
         if (StringUtils.isBlank(dsoId) || StringUtils.isBlank(epersonId)) {
-            throw new UnprocessableEntityException("Both eperson than DSpaceObject uuids must be provieded!");
+            throw new UnprocessableEntityException("Both eperson than DSpaceObject uuids must be provided!");
         }
 
         try {
@@ -278,7 +278,7 @@ public class SubscriptionRestRepository extends DSpaceRestRepository<Subscriptio
     @Override
     public void afterPropertiesSet() throws Exception {
         discoverableEndpointsService.register(this, Arrays.asList(Link.of("/api/" + SubscriptionRest.CATEGORY +
-                       "/" + SubscriptionRest.NAME_PLURAL + "/search", SubscriptionRest.NAME_PLURAL + "-search")));
+                       "/" + SubscriptionRest.PLURAL_NAME + "/search", SubscriptionRest.PLURAL_NAME + "-search")));
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestRepository.java
new file mode 100644
index 0000000000..d8af5d78d4
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionRestRepository.java
@@ -0,0 +1,88 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.model.SuggestionRest;
+import org.dspace.app.rest.model.SuggestionTargetRest;
+import org.dspace.app.suggestion.Suggestion;
+import org.dspace.app.suggestion.SuggestionService;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible to manage Suggestion Target Rest object
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+
+@Component(SuggestionRest.CATEGORY + "." + SuggestionRest.PLURAL_NAME)
+public class SuggestionRestRepository extends DSpaceRestRepository<SuggestionRest, String> {
+    private final static String ORDER_FIELD = "trust";
+
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(SuggestionRestRepository.class);
+
+    @Autowired
+    private SuggestionService suggestionService;
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'SUGGESTION', 'READ')")
+    public SuggestionRest findOne(Context context, String id) {
+        Suggestion suggestion = suggestionService.findUnprocessedSuggestion(context, id);
+        if (suggestion == null) {
+            return null;
+        }
+        return converter.toRest(suggestion, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("permitAll()")
+    public Page<SuggestionRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException(SuggestionTargetRest.NAME, "findAll");
+    }
+
+    @PreAuthorize("hasPermission(#target, 'SUGGESTION.TARGET', 'READ')")
+    @SearchRestMethod(name = "findByTargetAndSource")
+    public Page<SuggestionRest> findByTargetAndSource(
+            @Parameter(required = true, value = "source") String source,
+            @Parameter(required = true, value = "target") UUID target, Pageable pageable) {
+        Context context = obtainContext();
+        boolean ascending = false;
+        if (pageable.getSort() != null && pageable.getSort().getOrderFor(ORDER_FIELD) != null) {
+            ascending = pageable.getSort().getOrderFor(ORDER_FIELD).getDirection() == Direction.ASC;
+        }
+        List<Suggestion> suggestions = suggestionService.findByTargetAndSource(context, target, source,
+                pageable.getPageSize(), pageable.getOffset(), ascending);
+        long tot = suggestionService.countAllByTargetAndSource(context, source, target);
+        return converter.toRestPage(suggestions, pageable, tot, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'SUGGESTION', 'DELETE')")
+    protected void delete(Context context, String id)
+            throws AuthorizeException, RepositoryMethodNotImplementedException {
+        suggestionService.rejectSuggestion(context, id);
+    }
+
+    @Override
+    public Class<SuggestionRest> getDomainClass() {
+        return SuggestionRest.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionSourceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionSourceRestRepository.java
new file mode 100644
index 0000000000..30663e5cd5
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionSourceRestRepository.java
@@ -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/
+ */
+package org.dspace.app.rest.repository;
+
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.model.SuggestionSourceRest;
+import org.dspace.app.suggestion.SuggestionService;
+import org.dspace.app.suggestion.SuggestionSource;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible to manage Suggestion Target Rest object
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+
+@Component(SuggestionSourceRest.CATEGORY + "." + SuggestionSourceRest.PLURAL_NAME)
+public class SuggestionSourceRestRepository extends DSpaceRestRepository<SuggestionSourceRest, String> {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager
+            .getLogger(SuggestionSourceRestRepository.class);
+
+    @Autowired
+    private SuggestionService suggestionService;
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public SuggestionSourceRest findOne(Context context, String source) {
+        SuggestionSource suggestionSource = suggestionService.findSource(context, source);
+        if (suggestionSource == null) {
+            return null;
+        }
+        return converter.toRest(suggestionSource, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("hasAuthority('ADMIN')")
+    public Page<SuggestionSourceRest> findAll(Context context, Pageable pageable) {
+        List<SuggestionSource> suggestionSources = suggestionService.findAllSources(context, pageable.getPageSize(),
+                pageable.getOffset());
+        long count = suggestionService.countSources(context);
+        if (suggestionSources == null) {
+            return null;
+        }
+        return converter.toRestPage(suggestionSources, pageable, count, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<SuggestionSourceRest> getDomainClass() {
+        return SuggestionSourceRest.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionTargetRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionTargetRestRepository.java
new file mode 100644
index 0000000000..4691ea3600
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionTargetRestRepository.java
@@ -0,0 +1,98 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.Parameter;
+import org.dspace.app.rest.SearchRestMethod;
+import org.dspace.app.rest.exception.RepositoryMethodNotImplementedException;
+import org.dspace.app.rest.model.SuggestionTargetRest;
+import org.dspace.app.suggestion.SuggestionService;
+import org.dspace.app.suggestion.SuggestionTarget;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * This is the repository responsible to manage Suggestion Target Rest object
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ */
+
+@Component(SuggestionTargetRest.CATEGORY + "." + SuggestionTargetRest.PLURAL_NAME)
+public class SuggestionTargetRestRepository extends DSpaceRestRepository<SuggestionTargetRest, String> {
+
+    private static final Logger log = org.apache.logging.log4j.LogManager
+            .getLogger(SuggestionTargetRestRepository.class);
+
+    @Autowired
+    private SuggestionService suggestionService;
+
+    @Override
+    @PreAuthorize("hasPermission(#id, 'SUGGESTIONTARGET', 'READ')")
+    public SuggestionTargetRest findOne(Context context, String id) {
+        String source = null;
+        UUID uuid = null;
+        try {
+            source = id.split(":")[0];
+            uuid = UUID.fromString(id.split(":")[1]);
+        } catch (Exception e) {
+            return null;
+        }
+        SuggestionTarget suggestionTarget = suggestionService.find(context, source, uuid);
+        if (suggestionTarget == null) {
+            return null;
+        }
+        return converter.toRest(suggestionTarget, utils.obtainProjection());
+    }
+
+    @Override
+    @PreAuthorize("permitAll()")
+    public Page<SuggestionTargetRest> findAll(Context context, Pageable pageable) {
+        throw new RepositoryMethodNotImplementedException(SuggestionTargetRest.NAME, "findAll");
+    }
+
+    @PreAuthorize("hasAuthority('ADMIN')")
+    @SearchRestMethod(name = "findBySource")
+    public Page<SuggestionTargetRest> findBySource(@Parameter(required = true, value = "source") String source,
+            Pageable pageable) {
+        Context context = obtainContext();
+        List<SuggestionTarget> suggestionTargets = suggestionService.findAllTargets(context, source,
+                pageable.getPageSize(), pageable.getOffset());
+        long tot = suggestionService.countAll(context, source);
+        if (suggestionTargets == null) {
+            return null;
+        }
+        return converter.toRestPage(suggestionTargets, pageable, tot, utils.obtainProjection());
+    }
+
+    @PreAuthorize("hasPermission(#target, 'SUGGESTIONTARGET.TARGET', 'READ')")
+    @SearchRestMethod(name = "findByTarget")
+    public Page<SuggestionTargetRest> findByTarget(@Parameter(required = true, value = "target") UUID target,
+            Pageable pageable) {
+        Context context = obtainContext();
+        List<SuggestionTarget> suggestionTargets = suggestionService.findByTarget(context, target,
+                pageable.getPageSize(), pageable.getOffset());
+        long tot = suggestionService.countAllByTarget(context, target);
+        if (suggestionTargets == null) {
+            return null;
+        }
+        return converter.toRestPage(suggestionTargets, pageable, tot, utils.obtainProjection());
+    }
+
+    @Override
+    public Class<SuggestionTargetRest> getDomainClass() {
+        return SuggestionTargetRest.class;
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionTargetTargetLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionTargetTargetLinkRepository.java
new file mode 100644
index 0000000000..34d006cef1
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SuggestionTargetTargetLinkRepository.java
@@ -0,0 +1,70 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository;
+
+import java.sql.SQLException;
+import java.util.UUID;
+
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.model.ItemRest;
+import org.dspace.app.rest.model.SuggestionTargetRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * Link repository for "target" subresource of an suggestion target.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component(SuggestionTargetRest.CATEGORY + "." + SuggestionTargetRest.PLURAL_NAME + "." + SuggestionTargetRest.TARGET)
+public class SuggestionTargetTargetLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
+
+    @Autowired
+    private ItemService itemService;
+
+    /**
+     * Returns the item related to the suggestion target with the given id.
+     *
+     * @param request    the http servlet request
+     * @param id         the suggestion target UUID
+     * @param pageable   the optional pageable
+     * @param projection the projection object
+     * @return the target item rest representation
+     */
+    @PreAuthorize("hasPermission(#id, 'SUGGESTIONTARGET', 'READ')")
+    public ItemRest getTarget(@Nullable HttpServletRequest request, String id,
+        @Nullable Pageable pageable, Projection projection) {
+        String source = id.split(":")[0];
+        UUID uuid = UUID.fromString(id.split(":")[1]);
+        if (StringUtils.isBlank(source) || uuid == null) {
+            throw new ResourceNotFoundException("No such item related to a suggestion target with UUID: " + id);
+        }
+        try {
+            Context context = obtainContext();
+            Item profile = itemService.find(context, uuid);
+            if (profile == null) {
+                throw new ResourceNotFoundException("No such item related to a suggestion target with UUID: " + id);
+            }
+
+            return converter.toRest(profile, projection);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SupervisionOrderRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SupervisionOrderRestRepository.java
index fb2f589dbc..0f47aee3fd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SupervisionOrderRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SupervisionOrderRestRepository.java
@@ -15,8 +15,8 @@ import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.exception.ResourceAlreadyExistsException;
@@ -52,7 +52,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
  */
-@Component(SupervisionOrderRest.CATEGORY + "." + SupervisionOrderRest.NAME)
+@Component(SupervisionOrderRest.CATEGORY + "." + SupervisionOrderRest.PLURAL_NAME)
 public class SupervisionOrderRestRepository extends DSpaceRestRepository<SupervisionOrderRest, Integer> {
 
     private static final Logger log =
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SystemWideAlertRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SystemWideAlertRestRepository.java
index 73544145b2..b3df9b6a93 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SystemWideAlertRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/SystemWideAlertRestRepository.java
@@ -12,12 +12,12 @@ import static org.apache.commons.lang3.StringUtils.isBlank;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.alerts.AllowSessionsEnum;
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
 /**
  * The repository for the SystemWideAlert workload
  */
-@Component(SystemWideAlertRest.CATEGORY + "." + SystemWideAlertRest.NAME)
+@Component(SystemWideAlertRest.CATEGORY + "." + SystemWideAlertRest.PLURAL_NAME)
 public class SystemWideAlertRestRepository extends DSpaceRestRepository<SystemWideAlertRest, Integer> {
 
     private static final Logger log = LogManager.getLogger();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/TemplateItemRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/TemplateItemRestRepository.java
index ad80140481..1bacaa4ddb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/TemplateItemRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/TemplateItemRestRepository.java
@@ -34,7 +34,7 @@ import org.springframework.stereotype.Component;
 /**
  * This is the repository class that is responsible for handling {@link TemplateItemRest} objects
  */
-@Component(TemplateItemRest.CATEGORY + "." + TemplateItemRest.NAME)
+@Component(TemplateItemRest.CATEGORY + "." + TemplateItemRest.PLURAL_NAME)
 public class TemplateItemRestRepository extends DSpaceRestRepository<TemplateItemRest, UUID> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryDraftVersionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryDraftVersionLinkRepository.java
index 21d90ddda0..56a413b7e8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryDraftVersionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryDraftVersionLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.Objects;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.model.AInprogressSubmissionRest;
 import org.dspace.app.rest.model.VersionHistoryRest;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
-@Component(VersionHistoryRest.CATEGORY + "." + VersionHistoryRest.NAME + "." + VersionHistoryRest.DRAFT_VERSION)
+@Component(VersionHistoryRest.CATEGORY + "." + VersionHistoryRest.PLURAL_NAME + "." + VersionHistoryRest.DRAFT_VERSION)
 public class VersionHistoryDraftVersionLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
@@ -79,4 +79,4 @@ public class VersionHistoryDraftVersionLinkRepository extends AbstractDSpaceRest
         return null;
     }
 
-}
\ No newline at end of file
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryLinkRepository.java
index 6456a0c2b5..46e751ad1e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.VersionHistoryRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
  * This is the Repository that takes care of the retrieval of the {@link VersionHistory} object
  * for a given {@link Version}
  */
-@Component(VersionRest.CATEGORY + "." + VersionRest.NAME + "." + VersionRest.VERSION_HISTORY)
+@Component(VersionRest.CATEGORY + "." + VersionRest.PLURAL_NAME + "." + VersionRest.VERSION_HISTORY)
 public class VersionHistoryLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryRestRepository.java
index f41003d17d..9207add5f7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionHistoryRestRepository.java
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Repository for the operations on the {@link VersionHistoryRest} endpoints
  */
-@Component(VersionHistoryRest.CATEGORY + "." + VersionHistoryRest.NAME)
+@Component(VersionHistoryRest.CATEGORY + "." + VersionHistoryRest.PLURAL_NAME)
 public class VersionHistoryRestRepository extends DSpaceRestRepository<VersionHistoryRest, Integer> {
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(VersionHistoryRestRepository.class);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionItemLinkRepository.java
index 4fd692506b..d171492e9f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionItemLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component;
  * This Repository takes care of the retrieval of the {@link org.dspace.content.Item} objects
  * for a given {@link Version}
  */
-@Component(VersionRest.CATEGORY + "." + VersionRest.NAME + "." + VersionRest.ITEM)
+@Component(VersionRest.CATEGORY + "." + VersionRest.PLURAL_NAME + "." + VersionRest.ITEM)
 public class VersionItemLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java
index 585fc1de9f..a2c8453bda 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionRestRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.converter.ConverterService;
@@ -48,7 +48,7 @@ import org.springframework.stereotype.Component;
  * 
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
-@Component(VersionRest.CATEGORY + "." + VersionRest.NAME)
+@Component(VersionRest.CATEGORY + "." + VersionRest.PLURAL_NAME)
 public class VersionRestRepository extends DSpaceRestRepository<VersionRest, Integer>
                                     implements ReloadableEntityObjectRepository<Version, Integer> {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionsLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionsLinkRepository.java
index 2538b51cf1..f7b0bb902f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionsLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VersionsLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.VersionHistoryRest;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.projection.Projection;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * This is the Repository that takes care of the retrieval of the {@link Version} objects for a given
  * {@link VersionHistory}
  */
-@Component(VersionHistoryRest.CATEGORY + "." + VersionHistoryRest.NAME + "." + VersionHistoryRest.VERSIONS)
+@Component(VersionHistoryRest.CATEGORY + "." + VersionHistoryRest.PLURAL_NAME + "." + VersionHistoryRest.VERSIONS)
 public class VersionsLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java
index d49f07d439..9c53af48c6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ViewEventRestRepository.java
@@ -12,10 +12,10 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
@@ -31,7 +31,7 @@ import org.dspace.usage.UsageEvent;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-@Component(ViewEventRest.CATEGORY + "." + ViewEventRest.NAME)
+@Component(ViewEventRest.CATEGORY + "." + ViewEventRest.PLURAL_NAME)
 public class ViewEventRestRepository extends AbstractDSpaceRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsChildrenLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsChildrenLinkRepository.java
index 1788fa893b..631130be60 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsChildrenLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsChildrenLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.exception.LinkNotFoundException;
 import org.dspace.app.rest.model.VocabularyEntryDetailsRest;
@@ -35,7 +35,8 @@ import org.springframework.stereotype.Component;
  *
  * @author Mykhaylo Boychuk (4Science.it)
  */
-@Component(VocabularyRest.CATEGORY + "." + VocabularyEntryDetailsRest.NAME + "." + VocabularyEntryDetailsRest.CHILDREN)
+@Component(VocabularyRest.CATEGORY + "." + VocabularyEntryDetailsRest.PLURAL_NAME + "." +
+    VocabularyEntryDetailsRest.CHILDREN)
 public class VocabularyEntryDetailsChildrenLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsParentLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsParentLinkRepository.java
index d7a1ff85c3..aa6912e996 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsParentLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsParentLinkRepository.java
@@ -7,10 +7,9 @@
  */
 package org.dspace.app.rest.repository;
 
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
-import javax.ws.rs.NotFoundException;
-
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.ws.rs.NotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.VocabularyEntryDetailsRest;
 import org.dspace.app.rest.model.VocabularyRest;
@@ -30,7 +29,8 @@ import org.springframework.stereotype.Component;
  *
  * @author Mykhaylo Boychuk ($science.it)
  */
-@Component(VocabularyRest.CATEGORY + "." + VocabularyEntryDetailsRest.NAME + "." + VocabularyEntryDetailsRest.PARENT)
+@Component(VocabularyRest.CATEGORY + "." + VocabularyEntryDetailsRest.PLURAL_NAME + "." +
+    VocabularyEntryDetailsRest.PARENT)
 public class VocabularyEntryDetailsParentLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java
index 3e4d600b12..cf74dd76f4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryDetailsRestRepository.java
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(VocabularyRest.CATEGORY + "." + VocabularyEntryDetailsRest.NAME)
+@Component(VocabularyRest.CATEGORY + "." + VocabularyEntryDetailsRest.PLURAL_NAME)
 public class VocabularyEntryDetailsRestRepository extends DSpaceRestRepository<VocabularyEntryDetailsRest, String>
         implements InitializingBean {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryLinkRepository.java
index a24bef42c2..3a62a5cbae 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyEntryLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
-@Component(VocabularyRest.CATEGORY + "." + VocabularyRest.NAME + "." + VocabularyRest.ENTRIES)
+@Component(VocabularyRest.CATEGORY + "." + VocabularyRest.PLURAL_NAME + "." + VocabularyRest.ENTRIES)
 public class VocabularyEntryLinkRepository extends AbstractDSpaceRestRepository
     implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyRestRepository.java
index 783ed41823..ee80e43209 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/VocabularyRestRepository.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
-@Component(VocabularyRest.CATEGORY + "." + VocabularyRest.NAME)
+@Component(VocabularyRest.CATEGORY + "." + VocabularyRest.PLURAL_NAME)
 public class VocabularyRestRepository extends DSpaceRestRepository<VocabularyRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowActionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowActionRestRepository.java
index 75c2e5c140..92efe98494 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowActionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowActionRestRepository.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Maria Verdonck (Atmire) on 06/01/2020
  */
-@Component(WorkflowActionRest.CATEGORY + "." + WorkflowActionRest.NAME)
+@Component(WorkflowActionRest.CATEGORY + "." + WorkflowActionRest.PLURAL_NAME)
 public class WorkflowActionRestRepository extends DSpaceRestRepository<WorkflowActionRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowDefinitionRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowDefinitionRestRepository.java
index 7aa6d7d280..8c4836a23d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowDefinitionRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowDefinitionRestRepository.java
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Maria Verdonck (Atmire) on 11/12/2019
  */
-@Component(WorkflowDefinitionRest.CATEGORY + "." + WorkflowDefinitionRest.NAME)
+@Component(WorkflowDefinitionRest.CATEGORY + "." + WorkflowDefinitionRest.PLURAL_NAME)
 public class WorkflowDefinitionRestRepository extends DSpaceRestRepository<WorkflowDefinitionRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemCollectionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemCollectionLinkRepository.java
index fa92a69e77..09c7cc4c0f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemCollectionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemCollectionLinkRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.WorkflowItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "collection" subresource of a workflow item.
  */
-@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.NAME + "." + WorkflowItemRest.COLLECTION)
+@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.PLURAL_NAME + "." + WorkflowItemRest.COLLECTION)
 public class WorkflowItemCollectionLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemItemLinkRepository.java
index 40624799bf..96b09c8d64 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemItemLinkRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.WorkflowItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "item" subresource of a workflow item.
  */
-@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.NAME + "." + WorkflowItemRest.ITEM)
+@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.PLURAL_NAME + "." + WorkflowItemRest.ITEM)
 public class WorkflowItemItemLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemRestRepository.java
index de39ff69fb..f6c879b3ef 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemRestRepository.java
@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -67,7 +67,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 
-@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.NAME)
+@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.PLURAL_NAME)
 public class WorkflowItemRestRepository extends DSpaceRestRepository<WorkflowItemRest, Integer> {
 
     public static final String OPERATION_PATH_SECTIONS = "sections";
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemStepLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemStepLinkRepository.java
index 30aac1579c..0cbdf50cbc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemStepLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemStepLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.WorkflowItemRest;
 import org.dspace.app.rest.model.WorkflowStepRest;
 import org.dspace.app.rest.projection.Projection;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link Repository for the Steps subresources of an individual WorkflowItem
  */
-@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.NAME + "." + WorkflowItemRest.STEP)
+@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.PLURAL_NAME + "." + WorkflowItemRest.STEP)
 public class WorkflowItemStepLinkRepository extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemSubmitterLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemSubmitterLinkRepository.java
index b4b0ec0adf..9fe8e29bfa 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemSubmitterLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowItemSubmitterLinkRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.model.WorkflowItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "submitter" subresource of a workflow item.
  */
-@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.NAME + "." + WorkflowItemRest.SUBMITTER)
+@Component(WorkflowItemRest.CATEGORY + "." + WorkflowItemRest.PLURAL_NAME + "." + WorkflowItemRest.SUBMITTER)
 public class WorkflowItemSubmitterLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowStepRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowStepRestRepository.java
index 798c352b22..2102bab710 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowStepRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkflowStepRestRepository.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
  *
  * @author Maria Verdonck (Atmire) on 10/01/2020
  */
-@Component(WorkflowStepRest.CATEGORY + "." + WorkflowStepRest.NAME)
+@Component(WorkflowStepRest.CATEGORY + "." + WorkflowStepRest.PLURAL_NAME)
 public class WorkflowStepRestRepository extends DSpaceRestRepository<WorkflowStepRest, String> {
 
     @Autowired
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemCollectionLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemCollectionLinkRepository.java
index c8f9373b07..a3ad57c31c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemCollectionLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemCollectionLinkRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.CollectionRest;
 import org.dspace.app.rest.model.WorkspaceItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "collection" subresource of a workspace item.
  */
-@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.NAME + "." + WorkspaceItemRest.COLLECTION)
+@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.PLURAL_NAME + "." + WorkspaceItemRest.COLLECTION)
 public class WorkspaceItemCollectionLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemItemLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemItemLinkRepository.java
index 48052fe537..0eb4e1b27d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemItemLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemItemLinkRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ItemRest;
 import org.dspace.app.rest.model.WorkspaceItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "item" subresource of a workspace item.
  */
-@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.NAME + "." + WorkspaceItemRest.ITEM)
+@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.PLURAL_NAME + "." + WorkspaceItemRest.ITEM)
 public class WorkspaceItemItemLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemRestRepository.java
index 5f4bb0dfe9..278fc2c935 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemRestRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemRestRepository.java
@@ -14,8 +14,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.Parameter;
@@ -73,7 +73,7 @@ import org.springframework.web.multipart.MultipartFile;
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  * @author Pasquale Cavallo (pasquale.cavallo at 4science.it)
  */
-@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.NAME)
+@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.PLURAL_NAME)
 public class WorkspaceItemRestRepository extends DSpaceRestRepository<WorkspaceItemRest, Integer>
     implements ReloadableEntityObjectRepository<WorkspaceItem, Integer> {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSubmitterLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSubmitterLinkRepository.java
index a98de6a0b3..707ab7e13d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSubmitterLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSubmitterLinkRepository.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
 import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.EPersonRest;
 import org.dspace.app.rest.model.WorkspaceItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -26,7 +26,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository for "submitter" subresource of a workspace item.
  */
-@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.NAME + "." + WorkspaceItemRest.SUBMITTER)
+@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.PLURAL_NAME + "." + WorkspaceItemRest.SUBMITTER)
 public class WorkspaceItemSubmitterLinkRepository extends AbstractDSpaceRestRepository
         implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSupervisionOrdersLinkRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSupervisionOrdersLinkRepository.java
index e0d57ae0de..79d77bf944 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSupervisionOrdersLinkRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/WorkspaceItemSupervisionOrdersLinkRepository.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.repository;
 
 import java.sql.SQLException;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.SupervisionOrderRest;
 import org.dspace.app.rest.model.WorkspaceItemRest;
 import org.dspace.app.rest.projection.Projection;
@@ -30,7 +30,8 @@ import org.springframework.stereotype.Component;
  *
  * @author Mohamed Eskander (mohamed.eskander at 4science dot it)
  */
-@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.NAME + "." + WorkspaceItemRest.SUPERVISION_ORDERS)
+@Component(WorkspaceItemRest.CATEGORY + "." + WorkspaceItemRest.PLURAL_NAME + "." +
+    WorkspaceItemRest.SUPERVISION_ORDERS)
 public class WorkspaceItemSupervisionOrdersLinkRepository
     extends AbstractDSpaceRestRepository implements LinkRestRepository {
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceCorrectionTypeUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceCorrectionTypeUriListHandler.java
new file mode 100644
index 0000000000..1d377934af
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceCorrectionTypeUriListHandler.java
@@ -0,0 +1,72 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.handler;
+
+import java.sql.SQLException;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.core.Context;
+import org.dspace.correctiontype.CorrectionType;
+import org.dspace.correctiontype.service.CorrectionTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class extends the {@link ExternalSourceEntryItemUriListHandler} abstract class and implements it specifically
+ * for the List<{@link CorrectionType}> objects.
+ * 
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component
+public class ExternalSourceCorrectionTypeUriListHandler extends ExternalSourceEntryItemUriListHandler<CorrectionType> {
+
+    @Autowired
+    private CorrectionTypeService correctionTypeService;
+
+    @Override
+    @SuppressWarnings("rawtypes")
+    public boolean supports(List<String> uriList, String method,Class clazz) {
+        return clazz != CorrectionType.class ? false : true;
+    }
+
+    @Override
+    public CorrectionType handle(Context context, HttpServletRequest request, List<String> uriList)
+            throws SQLException, AuthorizeException {
+        return getObjectFromUriList(context, uriList);
+    }
+
+    @Override
+    public boolean validate(Context context, HttpServletRequest request, List<String> uriList)
+        throws AuthorizeException {
+        return uriList.size() > 1 ? false : true;
+    }
+
+
+    private CorrectionType getObjectFromUriList(Context context, List<String> uriList) {
+        CorrectionType correctionType = null;
+        String url = uriList.get(0);
+        Pattern pattern = Pattern.compile("\\/api\\/config\\/correctiontypes\\/(.*)");
+        Matcher matcher = pattern.matcher(url);
+        if (!matcher.find()) {
+            throw new DSpaceBadRequestException("The uri: " + url + " doesn't resolve to an correction type");
+        }
+        String id = matcher.group(1);
+        try {
+            correctionType = correctionTypeService.findOne(id);
+        } catch (Exception e) {
+            throw new RuntimeException(e.getMessage(), e);
+        }
+        return correctionType;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryArchivedItemUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryArchivedItemUriListHandler.java
index 86189933d9..8cbbd99ba6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryArchivedItemUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryArchivedItemUriListHandler.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository.handler;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
@@ -73,7 +73,7 @@ public class ExternalSourceEntryArchivedItemUriListHandler extends ExternalSourc
             WorkspaceItem workspaceItem = super.createWorkspaceItem(context, request, uriList);
             return installItemService.installItem(context, workspaceItem);
         } catch (AuthorizeException | SQLException e) {
-            log.error("An error occured when trying to create item in collection with uuid: " + owningCollectionUuid,
+            log.error("An error occurred when trying to create item in collection with uuid: " + owningCollectionUuid,
                       e);
             throw e;
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryItemUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryItemUriListHandler.java
index 3ad9b7a193..172411f6ac 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryItemUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryItemUriListHandler.java
@@ -15,8 +15,8 @@ import java.util.Optional;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.ExternalSourceRest;
@@ -106,7 +106,7 @@ public abstract class ExternalSourceEntryItemUriListHandler<T> implements UriLis
             Collection collection = collectionService.find(context, UUID.fromString(owningCollectionUuid));
             return externalDataService.createWorkspaceItemFromExternalDataObject(context, dataObject, collection);
         } catch (AuthorizeException | SQLException e) {
-            log.error("An error occured when trying to create item in collection with uuid: " + owningCollectionUuid,
+            log.error("An error occurred when trying to create item in collection with uuid: " + owningCollectionUuid,
                       e);
             throw e;
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
index 0965058449..df66a44b7b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryOrcidQueueUriListHandler.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.orcid.OrcidQueue;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryPoolTaskUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryPoolTaskUriListHandler.java
index 4ed438f93b..afe0756447 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryPoolTaskUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryPoolTaskUriListHandler.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.xmlworkflow.storedcomponents.PoolTask;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryWorkspaceItemUriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryWorkspaceItemUriListHandler.java
index 6491ec0fd6..9c83ee3760 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryWorkspaceItemUriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/ExternalSourceEntryWorkspaceItemUriListHandler.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository.handler;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.core.Context;
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 d619100bf6..16c43336e9 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
@@ -11,8 +11,8 @@ import java.util.List;
 import java.util.UUID;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.content.Item;
@@ -30,16 +30,19 @@ import org.springframework.stereotype.Component;
 @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 class ExternalSourceItemUriListHandler extends ExternalSourceEntryItemUri
     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/main/java/org/dspace/app/rest/repository/handler/UriListHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/UriListHandler.java
index 84d6522845..bf12b6598b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/UriListHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/UriListHandler.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository.handler;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java
index 5366428b1c..c9603386cc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/handler/service/UriListHandlerService.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.repository.handler.service;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
@@ -42,7 +42,7 @@ public class UriListHandlerService {
      * @param context   The relevant DSpace context
      * @param request   The current active Request
      * @param uriList   The list of Strings representing the UriList to be handled
-     * @param clazz     The class to be hadled
+     * @param clazz     The class to be handled
      * @param <T>       The class to be returned, same as the class parameter above
      * @return          The object that was handled through this method
      */
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/PatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/PatchOperation.java
index 0842746f32..9864dae09d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/PatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/PatchOperation.java
@@ -59,7 +59,7 @@ public abstract class PatchOperation<M> {
      * @return the original or derived boolean value
      * @throws DSpaceBadRequestException
      */
-    Boolean getBooleanOperationValue(Object value) {
+    protected Boolean getBooleanOperationValue(Object value) {
         Boolean bool;
 
         if (value instanceof String) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/QAEventStatusReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/QAEventStatusReplaceOperation.java
new file mode 100644
index 0000000000..5f6ff02acc
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/QAEventStatusReplaceOperation.java
@@ -0,0 +1,60 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation;
+
+import java.sql.SQLException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.QAEventActionService;
+import org.dspace.services.RequestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Replace operation related to the {@link QAEvent} status.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component
+public class QAEventStatusReplaceOperation extends PatchOperation<QAEvent> {
+    @Autowired
+    private RequestService requestService;
+
+    @Autowired
+    private QAEventActionService qaEventActionService;
+
+    @Override
+    public QAEvent perform(Context context, QAEvent qaevent, Operation operation) throws SQLException {
+        String value = (String) operation.getValue();
+        if (StringUtils.equalsIgnoreCase(value, QAEvent.ACCEPTED)) {
+            qaEventActionService.accept(context, qaevent);
+        } else if (StringUtils.equalsIgnoreCase(value, QAEvent.REJECTED)) {
+            qaEventActionService.reject(context, qaevent);
+        } else if (StringUtils.equalsIgnoreCase(value, QAEvent.DISCARDED)) {
+            qaEventActionService.discard(context, qaevent);
+        } else {
+            throw new IllegalArgumentException(
+                    "The received operation is not valid: " + operation.getPath() + " - " + value);
+        }
+        qaevent.setStatus(value.toUpperCase());
+        // HACK, we need to store the temporary object in the request so that a subsequent find would get it
+        requestService.getCurrentRequest().setAttribute("patchedNotificationEvent", qaevent);
+        return qaevent;
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return StringUtils.equals(operation.getOp(), "replace") && objectToMatch instanceof QAEvent && StringUtils
+                .containsAny(operation.getValue().toString().toLowerCase(), QAEvent.ACCEPTED, QAEvent.DISCARDED,
+                        QAEvent.REJECTED);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionAddOperation.java
new file mode 100644
index 0000000000..0f973a9760
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionAddOperation.java
@@ -0,0 +1,77 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Description Add patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "add",
+ *  "path": "/description",
+ *  "value": "description value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceDescriptionAddOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/description";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object description = operation.getValue();
+        if (description == null | !(description instanceof String)) {
+            throw new UnprocessableEntityException("The /description value must be a string");
+        }
+
+        checkNonExistingDescriptionValue(notifyServiceEntity);
+        notifyServiceEntity.setDescription((String) description);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Throws PatchBadRequestException if a value is already set in the /description path.
+     *
+     * @param notifyServiceEntity the notifyServiceEntity to update
+
+     */
+    void checkNonExistingDescriptionValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getDescription() != null) {
+            throw new DSpaceBadRequestException("Attempting to add a value to an already existing path.");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionRemoveOperation.java
new file mode 100644
index 0000000000..18e9515b0f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionRemoveOperation.java
@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Description Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "/description"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceDescriptionRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/description";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        notifyServiceEntity.setDescription(null);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionReplaceOperation.java
new file mode 100644
index 0000000000..8f7eedc758
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceDescriptionReplaceOperation.java
@@ -0,0 +1,74 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Description Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/description",
+ *  "value": "description value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceDescriptionReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/description";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+
+        Object description = operation.getValue();
+        if (description == null | !(description instanceof String)) {
+            throw new UnprocessableEntityException("The /description value must be a string");
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setDescription((String) description);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the description of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getDescription() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (description).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceEnabledReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceEnabledReplaceOperation.java
new file mode 100644
index 0000000000..ccfa6e9020
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceEnabledReplaceOperation.java
@@ -0,0 +1,66 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Enabled Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/enabled"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceEnabledReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/enabled";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+        Boolean enabled = getBooleanOperationValue(operation.getValue());
+
+        if (supports(notifyServiceEntity, operation)) {
+            notifyServiceEntity.setEnabled(enabled);
+            notifyService.update(context, notifyServiceEntity);
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceEnabledReplaceOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternAutomaticReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternAutomaticReplaceOperation.java
new file mode 100644
index 0000000000..0f3d8c394d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternAutomaticReplaceOperation.java
@@ -0,0 +1,83 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Automatic Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "notifyServiceInboundPatterns[index]/automatic"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternAutomaticReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/automatic";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        Boolean automatic = getBooleanOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern inboundPattern = inboundPatterns.get(index);
+                inboundPattern.setAutomatic(automatic);
+                inboundPatternService.update(context, inboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternAutomaticReplaceOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            path.startsWith(NOTIFY_SERVICE_INBOUND_PATTERNS + "[") &&
+            path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintAddOperation.java
new file mode 100644
index 0000000000..e82243f9a7
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintAddOperation.java
@@ -0,0 +1,95 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Constraint Add patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "add",
+ *  "path": "notifyServiceInboundPatterns[index]/constraint"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternConstraintAddOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/constraint";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern inboundPattern = inboundPatterns.get(index);
+                Object constraint = operation.getValue();
+                if (constraint == null | !(constraint instanceof String)) {
+                    throw new UnprocessableEntityException("The /constraint value must be a string");
+                }
+
+                checkNonExistingConstraintValue(inboundPattern);
+                inboundPattern.setConstraint((String) constraint);
+                inboundPatternService.update(context, inboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternConstraintAddOperation does not support this operation");
+        }
+    }
+
+    private void checkNonExistingConstraintValue(NotifyServiceInboundPattern inboundPattern) {
+        if (inboundPattern.getConstraint() != null) {
+            throw new DSpaceBadRequestException("Attempting to add a value to an already existing path.");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD) &&
+            path.startsWith(NOTIFY_SERVICE_INBOUND_PATTERNS + "[") &&
+            path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintRemoveOperation.java
new file mode 100644
index 0000000000..52d0a6bf73
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintRemoveOperation.java
@@ -0,0 +1,81 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Constraint Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "notifyServiceInboundPatterns[index]/constraint"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternConstraintRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/constraint";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern inboundPattern = inboundPatterns.get(index);
+                inboundPattern.setConstraint(null);
+                inboundPatternService.update(context, inboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternConstraintRemoveOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            path.startsWith(NOTIFY_SERVICE_INBOUND_PATTERNS + "[") &&
+            path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintReplaceOperation.java
new file mode 100644
index 0000000000..6faaadbfac
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternConstraintReplaceOperation.java
@@ -0,0 +1,95 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Constraint Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "notifyServiceInboundPatterns[index]/constraint"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternConstraintReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/constraint";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern inboundPattern = inboundPatterns.get(index);
+                Object constraint = operation.getValue();
+                if (constraint == null | !(constraint instanceof String)) {
+                    throw new UnprocessableEntityException("The /constraint value must be a string");
+                }
+
+                checkModelForExistingValue(inboundPattern);
+                inboundPattern.setConstraint((String) constraint);
+                inboundPatternService.update(context, inboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternConstraintReplaceOperation does not support this operation");
+        }
+    }
+
+    private void checkModelForExistingValue(NotifyServiceInboundPattern inboundPattern) {
+        if (inboundPattern.getConstraint() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (constraint).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            path.startsWith(NOTIFY_SERVICE_INBOUND_PATTERNS + "[") &&
+            path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternPatternAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternPatternAddOperation.java
new file mode 100644
index 0000000000..17f92057f9
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternPatternAddOperation.java
@@ -0,0 +1,95 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Pattern Add patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "add",
+ *  "path": "notifyServiceInboundPatterns[index]/pattern"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternPatternAddOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/pattern";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern inboundPattern = inboundPatterns.get(index);
+                Object pattern = operation.getValue();
+                if (pattern == null | !(pattern instanceof String)) {
+                    throw new UnprocessableEntityException("The /pattern value must be a string");
+                }
+
+                checkNonExistingPatternValue(inboundPattern);
+                inboundPattern.setPattern((String) pattern);
+                inboundPatternService.update(context, inboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternPatternAddOperation does not support this operation");
+        }
+    }
+
+    private void checkNonExistingPatternValue(NotifyServiceInboundPattern inboundPattern) {
+        if (inboundPattern.getPattern() != null) {
+            throw new DSpaceBadRequestException("Attempting to add a value to an already existing path.");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD) &&
+            path.startsWith(NOTIFY_SERVICE_INBOUND_PATTERNS + "[") &&
+            path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternPatternReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternPatternReplaceOperation.java
new file mode 100644
index 0000000000..5c32cec62b
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternPatternReplaceOperation.java
@@ -0,0 +1,95 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Pattern Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "notifyServiceInboundPatterns[index]/pattern"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternPatternReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = "/pattern";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern inboundPattern = inboundPatterns.get(index);
+                Object pattern = operation.getValue();
+                if (pattern == null | !(pattern instanceof String)) {
+                    throw new UnprocessableEntityException("The /pattern value must be a string");
+                }
+
+                checkModelForExistingValue(inboundPattern);
+                inboundPattern.setPattern((String) pattern);
+                inboundPatternService.update(context, inboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternPatternReplaceOperation does not support this operation");
+        }
+    }
+
+    private void checkModelForExistingValue(NotifyServiceInboundPattern inboundPattern) {
+        if (inboundPattern.getPattern() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (pattern).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            path.startsWith(NOTIFY_SERVICE_INBOUND_PATTERNS + "[") &&
+            path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternRemoveOperation.java
new file mode 100644
index 0000000000..45b9dff74d
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternRemoveOperation.java
@@ -0,0 +1,79 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound pattern Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "notifyServiceInboundPatterns[index]"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = NOTIFY_SERVICE_INBOUND_PATTERNS + "[";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                inboundPatternService.delete(context, inboundPatterns.get(index));
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternRemoveOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            path.startsWith(OPERATION_PATH) &&
+            path.endsWith("]"));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternReplaceOperation.java
new file mode 100644
index 0000000000..65e4bd2eed
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternReplaceOperation.java
@@ -0,0 +1,89 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Replace One patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "notifyServiceInboundPatterns[index]",
+ *  "value": {"pattern":"patternA","constraint":"itemFilterA","automatic":"false"}
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = NOTIFY_SERVICE_INBOUND_PATTERNS + "[";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                int index = notifyServicePatchUtils.extractIndexFromOperation(operation);
+
+                List<NotifyServiceInboundPattern> inboundPatterns = notifyServiceEntity.getInboundPatterns();
+
+                if (index >= inboundPatterns.size()) {
+                    throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+                }
+
+                NotifyServiceInboundPattern patchInboundPattern =
+                    notifyServicePatchUtils.extractNotifyServiceInboundPatternFromOperation(operation);
+
+                NotifyServiceInboundPattern existedInboundPattern = inboundPatterns.get(index);
+
+                existedInboundPattern.setPattern(patchInboundPattern.getPattern());
+                existedInboundPattern.setConstraint(patchInboundPattern.getConstraint());
+                existedInboundPattern.setAutomatic(patchInboundPattern.isAutomatic());
+                inboundPatternService.update(context, existedInboundPattern);
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternReplaceOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            path.startsWith(OPERATION_PATH) &&
+            path.endsWith("]"));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsAddOperation.java
new file mode 100644
index 0000000000..a734bb5a55
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsAddOperation.java
@@ -0,0 +1,87 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Add patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "add",
+ *  "path": "notifyServiceInboundPatterns/-",
+ *  "value": {"pattern":"patternA","constraint":"itemFilterA","automatic":"false"}
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternsAddOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = NOTIFY_SERVICE_INBOUND_PATTERNS + "/-";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                NotifyServiceInboundPattern patchInboundPattern =
+                    notifyServicePatchUtils.extractNotifyServiceInboundPatternFromOperation(operation);
+
+                NotifyServiceInboundPattern persistInboundPattern = inboundPatternService.findByServiceAndPattern(
+                    context, notifyServiceEntity, patchInboundPattern.getPattern());
+
+                if (persistInboundPattern != null && (StringUtils.isNotBlank(persistInboundPattern.getConstraint())
+                    && persistInboundPattern.getConstraint().equals(patchInboundPattern
+                        .getConstraint()))) {
+                    throw new DSpaceBadRequestException("the provided InboundPattern is already existed");
+                }
+
+                NotifyServiceInboundPattern inboundPattern =
+                    inboundPatternService.create(context, notifyServiceEntity);
+                inboundPattern.setPattern(patchInboundPattern.getPattern());
+                inboundPattern.setConstraint(patchInboundPattern.getConstraint());
+                inboundPattern.setAutomatic(patchInboundPattern.isAutomatic());
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternsAddOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD) &&
+            operation.getPath().trim().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsRemoveOperation.java
new file mode 100644
index 0000000000..2ff00dcab5
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsRemoveOperation.java
@@ -0,0 +1,71 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Remove All patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "notifyServiceInboundPatterns"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternsRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                for (NotifyServiceInboundPattern inboundPattern : notifyServiceEntity.getInboundPatterns()) {
+                    inboundPatternService.delete(context, inboundPattern);
+                }
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternsRemoveOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        String path = operation.getPath().trim();
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            path.startsWith(OPERATION_PATH) && path.endsWith(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsReplaceOperation.java
new file mode 100644
index 0000000000..2dd98e7d17
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceInboundPatternsReplaceOperation.java
@@ -0,0 +1,88 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static org.dspace.app.rest.repository.patch.operation.ldn.NotifyServicePatchUtils.NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+import java.sql.SQLException;
+import java.util.List;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.ldn.service.NotifyServiceInboundPatternService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Inbound patterns Replace All patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "notifyServiceInboundPatterns",
+ *  "value": [{"pattern":"patternA","constraint":"itemFilterA","automatic":"false"}]
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceInboundPatternsReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyServiceInboundPatternService inboundPatternService;
+
+    @Autowired
+    private NotifyServicePatchUtils notifyServicePatchUtils;
+
+    private static final String OPERATION_PATH = NOTIFY_SERVICE_INBOUND_PATTERNS;
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation) {
+        checkOperationValue(operation.getValue());
+        if (supports(notifyServiceEntity, operation)) {
+            try {
+                List<NotifyServiceInboundPattern> patchInboundPatterns =
+                    notifyServicePatchUtils.extractNotifyServiceInboundPatternsFromOperation(operation);
+
+                notifyServiceEntity.getInboundPatterns().forEach(inboundPattern -> {
+                    try {
+                        inboundPatternService.delete(context, inboundPattern);
+                    } catch (SQLException e) {
+                        throw new RuntimeException(e);
+                    }
+                });
+
+                for (NotifyServiceInboundPattern patchInboundPattern : patchInboundPatterns) {
+                    NotifyServiceInboundPattern inboundPattern =
+                        inboundPatternService.create(context, notifyServiceEntity);
+                    inboundPattern.setPattern(patchInboundPattern.getPattern());
+                    inboundPattern.setConstraint(patchInboundPattern.getConstraint());
+                    inboundPattern.setAutomatic(patchInboundPattern.isAutomatic());
+                }
+            } catch (SQLException e) {
+                throw new RuntimeException(e.getMessage(), e);
+            }
+            return notifyServiceEntity;
+        } else {
+            throw new DSpaceBadRequestException(
+                "NotifyServiceInboundPatternsReplaceOperation does not support this operation");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLdnUrlReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLdnUrlReplaceOperation.java
new file mode 100644
index 0000000000..bad2f280e0
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLdnUrlReplaceOperation.java
@@ -0,0 +1,82 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static java.lang.String.format;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService ldnUrl Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/ldnurl",
+ *  "value": "ldnurl value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceLdnUrlReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/ldnurl";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object ldnUrl = operation.getValue();
+        if (ldnUrl == null | !(ldnUrl instanceof String)) {
+            throw new UnprocessableEntityException("The /ldnurl value must be a string");
+        }
+
+        if (notifyService.findByLdnUrl(context,(String) ldnUrl) != null) {
+            throw new UnprocessableEntityException(format("LDN url already in use %s",
+                (String) ldnUrl));
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setLdnUrl((String) ldnUrl);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the ldnurl of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getLdnUrl() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (ldnurl).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLowerIpReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLowerIpReplaceOperation.java
new file mode 100644
index 0000000000..be605f94d8
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLowerIpReplaceOperation.java
@@ -0,0 +1,75 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService lowerIp Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/lowerIp",
+ *  "value": "lowerIp value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceLowerIpReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/lowerip";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object lowerIp = operation.getValue();
+        if (lowerIp == null | !(lowerIp instanceof String)) {
+            throw new UnprocessableEntityException("The /lowerIp value must be a string");
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setLowerIp((String) lowerIp);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the lowerIp of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getLowerIp() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (lowerIp).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLowerOrUpperRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLowerOrUpperRemoveOperation.java
new file mode 100644
index 0000000000..a7425a0027
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceLowerOrUpperRemoveOperation.java
@@ -0,0 +1,47 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService LowerIp Or UpperIp Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "/lowerIp"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceLowerOrUpperRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        throw new UnprocessableEntityException("/lowerIp or /upperIp are mandatory and can't be removed");
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            (operation.getPath().trim().toLowerCase().equalsIgnoreCase("/lowerip") ||
+                operation.getPath().trim().toLowerCase().equalsIgnoreCase("/upperip")));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceNameOrLdnUrlRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceNameOrLdnUrlRemoveOperation.java
new file mode 100644
index 0000000000..e1ff7b83ef
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceNameOrLdnUrlRemoveOperation.java
@@ -0,0 +1,47 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Name Or LdnUrl Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "/name"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceNameOrLdnUrlRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        throw new UnprocessableEntityException("/name or /ldnurl are mandatory and can't be removed");
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            (operation.getPath().trim().toLowerCase().equalsIgnoreCase("/name") ||
+                operation.getPath().trim().toLowerCase().equalsIgnoreCase("/ldnurl")));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceNameReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceNameReplaceOperation.java
new file mode 100644
index 0000000000..48db23544f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceNameReplaceOperation.java
@@ -0,0 +1,75 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Name Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/name",
+ *  "value": "name value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceNameReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/name";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object name = operation.getValue();
+        if (name == null | !(name instanceof String)) {
+            throw new UnprocessableEntityException("The /name value must be a string");
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setName((String) name);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the name of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getName() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (name).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServicePatchUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServicePatchUtils.java
new file mode 100644
index 0000000000..5735a7bd5f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServicePatchUtils.java
@@ -0,0 +1,109 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.ldn.NotifyServiceInboundPattern;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.model.patch.JsonValueEvaluator;
+import org.dspace.app.rest.model.patch.Operation;
+import org.springframework.stereotype.Component;
+
+/**
+ * Util class for shared methods between the NotifyServiceEntity Operations
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+@Component
+public final class NotifyServicePatchUtils {
+
+    public static final String NOTIFY_SERVICE_INBOUND_PATTERNS = "notifyServiceInboundPatterns";
+
+    private ObjectMapper objectMapper = new ObjectMapper();
+
+    private NotifyServicePatchUtils() {
+    }
+
+    /**
+     * Extract NotifyServiceInboundPattern from Operation by parsing the json
+     * and mapping it to a NotifyServiceInboundPattern
+     *
+     * @param operation     Operation whose value is being parsed
+     * @return NotifyServiceInboundPattern extracted from json in operation value
+     */
+    protected NotifyServiceInboundPattern extractNotifyServiceInboundPatternFromOperation(Operation operation) {
+        NotifyServiceInboundPattern inboundPattern = null;
+        try {
+            if (operation.getValue() != null) {
+                if (operation.getValue() instanceof JsonValueEvaluator) {
+                    inboundPattern = objectMapper.readValue(((JsonValueEvaluator) operation.getValue())
+                            .getValueNode().toString(), NotifyServiceInboundPattern.class);
+                } else if (operation.getValue() instanceof String) {
+                    inboundPattern = objectMapper.readValue((String) operation.getValue(),
+                        NotifyServiceInboundPattern.class);
+                }
+            }
+        } catch (IOException e) {
+            throw new DSpaceBadRequestException("IOException: trying to map json from operation.value" +
+                " to NotifyServiceInboundPattern class.", e);
+        }
+        if (inboundPattern == null) {
+            throw new DSpaceBadRequestException("Could not extract NotifyServiceInboundPattern Object from Operation");
+        }
+        return inboundPattern;
+    }
+
+    /**
+     * Extract list of NotifyServiceInboundPattern from Operation by parsing the json
+     * and mapping it to a list of NotifyServiceInboundPattern
+     *
+     * @param operation     Operation whose value is being parsed
+     * @return list of NotifyServiceInboundPattern extracted from json in operation value
+     */
+    protected List<NotifyServiceInboundPattern> extractNotifyServiceInboundPatternsFromOperation(Operation operation) {
+        List<NotifyServiceInboundPattern> inboundPatterns = null;
+        try {
+            if (operation.getValue() != null) {
+                if (operation.getValue() instanceof String) {
+                    inboundPatterns = objectMapper.readValue((String) operation.getValue(),
+                        objectMapper.getTypeFactory().constructCollectionType(ArrayList.class,
+                            NotifyServiceInboundPattern.class));
+                }
+            }
+        } catch (IOException e) {
+            throw new DSpaceBadRequestException("IOException: trying to map json from operation.value" +
+                " to List of NotifyServiceInboundPattern class.", e);
+        }
+        if (inboundPatterns == null) {
+            throw new DSpaceBadRequestException("Could not extract list of NotifyServiceInboundPattern " +
+                "Objects from Operation");
+        }
+        return inboundPatterns;
+    }
+
+    protected int extractIndexFromOperation(Operation operation) {
+        String number = "";
+        Pattern pattern = Pattern.compile("\\[(\\d+)\\]"); // Pattern to match [i]
+        Matcher matcher = pattern.matcher(operation.getPath());
+        if (matcher.find()) {
+            number = matcher.group(1);
+        }
+
+        if (StringUtils.isEmpty(number)) {
+            throw new DSpaceBadRequestException("path doesn't contain index");
+        }
+
+        return Integer.parseInt(number);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreAddOperation.java
new file mode 100644
index 0000000000..01c5dd3a66
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreAddOperation.java
@@ -0,0 +1,90 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static java.lang.String.format;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Score Add patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "add",
+ *  "path": "/score",
+ *  "value": "score value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceScoreAddOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/score";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkNonExistingScoreValue(notifyServiceEntity);
+        checkOperationValue(operation.getValue());
+        Object score = operation.getValue();
+        if (score == null) {
+            throw new DSpaceBadRequestException("The /score value must be a decimal number");
+        }
+
+        BigDecimal scoreBigDecimal = null;
+        try {
+            scoreBigDecimal = new BigDecimal(score.toString());
+        } catch (Exception e) {
+            throw new DSpaceBadRequestException(format("Score out of range [0, 1] %s", score.toString()));
+        }
+        if (scoreBigDecimal.compareTo(java.math.BigDecimal.ZERO) == -1 ||
+            scoreBigDecimal.compareTo(java.math.BigDecimal.ONE) == 1) {
+            throw new UnprocessableEntityException(format("Score out of range [0, 1] %s",
+                scoreBigDecimal.setScale(4).toPlainString()));
+        }
+        notifyServiceEntity.setScore(scoreBigDecimal);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Throws PatchBadRequestException if a value is already set in the /score path.
+     *
+     * @param notifyServiceEntity the notifyServiceEntity to update
+
+     */
+    void checkNonExistingScoreValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getScore() != null) {
+            throw new DSpaceBadRequestException("Attempting to add a value to an already existing path.");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreRemoveOperation.java
new file mode 100644
index 0000000000..e26d888e9f
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreRemoveOperation.java
@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Score Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "/score"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceScoreRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/score";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        notifyServiceEntity.setScore(null);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreReplaceOperation.java
new file mode 100644
index 0000000000..95824c7063
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceScoreReplaceOperation.java
@@ -0,0 +1,88 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import static java.lang.String.format;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService Score Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/score",
+ *  "value": "score value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceScoreReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/score";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object score = operation.getValue();
+        if (score == null) {
+            throw new DSpaceBadRequestException("The /score value must be a decimal number");
+        }
+        BigDecimal scoreBigDecimal = null;
+        try {
+            scoreBigDecimal = new BigDecimal(score.toString());
+        } catch (Exception e) {
+            throw new DSpaceBadRequestException(format("Score out of range [0, 1] %s", score));
+        }
+        if (scoreBigDecimal.compareTo(java.math.BigDecimal.ZERO) == -1 ||
+            scoreBigDecimal.compareTo(java.math.BigDecimal.ONE) == 1) {
+            throw new UnprocessableEntityException(format("Score out of range [0, 1] %s", score));
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setScore(new BigDecimal((String)score));
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the description of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getDescription() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (description).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUpperIpReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUpperIpReplaceOperation.java
new file mode 100644
index 0000000000..7ee362cf97
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUpperIpReplaceOperation.java
@@ -0,0 +1,75 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService upperIp Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/upperIp",
+ *  "value": "upperIp value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceUpperIpReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/upperip";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object upperIp = operation.getValue();
+        if (upperIp == null | !(upperIp instanceof String)) {
+            throw new UnprocessableEntityException("The /upperIp value must be a string");
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setUpperIp((String) upperIp);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the upperIp of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getUpperIp() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (upperIp).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlAddOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlAddOperation.java
new file mode 100644
index 0000000000..f097407343
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlAddOperation.java
@@ -0,0 +1,77 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService URL Add patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "add",
+ *  "path": "/url",
+ *  "value": "url value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceUrlAddOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/url";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object url = operation.getValue();
+        if (url == null | !(url instanceof String)) {
+            throw new UnprocessableEntityException("The /url value must be a string");
+        }
+
+        checkNonExistingUrlValue(notifyServiceEntity);
+        notifyServiceEntity.setUrl((String) url);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Throws PatchBadRequestException if a value is already set in the /url path.
+     *
+     * @param notifyServiceEntity the notifyServiceEntity to update
+
+     */
+    void checkNonExistingUrlValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getUrl() != null) {
+            throw new DSpaceBadRequestException("Attempting to add a value to an already existing path.");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_ADD) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlRemoveOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlRemoveOperation.java
new file mode 100644
index 0000000000..c2e6fa05be
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlRemoveOperation.java
@@ -0,0 +1,54 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService URL Remove patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "remove",
+ *  "path": "/url"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceUrlRemoveOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/url";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        notifyServiceEntity.setUrl(null);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REMOVE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlReplaceOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlReplaceOperation.java
new file mode 100644
index 0000000000..53a315d079
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/patch/operation/ldn/NotifyServiceUrlReplaceOperation.java
@@ -0,0 +1,75 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.repository.patch.operation.ldn;
+
+import java.sql.SQLException;
+
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.repository.patch.operation.PatchOperation;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Implementation for NotifyService URL Replace patches.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/ldn/ldnservices/<:id-notifyService> -H "
+ * Content-Type: application/json" -d '
+ * [{
+ *  "op": "replace",
+ *  "path": "/url",
+ *  "value": "url value"
+ *  }]'
+ * </code>
+ */
+@Component
+public class NotifyServiceUrlReplaceOperation extends PatchOperation<NotifyServiceEntity> {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private static final String OPERATION_PATH = "/url";
+
+    @Override
+    public NotifyServiceEntity perform(Context context, NotifyServiceEntity notifyServiceEntity, Operation operation)
+        throws SQLException {
+        checkOperationValue(operation.getValue());
+
+        Object url = operation.getValue();
+        if (url == null | !(url instanceof String)) {
+            throw new UnprocessableEntityException("The /url value must be a string");
+        }
+
+        checkModelForExistingValue(notifyServiceEntity);
+        notifyServiceEntity.setUrl((String) url);
+        notifyService.update(context, notifyServiceEntity);
+        return notifyServiceEntity;
+    }
+
+    /**
+     * Checks whether the url of notifyServiceEntity has an existing value to replace
+     * @param notifyServiceEntity Object on which patch is being done
+     */
+    private void checkModelForExistingValue(NotifyServiceEntity notifyServiceEntity) {
+        if (notifyServiceEntity.getUrl() == null) {
+            throw new DSpaceBadRequestException("Attempting to replace a non-existent value (url).");
+        }
+    }
+
+    @Override
+    public boolean supports(Object objectToMatch, Operation operation) {
+        return (objectToMatch instanceof NotifyServiceEntity &&
+            operation.getOp().trim().equalsIgnoreCase(OPERATION_REPLACE) &&
+            operation.getPath().trim().toLowerCase().equalsIgnoreCase(OPERATION_PATH));
+    }
+}
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 0d251f6400..1b251847ba 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
@@ -10,6 +10,8 @@ package org.dspace.app.rest.security;
 import java.io.Serializable;
 import java.sql.SQLException;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.core.Context;
@@ -17,9 +19,9 @@ import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-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,9 +31,10 @@ import org.springframework.stereotype.Component;
  * 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);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private AuthorizeService authorizeService;
@@ -66,7 +69,7 @@ public class AdminRestPermissionEvaluatorPlugin extends RestObjectPermissionEval
 
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AnonymousAdditionalAuthorizationFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AnonymousAdditionalAuthorizationFilter.java
index 7f02264b92..235ef1a37d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AnonymousAdditionalAuthorizationFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AnonymousAdditionalAuthorizationFilter.java
@@ -10,11 +10,11 @@ package org.dspace.app.rest.security;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AuthorizeServicePermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AuthorizeServicePermissionEvaluatorPlugin.java
index f0b44187c5..3fdd5158ed 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AuthorizeServicePermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/AuthorizeServicePermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.UUID;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.DSpaceObject;
@@ -24,21 +26,19 @@ import org.dspace.eperson.service.EPersonService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.dspace.util.UUIDUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * DSpaceObjectPermissionEvaluatorPlugin will check persmissions based on the DSpace {@link AuthorizeService}.
+ * DSpaceObjectPermissionEvaluatorPlugin will check permissions based on the DSpace {@link AuthorizeService}.
  * This service will validate if the authenticated user is allowed to perform an action on the given DSpace Object
  * based on the resource policies attached to that DSpace object.
  */
 @Component
 public class AuthorizeServicePermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(AuthorizeServicePermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private AuthorizeService authorizeService;
@@ -106,7 +106,7 @@ public class AuthorizeServicePermissionEvaluatorPlugin extends RestObjectPermiss
             }
 
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
 
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/BitstreamMetadataReadPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/BitstreamMetadataReadPermissionEvaluatorPlugin.java
index b4b08c668b..5a596525e4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/BitstreamMetadataReadPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/BitstreamMetadataReadPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.UUID;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.repository.BitstreamRestRepository;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.rest.utils.DSpaceObjectUtils;
@@ -24,8 +26,6 @@ import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -39,7 +39,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class BitstreamMetadataReadPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(BitstreamMetadataReadPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -66,7 +66,7 @@ public class BitstreamMetadataReadPermissionEvaluatorPlugin extends RestObjectPe
                     return this.metadataReadPermissionOnBitstream(context, (Bitstream) dso);
                 }
             } catch (SQLException e) {
-                log.error(e.getMessage(), e);
+                log.error(e::getMessage, e);
             }
         }
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java
index 1741d94ea8..80019b55fd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ClaimedTaskRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.ClaimedTaskRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.core.Context;
@@ -20,8 +22,6 @@ import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.dspace.xmlworkflow.storedcomponents.ClaimedTask;
 import org.dspace.xmlworkflow.storedcomponents.service.ClaimedTaskService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -29,13 +29,13 @@ import org.springframework.stereotype.Component;
 /**
  * An authenticated user is allowed to interact with a claimed task only if they own it
  * claim.
- * 
+ *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @Component
 public class ClaimedTaskRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(ClaimedTaskRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -74,7 +74,7 @@ public class ClaimedTaskRestPermissionEvaluatorPlugin extends RestObjectPermissi
             }
 
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/CustomLogoutHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/CustomLogoutHandler.java
index b3f4a00d37..d94e7c82cc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/CustomLogoutHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/CustomLogoutHandler.java
@@ -7,13 +7,12 @@
  */
 package org.dspace.app.rest.security;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.core.Context;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.logout.LogoutHandler;
@@ -28,7 +27,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class CustomLogoutHandler implements LogoutHandler {
 
-    private static final Logger log = LoggerFactory.getLogger(CustomLogoutHandler.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RestAuthenticationService restAuthenticationService;
@@ -40,6 +39,7 @@ public class CustomLogoutHandler implements LogoutHandler {
      * @param httpServletResponse
      * @param authentication
      */
+    @Override
     public void logout(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse,
                        Authentication authentication) {
         try {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpace401AuthenticationEntryPoint.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpace401AuthenticationEntryPoint.java
index b70931336e..958a920872 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpace401AuthenticationEntryPoint.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpace401AuthenticationEntryPoint.java
@@ -8,10 +8,10 @@
 package org.dspace.app.rest.security;
 
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfAuthenticationStrategy.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfAuthenticationStrategy.java
index b08ddab169..84442b4558 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfAuthenticationStrategy.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfAuthenticationStrategy.java
@@ -7,14 +7,19 @@
  */
 package org.dspace.app.rest.security;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.session.SessionAuthenticationException;
 import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
+import org.springframework.security.web.csrf.CsrfAuthenticationStrategy;
 import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
+import org.springframework.security.web.csrf.CsrfTokenRequestHandler;
+import org.springframework.security.web.csrf.DeferredCsrfToken;
+import org.springframework.security.web.csrf.XorCsrfTokenRequestAttributeHandler;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -25,29 +30,41 @@ import org.springframework.util.StringUtils;
  * successfully or unsuccessfully). This ensures that the Token is not changed on every request (since we are stateless
  * every request creates a new Authentication object).
  * <P>
- * Based on Spring Security's CsrfAuthenticationStrategy:
- * https://github.com/spring-projects/spring-security/blob/5.2.x/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
+ * This is essentially a customization of Spring Security's CsrfAuthenticationStrategy:
+ * https://github.com/spring-projects/spring-security/blob/6.2.x/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
  */
 public class DSpaceCsrfAuthenticationStrategy implements SessionAuthenticationStrategy {
 
-    private final CsrfTokenRepository csrfTokenRepository;
+    private final Log logger = LogFactory.getLog(getClass());
+
+    private final CsrfTokenRepository tokenRepository;
+
+    private CsrfTokenRequestHandler requestHandler = new XorCsrfTokenRequestAttributeHandler();
 
     /**
      * Creates a new instance
-     * @param csrfTokenRepository the {@link CsrfTokenRepository} to use
+     * @param tokenRepository the {@link CsrfTokenRepository} to use
      */
-    public DSpaceCsrfAuthenticationStrategy(CsrfTokenRepository csrfTokenRepository) {
-        Assert.notNull(csrfTokenRepository, "csrfTokenRepository cannot be null");
-        this.csrfTokenRepository = csrfTokenRepository;
+    public DSpaceCsrfAuthenticationStrategy(CsrfTokenRepository tokenRepository) {
+        Assert.notNull(tokenRepository, "tokenRepository cannot be null");
+        this.tokenRepository = tokenRepository;
+    }
+
+    /**
+     * Method is copied from {@link CsrfAuthenticationStrategy#setRequestHandler(CsrfTokenRequestHandler)}
+     */
+    public void setRequestHandler(CsrfTokenRequestHandler requestHandler) {
+        Assert.notNull(requestHandler, "requestHandler cannot be null");
+        this.requestHandler = requestHandler;
     }
 
     /**
      * This method is triggered anytime a new Authentication occurs. As DSpace uses Stateless authentication,
      * this method is triggered on _every request_ after an initial login occurs. This is because the Spring Security
-     * Authentication object is recreated on every request.
+     * 'Authentication' object is recreated on every request.
      * <P>
      * Therefore, for DSpace, we've customized this method to ensure a new CSRF Token is NOT generated each time a new
-     * Authentication object is created -- doing so causes the CSRF Token to change with every request. Instead, we
+     * Authentication object is created -- as doing so causes the CSRF Token to change with every request. Instead, we
      * check to see if the client also passed a CSRF token via a querystring parameter (i.e. "_csrf"). If so, this means
      * the client has sent the token in a less secure manner & it must then be regenerated.
      * <P>
@@ -58,8 +75,10 @@ public class DSpaceCsrfAuthenticationStrategy implements SessionAuthenticationSt
                                  HttpServletRequest request, HttpServletResponse response)
         throws SessionAuthenticationException {
 
+
         // Check if token returned in server-side cookie
-        CsrfToken token = this.csrfTokenRepository.loadToken(request);
+        CsrfToken token = this.tokenRepository.loadToken(request);
+
         // For DSpace, this will only be null if we are forcing CSRF token regeneration (e.g. on initial login)
         boolean containsToken = token != null;
 
@@ -70,18 +89,31 @@ public class DSpaceCsrfAuthenticationStrategy implements SessionAuthenticationSt
             // If token exists was sent in a parameter, then we need to reset our token
             // (as sending token in a param is insecure)
             if (containsParameter) {
-                // Note: We first set the token to null & then set a new one. This results in 2 cookies sent,
-                // the first being empty and the second having the new token.
-                // This behavior is borrowed from Spring Security's CsrfAuthenticationStrategy, see
-                // https://github.com/spring-projects/spring-security/blob/5.4.x/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
-                this.csrfTokenRepository.saveToken(null, request, response);
-                CsrfToken newToken = this.csrfTokenRepository.generateToken(request);
-                this.csrfTokenRepository.saveToken(newToken, request, response);
-
-                request.setAttribute(CsrfToken.class.getName(), newToken);
-                request.setAttribute(newToken.getParameterName(), newToken);
+                resetCSRFToken(request, response);
             }
         }
     }
 
+    /**
+     * A custom utility method to force Spring Security to reset the CSRF token. This is used by DSpace to reset
+     * the token whenever the CSRF token is passed insecurely (as a request param, see onAuthentication() above)
+     * or on logout (see JWTTokenRestAuthenticationServiceImpl)
+     * @param request current HTTP request
+     * @param response current HTTP response
+     * @see org.dspace.app.rest.security.jwt.JWTTokenRestAuthenticationServiceImpl
+     */
+    public void resetCSRFToken(HttpServletRequest request, HttpServletResponse response) {
+        // Note: We first set the token to null & then set a new one. This results in 2 cookies sent,
+        // the first being empty and the second having the new token.
+        // This behavior is borrowed from Spring Security's CsrfAuthenticationStrategy, see
+        // https://github.com/spring-projects/spring-security/blob/6.2.x/web/src/main/java/org/springframework/security/web/csrf/CsrfAuthenticationStrategy.java
+        this.tokenRepository.saveToken(null, request, response);
+        DeferredCsrfToken deferredCsrfToken = this.tokenRepository.loadDeferredToken(request, response);
+        this.requestHandler.handle(request, response, deferredCsrfToken::get);
+        // This may look odd, but reading the deferred CSRF token will cause Spring Security to send it back
+        // in the next request. This ensures our new token is sent back immediately (instead of in a later request)
+        deferredCsrfToken.get();
+        this.logger.debug("Replaced CSRF Token");
+    }
+
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepository.java
index 2079727ac8..0bcd2a5523 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepository.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepository.java
@@ -8,12 +8,13 @@
 package org.dspace.app.rest.security;
 
 import java.util.UUID;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.HttpHeaders;
+import java.util.function.Consumer;
 
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.http.ResponseCookie;
+import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
 import org.springframework.security.web.csrf.CsrfToken;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
 import org.springframework.security.web.csrf.DefaultCsrfToken;
@@ -25,9 +26,10 @@ import org.springframework.web.util.WebUtils;
  * This is a custom Spring Security CsrfTokenRepository which supports *cross-domain* CSRF protection (allowing the
  * client and backend to be on different domains). It's inspired by https://stackoverflow.com/a/33175322
  * <P>
- * This also borrows heavily from Spring Security's CookieCsrfTokenRepository:
- *  https://github.com/spring-projects/spring-security/blob/5.2.x/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java
- *
+ * This is essentially a customization of Spring Security's CookieCsrfTokenRepository:
+ * https://github.com/spring-projects/spring-security/blob/6.2.x/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java
+ * However, as that class is "final" we aannot override it directly.
+ * <P>
  * How it works:
  *
  *  1. Backend generates XSRF token & stores in a *server-side* cookie named DSPACE-XSRF-COOKIE. By default, this cookie
@@ -53,11 +55,19 @@ import org.springframework.web.util.WebUtils;
 public class DSpaceCsrfTokenRepository implements CsrfTokenRepository {
     // This cookie name is changed from the default "XSRF-TOKEN" to ensure it is uniquely named and doesn't conflict
     // with any other XSRF-TOKEN cookies (e.g. in Angular UI, the XSRF-TOKEN cookie is a *client-side* only cookie)
-    static final String DEFAULT_CSRF_COOKIE_NAME = "DSPACE-XSRF-COOKIE";
+    public static final String DEFAULT_CSRF_COOKIE_NAME = "DSPACE-XSRF-COOKIE";
 
-    static final String DEFAULT_CSRF_PARAMETER_NAME = "_csrf";
+    // The HTTP header that is sent back to the client whenever a new CSRF token is created
+    // (NOTE: This is purposefully different from DEFAULT_CSRF_HEADER_NAME below!)
+    public static final String DSPACE_CSRF_HEADER_NAME = "DSPACE-XSRF-TOKEN";
 
-    static final String DEFAULT_CSRF_HEADER_NAME = "X-XSRF-TOKEN";
+    public static final String DEFAULT_CSRF_PARAMETER_NAME = "_csrf";
+
+    // The HTTP header that Spring Security expects to receive from the client in order to validate a CSRF token
+    public static final String DEFAULT_CSRF_HEADER_NAME = "X-XSRF-TOKEN";
+
+    private static final String CSRF_TOKEN_REMOVED_ATTRIBUTE_NAME = CookieCsrfTokenRepository.class.getName()
+                                                                                                   .concat(".REMOVED");
 
     private String parameterName = DEFAULT_CSRF_PARAMETER_NAME;
 
@@ -71,73 +81,93 @@ public class DSpaceCsrfTokenRepository implements CsrfTokenRepository {
 
     private String cookieDomain;
 
+    private Boolean secure;
+
+    private int cookieMaxAge = -1;
+
+    private Consumer<ResponseCookie.ResponseCookieBuilder> cookieCustomizer = (builder) -> {
+    };
+
     public DSpaceCsrfTokenRepository() {
     }
 
-    @Override
-    public CsrfToken generateToken(HttpServletRequest request) {
-        return new DefaultCsrfToken(this.headerName, this.parameterName,
-                                    createNewToken());
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository#setCookieCustomizer(Consumer)}
+     */
+    public void setCookieCustomizer(Consumer<ResponseCookie.ResponseCookieBuilder> cookieCustomizer) {
+        Assert.notNull(cookieCustomizer, "cookieCustomizer must not be null");
+        this.cookieCustomizer = cookieCustomizer;
     }
 
     /**
-     * This method has been modified for DSpace.
+     * Method is copied from {@link CookieCsrfTokenRepository#generateToken(HttpServletRequest)}
+     */
+    @Override
+    public CsrfToken generateToken(HttpServletRequest request) {
+        return new DefaultCsrfToken(this.headerName, this.parameterName, createNewToken());
+    }
+
+    /**
+     * This method has been modified for DSpace. It borrows MOST of the logic from
+     * {@link CookieCsrfTokenRepository#saveToken(CsrfToken, HttpServletRequest, HttpServletResponse)}
      * <P>
-     * It now uses ResponseCookie to build the cookie, so that the "SameSite" attribute can be applied.
+     * It applies a "SameSite" attribute to every cookie by default.
      * <P>
-     * It also sends the token (if not empty) in both the cookie and the custom "DSPACE-XSRF-TOKEN" header
+     * It also sends the token (if not empty) back in BOTH the cookie and the custom "DSPACE-XSRF-TOKEN" header.
+     * By default, Spring Security will only send the token back in the cookie.
      * @param token current token
      * @param request current request
      * @param response current response
      */
     @Override
-    public void saveToken(CsrfToken token, HttpServletRequest request,
-                          HttpServletResponse response) {
-        String tokenValue = token == null ? "" : token.getToken();
-        Cookie cookie = new Cookie(this.cookieName, tokenValue);
-        cookie.setSecure(request.isSecure());
-        if (this.cookiePath != null && !this.cookiePath.isEmpty()) {
-            cookie.setPath(this.cookiePath);
-        } else {
-            cookie.setPath(this.getRequestContext(request));
-        }
-        if (token == null) {
-            cookie.setMaxAge(0);
-        } else {
-            cookie.setMaxAge(-1);
-        }
-        cookie.setHttpOnly(cookieHttpOnly);
-        if (this.cookieDomain != null && !this.cookieDomain.isEmpty()) {
-            cookie.setDomain(this.cookieDomain);
-        }
+    public void saveToken(CsrfToken token, HttpServletRequest request, HttpServletResponse response) {
+        String tokenValue = (token != null) ? token.getToken() : "";
 
-        // Custom: Turn the above Cookie into a ResponseCookie so that we can set "SameSite" attribute
-        // If client is on a different domain than the backend, then Cookie MUST use "SameSite=None" and "Secure".
-        // Most modern browsers will block it otherwise.
-        // TODO: Make SameSite configurable? "Lax" cookies are more secure, but require client & backend on same domain.
-        String sameSite = "None";
-        if (!cookie.getSecure()) {
-            sameSite = "Lax";
-        }
-        ResponseCookie responseCookie = ResponseCookie.from(cookie.getName(), cookie.getValue())
-                                              .path(cookie.getPath()).maxAge(cookie.getMaxAge())
-                                              .domain(cookie.getDomain()).httpOnly(cookie.isHttpOnly())
-                                              .secure(cookie.getSecure()).sameSite(sameSite).build();
+        ResponseCookie.ResponseCookieBuilder cookieBuilder =
+            ResponseCookie.from(this.cookieName, tokenValue)
+                          .secure((this.secure != null) ? this.secure : request.isSecure())
+                          .path(StringUtils.hasLength(this.cookiePath) ?
+                                    this.cookiePath : this.getRequestContext(request))
+                          .maxAge((token != null) ? this.cookieMaxAge : 0)
+                          .httpOnly(this.cookieHttpOnly)
+                          .domain(this.cookieDomain)
+                          // Custom for DSpace: If client is on a different domain than the backend, then Cookie MUST
+                          // use "SameSite=None" and "Secure". Most modern browsers will block it otherwise.
+                          // TODO: Make SameSite configurable? "Lax" cookies are more secure, but require client &
+                          // backend on same domain.
+                          .sameSite(request.isSecure() ? "None" : "Lax");;
 
-        // Write the ResponseCookie to the Set-Cookie header
-        // This cookie is only used by the backend & not needed by client
-        response.addHeader(HttpHeaders.SET_COOKIE, responseCookie.toString());
+        this.cookieCustomizer.accept(cookieBuilder);
 
-        // Send custom header to client with token (only if token not empty)
-        // We send our token via a custom header because client can be on a different domain.
+        // Custom for DSpace: also send custom header to client with token.
+        // We send our token via a custom header because client may be on a different domain.
         // Cookies cannot be reliably sent cross-domain.
         if (StringUtils.hasLength(tokenValue)) {
-            response.setHeader("DSPACE-XSRF-TOKEN", tokenValue);
+            response.setHeader(DSPACE_CSRF_HEADER_NAME, tokenValue);
+        }
+
+        Cookie cookie = mapToCookie(cookieBuilder.build());
+        response.addCookie(cookie);
+
+        // Set request attribute to signal that response has blank cookie value,
+        // which allows loadToken to return null when token has been removed
+        if (!StringUtils.hasLength(tokenValue)) {
+            request.setAttribute(CSRF_TOKEN_REMOVED_ATTRIBUTE_NAME, Boolean.TRUE);
+        } else {
+            request.removeAttribute(CSRF_TOKEN_REMOVED_ATTRIBUTE_NAME);
         }
     }
 
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository#loadToken(HttpServletRequest)}
+     */
     @Override
     public CsrfToken loadToken(HttpServletRequest request) {
+        // Return null when token has been removed during the current request
+        // which allows loadDeferredToken to re-generate the token
+        if (Boolean.TRUE.equals(request.getAttribute(CSRF_TOKEN_REMOVED_ATTRIBUTE_NAME))) {
+            return null;
+        }
         Cookie cookie = WebUtils.getCookie(request, this.cookieName);
         if (cookie == null) {
             return null;
@@ -146,104 +176,124 @@ public class DSpaceCsrfTokenRepository implements CsrfTokenRepository {
         if (!StringUtils.hasLength(token)) {
             return null;
         }
-
         return new DefaultCsrfToken(this.headerName, this.parameterName, token);
     }
 
-
     /**
-     * Sets the name of the HTTP request parameter that should be used to provide a token.
-     *
-     * @param parameterName the name of the HTTP request parameter that should be used to
-     * provide a token
+     * Method is copied from {@link CookieCsrfTokenRepository#setParameterName(String)}
      */
     public void setParameterName(String parameterName) {
-        Assert.notNull(parameterName, "parameterName is not null");
+        Assert.notNull(parameterName, "parameterName cannot be null");
         this.parameterName = parameterName;
     }
 
     /**
-     * Sets the name of the HTTP header that should be used to provide the token.
-     *
-     * @param headerName the name of the HTTP header that should be used to provide the
-     * token
+     * Method is copied from {@link CookieCsrfTokenRepository#setHeaderName(String)}
      */
     public void setHeaderName(String headerName) {
-        Assert.notNull(headerName, "headerName is not null");
+        Assert.notNull(headerName, "headerName cannot be null");
         this.headerName = headerName;
     }
 
     /**
-     * Sets the name of the cookie that the expected CSRF token is saved to and read from.
-     *
-     * @param cookieName the name of the cookie that the expected CSRF token is saved to
-     * and read from
+     * Method is copied from {@link CookieCsrfTokenRepository#setCookieName(String)}
      */
     public void setCookieName(String cookieName) {
-        Assert.notNull(cookieName, "cookieName is not null");
+        Assert.notNull(cookieName, "cookieName cannot be null");
         this.cookieName = cookieName;
     }
 
     /**
-     * Sets the HttpOnly attribute on the cookie containing the CSRF token.
-     * Defaults to <code>true</code>.
-     *
-     * @param cookieHttpOnly <code>true</code> sets the HttpOnly attribute, <code>false</code> does not set it
+     * Method is copied from {@link CookieCsrfTokenRepository#setCookieHttpOnly(boolean)}
+     * @deprecated Use {@link #setCookieCustomizer(Consumer)} instead.
      */
+    @Deprecated
     public void setCookieHttpOnly(boolean cookieHttpOnly) {
         this.cookieHttpOnly = cookieHttpOnly;
     }
 
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository}
+     */
     private String getRequestContext(HttpServletRequest request) {
         String contextPath = request.getContextPath();
-        return contextPath.length() > 0 ? contextPath : "/";
+        return (contextPath.length() > 0) ? contextPath : "/";
     }
 
     /**
-     * Factory method to conveniently create an instance that has
-     * {@link #setCookieHttpOnly(boolean)} set to false.
-     *
-     * @return an instance of CookieCsrfTokenRepository with
-     * {@link #setCookieHttpOnly(boolean)} set to false
+     * Method is copied from {@link CookieCsrfTokenRepository}
+     * (and only modified to return the DSpaceCsrfTokenRepository instead)
      */
     public static DSpaceCsrfTokenRepository withHttpOnlyFalse() {
         DSpaceCsrfTokenRepository result = new DSpaceCsrfTokenRepository();
-        result.setCookieHttpOnly(false);
+        result.cookieHttpOnly = false;
         return result;
     }
 
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository}
+     */
     private String createNewToken() {
         return UUID.randomUUID().toString();
     }
 
     /**
-     * Set the path that the Cookie will be created with. This will override the default functionality which uses the
-     * request context as the path.
-     *
-     * @param path the path to use
+     * Method is copied from {@link CookieCsrfTokenRepository}
+     */
+    private Cookie mapToCookie(ResponseCookie responseCookie) {
+        Cookie cookie = new Cookie(responseCookie.getName(), responseCookie.getValue());
+        cookie.setSecure(responseCookie.isSecure());
+        cookie.setPath(responseCookie.getPath());
+        cookie.setMaxAge((int) responseCookie.getMaxAge().getSeconds());
+        cookie.setHttpOnly(responseCookie.isHttpOnly());
+        if (StringUtils.hasLength(responseCookie.getDomain())) {
+            cookie.setDomain(responseCookie.getDomain());
+        }
+        if (StringUtils.hasText(responseCookie.getSameSite())) {
+            cookie.setAttribute("SameSite", responseCookie.getSameSite());
+        }
+        return cookie;
+    }
+
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository#setCookiePath(String)}
      */
     public void setCookiePath(String path) {
         this.cookiePath = path;
     }
 
     /**
-     * Get the path that the CSRF cookie will be set to.
-     *
-     * @return the path to be used.
+     * Method is copied from {@link CookieCsrfTokenRepository#getCookiePath()}
      */
     public String getCookiePath() {
         return this.cookiePath;
     }
 
     /**
-     * Sets the domain of the cookie that the expected CSRF token is saved to and read from.
-     *
-     * @since 5.2
-     * @param cookieDomain the domain of the cookie that the expected CSRF token is saved to
-     * and read from
+     * Method is copied from {@link CookieCsrfTokenRepository#setCookieDomain(String)}
+     * @deprecated Use {@link #setCookieCustomizer(Consumer)} instead.
      */
+    @Deprecated
     public void setCookieDomain(String cookieDomain) {
         this.cookieDomain = cookieDomain;
     }
 
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository#setSecure(Boolean)}
+     * @deprecated Use {@link #setCookieCustomizer(Consumer)} instead.
+     */
+    @Deprecated
+    public void setSecure(Boolean secure) {
+        this.secure = secure;
+    }
+
+    /**
+     * Method is copied from {@link CookieCsrfTokenRepository#setCookieMaxAge(int)}
+     * @deprecated Use {@link #setCookieCustomizer(Consumer)} instead.
+     */
+    @Deprecated
+    public void setCookieMaxAge(int cookieMaxAge) {
+        Assert.isTrue(cookieMaxAge != 0, "cookieMaxAge cannot be zero");
+        this.cookieMaxAge = cookieMaxAge;
+    }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceObjectAdminPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceObjectAdminPermissionEvaluatorPlugin.java
index 5420a6e7dc..dcf0c34aae 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceObjectAdminPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpaceObjectAdminPermissionEvaluatorPlugin.java
@@ -12,6 +12,8 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.rest.utils.DSpaceObjectUtils;
 import org.dspace.authorize.service.AuthorizeService;
@@ -19,20 +21,19 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
+
 /**
- * {@link RestPermissionEvaluatorPlugin} class that evaluate admin permission against a generic DSpace Object
- * 
+ * {@link RestPermissionEvaluatorPlugin} class that evaluate admin permission against a generic DSpace Object.
+ *
  * @author Mykhaylo Boychuk (4science.it)
  */
 @Component
 public class DSpaceObjectAdminPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(DSpaceObjectAdminPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String DSPACE_OBJECT = "dspaceObject";
 
@@ -64,7 +65,7 @@ public class DSpaceObjectAdminPermissionEvaluatorPlugin extends RestObjectPermis
             DSpaceObject dso = dspaceObjectUtil.findDSpaceObject(context, dsoUuid);
             return authorizeService.isAdmin(context, dso);
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpacePermissionEvaluator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpacePermissionEvaluator.java
index b801830d91..d6e162b30a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpacePermissionEvaluator.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/DSpacePermissionEvaluator.java
@@ -38,13 +38,13 @@ public class DSpacePermissionEvaluator implements PermissionEvaluator {
      * expression system. This corresponds to the DSpace action. Not null.
      * @return true if the permission is granted by one of the plugins, false otherwise
      */
+    @Override
     public boolean hasPermission(Authentication authentication, Object targetDomainObject, Object permission) {
         for (RestPermissionEvaluatorPlugin permissionEvaluatorPlugin : permissionEvaluatorPluginList) {
             if (permissionEvaluatorPlugin.hasPermission(authentication, targetDomainObject, permission)) {
                 return true;
             }
         }
-
         return false;
     }
 
@@ -59,6 +59,7 @@ public class DSpacePermissionEvaluator implements PermissionEvaluator {
      * expression system. This corresponds to the DSpace action. Not null.
      * @return true if the permission is granted by one of the plugins, false otherwise
      */
+    @Override
     public boolean hasPermission(Authentication authentication, Serializable targetId, String targetType,
                                  Object permission) {
         for (RestPermissionEvaluatorPlugin permissionEvaluatorPlugin : permissionEvaluatorPluginList) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
index e55734e513..d66ecd5472 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestAuthenticationProvider.java
@@ -15,10 +15,12 @@ import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Objects;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.login.PostLoggedInAction;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authenticate.AuthenticationMethod;
@@ -28,8 +30,6 @@ import org.dspace.core.Context;
 import org.dspace.core.LogHelper;
 import org.dspace.eperson.EPerson;
 import org.dspace.services.RequestService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -40,7 +40,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.stereotype.Component;
 
 /**
- * This class is responsible for authenticating a user via REST
+ * This class is responsible for authenticating a user via REST.
  *
  * @author Frederic Van Reet (frederic dot vanreet at atmire dot com)
  * @author Tom Desair (tom dot desair at atmire dot com)
@@ -48,7 +48,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class EPersonRestAuthenticationProvider implements AuthenticationProvider {
 
-    private static final Logger log = LoggerFactory.getLogger(EPersonRestAuthenticationProvider.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String MANAGE_ACCESS_GROUP = "MANAGE_ACCESS_GROUP";
 
@@ -144,9 +144,8 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
                         }
 
                     } else {
-                        log.info(LogHelper.getHeader(newContext, "failed_login", "email="
-                            + name + ", result="
-                            + authenticateResult));
+                        log.info(LogHelper.getHeader(newContext, "failed_login",
+                                "email={}, result={}"), name, authenticateResult);
                         throw new BadCredentialsException("Login failed");
                     }
                 }
@@ -155,7 +154,7 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
                     try {
                         newContext.complete();
                     } catch (SQLException e) {
-                        log.error(e.getMessage() + " occurred while trying to close", e);
+                        log.error("{} occurred while trying to close", e.getMessage(), e);
                     }
                 }
             }
@@ -182,7 +181,7 @@ public class EPersonRestAuthenticationProvider implements AuthenticationProvider
             return new DSpaceAuthentication(ePerson, getGrantedAuthorities(context));
 
         } else {
-            log.info(LogHelper.getHeader(context, "failed_login", "No eperson with an non-blank e-mail address found"));
+            log.info(LogHelper.getHeader(context, "failed_login", "No eperson with a non-blank e-mail address found"));
             throw new BadCredentialsException("Login failed");
         }
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java
index ce6783ae15..c3e1cc68ae 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/EPersonRestPermissionEvaluatorPlugin.java
@@ -11,9 +11,11 @@ import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.model.patch.Patch;
 import org.dspace.app.rest.repository.patch.operation.DSpaceObjectMetadataPatchUtils;
@@ -27,8 +29,6 @@ import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -40,7 +40,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class EPersonRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(EPersonRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     AuthorizeService authorizeService;
@@ -61,6 +61,9 @@ public class EPersonRestPermissionEvaluatorPlugin extends RestObjectPermissionEv
         if (Constants.getTypeID(targetType) != Constants.EPERSON) {
             return false;
         }
+        if (targetId == null) {
+            return false;
+        }
 
         Request request = requestService.getCurrentRequest();
         Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
@@ -84,7 +87,7 @@ public class EPersonRestPermissionEvaluatorPlugin extends RestObjectPermissionEv
                 return true;
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
 
 
@@ -100,7 +103,7 @@ public class EPersonRestPermissionEvaluatorPlugin extends RestObjectPermissionEv
         Request currentRequest = requestService.getCurrentRequest();
         if (currentRequest != null) {
             HttpServletRequest httpServletRequest = currentRequest.getHttpServletRequest();
-            if (operations.size() > 0
+            if (!operations.isEmpty()
                 && StringUtils.equalsIgnoreCase(operations.get(0).getOp(), PatchOperation.OPERATION_ADD)
                 && StringUtils.equalsIgnoreCase(operations.get(0).getPath(),
                 EPersonPasswordAddOperation.OPERATION_PASSWORD_CHANGE)
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ExtractorOfAInprogressSubmissionInformations.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ExtractorOfAInprogressSubmissionInformations.java
index dd2c8602d8..cbe685f9fe 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ExtractorOfAInprogressSubmissionInformations.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ExtractorOfAInprogressSubmissionInformations.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.security;
 import java.sql.SQLException;
 import java.util.Objects;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.model.WorkflowItemRest;
 import org.dspace.app.rest.model.WorkspaceItemRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java
index d6d3bc82c7..ad34cede6b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/GroupRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.UUID;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.util.AuthorizeUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -22,8 +24,6 @@ import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class GroupRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(GroupRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -59,6 +59,9 @@ public class GroupRestPermissionEvaluatorPlugin extends RestObjectPermissionEval
                 || Constants.getTypeID(targetType) != Constants.GROUP) {
             return false;
         }
+        if (targetId == null) {
+            return false;
+        }
 
         Request request = requestService.getCurrentRequest();
         Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
@@ -87,7 +90,7 @@ public class GroupRestPermissionEvaluatorPlugin extends RestObjectPermissionEval
             }
 
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/MethodSecurityConfig.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/MethodSecurityConfig.java
index 29bfc13d83..90a8f013e2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/MethodSecurityConfig.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/MethodSecurityConfig.java
@@ -8,24 +8,31 @@
 package org.dspace.app.rest.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.access.PermissionEvaluator;
 import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
+import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
 
+/**
+ * This EnableMethodSecurity configuration enables Spring Security annotation checks on all methods
+ * (e.g. @PreAuthorize, @PostAuthorize annotations, etc.)
+ */
 @Configuration
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class MethodSecurityConfig extends GlobalMethodSecurityConfiguration {
-
+@EnableMethodSecurity
+public class MethodSecurityConfig {
     @Autowired
     private PermissionEvaluator dSpacePermissionEvaluator;
 
-    @Override
-    protected MethodSecurityExpressionHandler createExpressionHandler() {
-        DefaultMethodSecurityExpressionHandler expressionHandler =
-                new DefaultMethodSecurityExpressionHandler();
+    /**
+     * Tell Spring to use our custom PermissionEvaluator as part of method security.
+     * This allows DSpacePermissionEvaluator to be used in @PreAuthorize annotations (and similar).
+     * @see org.dspace.app.rest.security.DSpacePermissionEvaluator
+     */
+    @Bean
+    MethodSecurityExpressionHandler methodSecurityExpressionHandler() {
+        DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler();
         expressionHandler.setPermissionEvaluator(dSpacePermissionEvaluator);
         return expressionHandler;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OidcLoginFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OidcLoginFilter.java
index c84840e770..28c67314c5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OidcLoginFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OidcLoginFilter.java
@@ -10,26 +10,27 @@ package org.dspace.app.rest.security;
 import static org.dspace.authenticate.OidcAuthenticationBean.OIDC_AUTH_ATTRIBUTE;
 
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 
 /**
- * This class will filter openID Connect requests and try and authenticate them.
+ * This class will filter OpenID Connect (OIDC) requests and try and authenticate them.
+ * In this case, the actual authentication is performed by OIDC. After authentication succeeds, OIDC will send
+ * the authentication data to this filter in order for it to be processed by DSpace.
  *
  * @author Pasquale Cavallo (pasquale.cavallo at 4science dot it)
  */
-
 public class OidcLoginFilter extends StatelessLoginFilter {
 
-    public OidcLoginFilter(String url, AuthenticationManager authenticationManager,
+    public OidcLoginFilter(String url, String httpMethod, AuthenticationManager authenticationManager,
             RestAuthenticationService restAuthenticationService) {
-        super(url, authenticationManager, restAuthenticationService);
+        super(url, httpMethod, authenticationManager, restAuthenticationService);
     }
 
     @Override
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java
index 9fdef6b050..70496b9dba 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidLoginFilter.java
@@ -9,11 +9,11 @@ package org.dspace.app.rest.security;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -32,6 +32,8 @@ import org.springframework.security.core.AuthenticationException;
 
 /**
  * This class will filter ORCID requests and try and authenticate them.
+ * In this case, the actual authentication is performed by ORCID. After authentication succeeds, ORCID will send
+ * the authentication data to this filter in order for it to be processed by DSpace.
  *
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  */
@@ -45,9 +47,9 @@ public class OrcidLoginFilter extends StatelessLoginFilter {
     private OrcidAuthenticationBean orcidAuthentication = new DSpace().getServiceManager()
         .getServiceByName("orcidAuthentication", OrcidAuthenticationBean.class);
 
-    public OrcidLoginFilter(String url, AuthenticationManager authenticationManager,
+    public OrcidLoginFilter(String url, String httpMethod, AuthenticationManager authenticationManager,
                                      RestAuthenticationService restAuthenticationService) {
-        super(url, authenticationManager, restAuthenticationService);
+        super(url, httpMethod, authenticationManager, restAuthenticationService);
     }
 
     @Override
@@ -57,7 +59,7 @@ public class OrcidLoginFilter extends StatelessLoginFilter {
         if (!OrcidAuthentication.isEnabled()) {
             throw new ProviderNotFoundException("Orcid login is disabled.");
         }
-
+        // NOTE: because this authentication is implicit, we pass in an empty DSpaceAuthentication
         return authenticationManager.authenticate(new DSpaceAuthentication());
 
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
index 0139f3b336..cadd42f133 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
@@ -22,21 +24,19 @@ import org.dspace.orcid.service.OrcidHistoryService;
 import org.dspace.orcid.service.OrcidQueueService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
  * Class that evaluate DELETE and READ permissions
- * 
+ *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
 @Component
 public class OrcidQueueAndHistoryRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String ORCID_QUEUE = "ORCID_QUEUE";
     public static final String ORCID_HISTORY = "ORCID_HISTORY";
@@ -97,7 +97,7 @@ public class OrcidQueueAndHistoryRestPermissionEvaluatorPlugin extends RestObjec
                 .anyMatch(authority -> currentUser.getID().toString().equals(authority));
 
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
 
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java
index d8566143c4..2666d98bd8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/OrcidQueueSearchRestPermissionEvaluatorPlugin.java
@@ -13,6 +13,8 @@ import java.util.List;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
@@ -21,8 +23,6 @@ import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class OrcidQueueSearchRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(OrcidQueueAndHistoryRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String ORCID_QUEUE_SEARCH = "ORCID_QUEUE_SEARCH";
 
@@ -75,7 +75,7 @@ public class OrcidQueueSearchRestPermissionEvaluatorPlugin extends RestObjectPer
                 return true;
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java
index d145dae449..3aa556c91f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/PoolTaskRestPermissionEvaluatorPlugin.java
@@ -12,6 +12,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.PoolTaskRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.AuthorizeException;
@@ -23,8 +25,6 @@ import org.dspace.services.model.Request;
 import org.dspace.xmlworkflow.storedcomponents.PoolTask;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.dspace.xmlworkflow.storedcomponents.service.PoolTaskService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -37,7 +37,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class PoolTaskRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(PoolTaskRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -79,7 +79,7 @@ public class PoolTaskRestPermissionEvaluatorPlugin extends RestObjectPermissionE
                 return true;
             }
         } catch (SQLException | AuthorizeException | IOException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ProcessRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ProcessRestPermissionEvaluatorPlugin.java
index 94d9694ec4..b476b3fef9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ProcessRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ProcessRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.ProcessRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -19,8 +21,6 @@ import org.dspace.scripts.Process;
 import org.dspace.scripts.service.ProcessService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -33,7 +33,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class ProcessRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(ProcessRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -66,7 +66,7 @@ public class ProcessRestPermissionEvaluatorPlugin extends RestObjectPermissionEv
                 return true;
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/QAEventRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/QAEventRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..6e0c0482db
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/QAEventRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,74 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.security;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.model.QAEventRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.QAEvent;
+import org.dspace.core.Context;
+import org.dspace.qaevent.service.QAEventSecurityService;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class will handle Permissions for the {@link QAEventRest} object and its calls
+ *
+ * @author Andrea Bollini (4Science)
+ */
+@Component
+public class QAEventRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Autowired
+    private QAEventService qaEventService;
+
+    @Autowired
+    private QAEventSecurityService qaEventSecurityService;
+
+    @Autowired
+    private RequestService requestService;
+
+    /**
+     * Responsible for checking whether or not the user has access to the requested QASource
+     *
+     * @param targetType the type of Rest Object that should be checked for permission. This class would deal only with
+     * qaevent
+     * @param targetId string to extract the sourcename from
+     */
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+            DSpaceRestPermission restPermission) {
+        if (StringUtils.equalsIgnoreCase(QAEventRest.NAME, targetType)) {
+            log.debug("Checking permission for targetId {}", targetId);
+            Request request = requestService.getCurrentRequest();
+            Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
+            if (Objects.isNull(targetId)) {
+                return true;
+            }
+            QAEvent qaEvent = qaEventService.findEventByEventId(targetId.toString());
+            // everyone is expected to be able to see a not existing event (so we can return not found)
+            if ((qaEvent == null
+                    || qaEventSecurityService.canSeeEvent(context, context.getCurrentUser(), qaEvent))) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/QASourceRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/QASourceRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..8aca72326e
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/QASourceRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,71 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.security;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.model.QASourceRest;
+import org.dspace.app.rest.model.QATopicRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.core.Context;
+import org.dspace.qaevent.QATopic;
+import org.dspace.qaevent.service.QAEventSecurityService;
+import org.dspace.services.RequestService;
+import org.dspace.services.model.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ * This class will handle Permissions for the {@link QASourceRest} object and {@link QATopic}
+ *
+ * @author Andrea Bollini (4Science)
+ */
+@Component
+public class QASourceRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    private static final Logger log = LogManager.getLogger();
+
+    @Autowired
+    private QAEventSecurityService qaEventSecurityService;
+
+    @Autowired
+    private RequestService requestService;
+
+    /**
+     * Responsible for checking whether or not the user has access to the requested QASource
+     *
+     * @param targetType the type of Rest Object that should be checked for permission. This class would deal only with
+     * qasource and qatopic
+     * @param targetId string to extract the sourcename from
+     */
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+                                       DSpaceRestPermission restPermission) {
+        if (StringUtils.equalsIgnoreCase(QASourceRest.NAME, targetType)
+                || StringUtils.equalsIgnoreCase(QATopicRest.NAME, targetType)) {
+            log.debug("Checking permission for targetId {}", targetId);
+            Request request = requestService.getCurrentRequest();
+            Context context = ContextUtil.obtainContext(request.getHttpServletRequest());
+            if (Objects.isNull(targetId)) {
+                return true;
+            }
+            // the source name is always the first part of the id both for a source than a topic
+            // users can see all the topic in source that they can access, eventually they will have no
+            // events visible to them
+            String sourceName = targetId.toString().split(":")[0];
+            return qaEventSecurityService.canSeeSource(context, context.getCurrentUser(), sourceName);
+        }
+        return false;
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ReadAuthorizationPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ReadAuthorizationPermissionEvaluatorPlugin.java
index 88670c89fe..8bf0a1452a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ReadAuthorizationPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ReadAuthorizationPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.authorization.AuthorizationRestUtil;
 import org.dspace.app.rest.model.AuthorizationRest;
 import org.dspace.app.rest.utils.ContextUtil;
@@ -19,21 +21,19 @@ import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
  * {@link RestPermissionEvaluatorPlugin} class that evaluate READ permissions for an Authorization
- * 
+ *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @Component
 public class ReadAuthorizationPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(ReadAuthorizationPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     AuthorizeService authorizeService;
@@ -75,7 +75,7 @@ public class ReadAuthorizationPermissionEvaluatorPlugin extends RestObjectPermis
                 }
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
 
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java
index 0e0f608078..5cad1b3353 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResearcherProfileRestPermissionEvaluatorPlugin.java
@@ -13,8 +13,8 @@ import static org.dspace.app.rest.security.DSpaceRestPermission.WRITE;
 
 import java.io.Serializable;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.model.ResearcherProfileRest;
 import org.dspace.app.rest.utils.ContextUtil;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java
index 421d25f940..ccf272ecef 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyAdminPermissionEvalutatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.ResourcePolicyRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.ResourcePolicy;
@@ -20,8 +22,6 @@ import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.security.core.Authentication;
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class ResourcePolicyAdminPermissionEvalutatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(ResourcePolicyRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String RESOURCE_POLICY_PATCH = "resourcepolicy";
 
@@ -74,7 +74,7 @@ public class ResourcePolicyAdminPermissionEvalutatorPlugin extends RestObjectPer
             DSpaceObject dso = resourcePolicy.getdSpaceObject();
             return authorizeService.isAdmin(context, dso);
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyRestPermissionEvaluatorPlugin.java
index bf7ce3b53f..9a34ca6811 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ResourcePolicyRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.ResourcePolicyRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -20,21 +22,19 @@ import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * {@link RestPermissionEvaluatorPlugin} class that evaluate READ, WRITE and DELETE permissions over a ResourcePolicy
- * 
+ * {@link RestPermissionEvaluatorPlugin} class that evaluate READ, WRITE and DELETE permissions over a ResourcePolicy.
+ *
  * @author Mykhaylo Boychuk (4science.it)
  */
 @Component
 public class ResourcePolicyRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(ResourcePolicyRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     AuthorizeService authorizeService;
@@ -78,7 +78,7 @@ public class ResourcePolicyRestPermissionEvaluatorPlugin extends RestObjectPermi
                 return true;
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
 
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java
index dd464edfcd..e021344b15 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/RestAuthenticationService.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.security;
 
 import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.model.wrapper.AuthenticationToken;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.core.Context;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ShibbolethLoginFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ShibbolethLoginFilter.java
index e10fc49ecc..8867067132 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ShibbolethLoginFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/ShibbolethLoginFilter.java
@@ -9,11 +9,11 @@ package org.dspace.app.rest.security;
 
 import java.io.IOException;
 import java.util.ArrayList;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -56,9 +56,9 @@ public class ShibbolethLoginFilter extends StatelessLoginFilter {
 
     private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
 
-    public ShibbolethLoginFilter(String url, AuthenticationManager authenticationManager,
+    public ShibbolethLoginFilter(String url, String httpMethod, AuthenticationManager authenticationManager,
                                  RestAuthenticationService restAuthenticationService) {
-        super(url, authenticationManager, restAuthenticationService);
+        super(url, httpMethod, authenticationManager, restAuthenticationService);
     }
 
     @Override
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessAuthenticationFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessAuthenticationFilter.java
index 964d35f42c..6e151654b5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessAuthenticationFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessAuthenticationFilter.java
@@ -11,11 +11,13 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
@@ -28,8 +30,6 @@ import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.util.UUIDUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
@@ -47,21 +47,24 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationFi
  */
 public class StatelessAuthenticationFilter extends BasicAuthenticationFilter {
 
-    private static final Logger log = LoggerFactory.getLogger(StatelessAuthenticationFilter.class);
+    private static final Logger log = LogManager.getLogger();
 
     private static final String ON_BEHALF_OF_REQUEST_PARAM = "X-On-Behalf-Of";
 
-    private RestAuthenticationService restAuthenticationService;
+    private final RestAuthenticationService restAuthenticationService;
 
-    private EPersonRestAuthenticationProvider authenticationProvider;
+    private final EPersonRestAuthenticationProvider authenticationProvider;
 
-    private RequestService requestService;
+    private final RequestService requestService;
 
-    private AuthorizeService authorizeService = AuthorizeServiceFactory.getInstance().getAuthorizeService();
+    private final AuthorizeService authorizeService
+            = AuthorizeServiceFactory.getInstance().getAuthorizeService();
 
-    private EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+    private final EPersonService ePersonService
+            = EPersonServiceFactory.getInstance().getEPersonService();
 
-    private ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
+    private final ConfigurationService configurationService
+            = DSpaceServicesFactory.getInstance().getConfigurationService();
 
     public StatelessAuthenticationFilter(AuthenticationManager authenticationManager,
                                          RestAuthenticationService restAuthenticationService,
@@ -104,7 +107,7 @@ public class StatelessAuthenticationFilter extends BasicAuthenticationFilter {
 
     /**
      * This method returns an Authentication object
-     * This Authentication object will be attempted to be for the eperson with the uuid in the parameter. Incase
+     * This Authentication object will be attempted to be for the eperson with the uuid in the parameter. In case
      * this is able to be done properly, we'll be returning the EPerson Authentication.
      * If the Authentication object returned is not null, we'll be logged in as this EPerson given through from the
      * request.
@@ -124,7 +127,7 @@ public class StatelessAuthenticationFilter extends BasicAuthenticationFilter {
             // parse the token.
             EPerson eperson = restAuthenticationService.getAuthenticatedEPerson(request, res, context);
             if (eperson != null) {
-                log.debug("Found authentication data in request for EPerson {}", eperson.getEmail());
+                log.debug("Found authentication data in request for EPerson {}", eperson::getEmail);
                 //Pass the eperson ID to the request service
                 requestService.setCurrentUserId(eperson.getID());
 
@@ -174,7 +177,7 @@ public class StatelessAuthenticationFilter extends BasicAuthenticationFilter {
             requestService.setCurrentUserId(epersonUuid);
             context.switchContextUser(onBehalfOfEPerson);
             log.debug("Found 'on-behalf-of' authentication data in request for EPerson {}",
-                      onBehalfOfEPerson.getEmail());
+                    onBehalfOfEPerson::getEmail);
             return new DSpaceAuthentication(onBehalfOfEPerson,
                                             authenticationProvider.getGrantedAuthorities(context));
         } else {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessLoginFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessLoginFilter.java
index c95fce71c4..cfae6bfcb4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessLoginFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/StatelessLoginFilter.java
@@ -8,13 +8,13 @@
 package org.dspace.app.rest.security;
 
 import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
@@ -23,7 +23,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 /**
  * This class will filter /api/authn/login requests to try and authenticate them. Keep in mind, this filter runs *after*
- * StatelessAuthenticationFilter (which looks for authentication data in the request itself). So, in some scenarios
+ * {@link StatelessAuthenticationFilter} (which looks for authentication data in the request itself). So, in some scenarios
  * (e.g. after a Shibboleth login) the StatelessAuthenticationFilter does the actual authentication, and this Filter
  * just ensures the auth token (JWT) is sent back in an Authorization header.
  *
@@ -31,7 +31,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
  * @author Tom Desair (tom dot desair at atmire dot com)
  */
 public class StatelessLoginFilter extends AbstractAuthenticationProcessingFilter {
-    private static final Logger log = LoggerFactory.getLogger(StatelessLoginFilter.class);
+    private static final Logger log = LogManager.getLogger();
 
     protected AuthenticationManager authenticationManager;
 
@@ -41,9 +41,20 @@ public class StatelessLoginFilter extends AbstractAuthenticationProcessingFilter
     public void afterPropertiesSet() {
     }
 
-    public StatelessLoginFilter(String url, AuthenticationManager authenticationManager,
+    /**
+     * Initialize a StatelessLoginFilter for the given URL and HTTP method. This login filter will ONLY attempt
+     * authentication for requests that match this URL and method. The URL & method are defined in the configuration
+     * in WebSecurityConfiguration.
+     * @see org.dspace.app.rest.security.WebSecurityConfiguration
+     * @param url URL path to attempt to authenticate (e.g. "/api/authn/login")
+     * @param httpMethod HTTP method to attempt to authentication (e.g. "POST")
+     * @param authenticationManager Spring Security AuthenticationManager to use for authentication
+     * @param restAuthenticationService DSpace RestAuthenticationService to use for authentication
+     */
+    public StatelessLoginFilter(String url, String httpMethod, AuthenticationManager authenticationManager,
                                 RestAuthenticationService restAuthenticationService) {
-        super(new AntPathRequestMatcher(url));
+        // NOTE: attemptAuthentication() below will only be triggered by requests that match both this URL and method
+        super(new AntPathRequestMatcher(url, httpMethod));
         this.authenticationManager = authenticationManager;
         this.restAuthenticationService = restAuthenticationService;
     }
@@ -97,7 +108,7 @@ public class StatelessLoginFilter extends AbstractAuthenticationProcessingFilter
                                             Authentication auth) throws IOException, ServletException {
 
         DSpaceAuthentication dSpaceAuthentication = (DSpaceAuthentication) auth;
-        log.debug("Authentication successful for EPerson {}", dSpaceAuthentication.getName());
+        log.debug("Authentication successful for EPerson {}", dSpaceAuthentication::getName);
         restAuthenticationService.addAuthenticationDataForUser(req, res, dSpaceAuthentication, false);
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java
index c93d966e73..dabb5a03b5 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SubscriptionRestPermissionEvaluatorPlugin.java
@@ -17,6 +17,8 @@ import java.sql.SQLException;
 import java.util.Objects;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.core.Context;
@@ -25,21 +27,19 @@ import org.dspace.eperson.Subscription;
 import org.dspace.eperson.service.SubscribeService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
  * {@link RestPermissionEvaluatorPlugin} class that evaluate READ, WRITE and DELETE permissions over a Subscription
- * 
+ *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
  */
 @Component
 public class SubscriptionRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(SubscriptionRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -76,7 +76,7 @@ public class SubscriptionRestPermissionEvaluatorPlugin extends RestObjectPermiss
             Subscription subscription = subscribeService.findById(context, Integer.parseInt(targetId.toString()));
             return Objects.nonNull(subscription) ? currentUser.equals(subscription.getEPerson()) : false;
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SuggestionRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SuggestionRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..b56c0cf896
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SuggestionRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,95 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.security;
+
+import static org.dspace.app.rest.security.DSpaceRestPermission.DELETE;
+import static org.dspace.app.rest.security.DSpaceRestPermission.READ;
+import static org.dspace.app.rest.security.DSpaceRestPermission.WRITE;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.model.SuggestionRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * An authenticated user is allowed to view a suggestion
+ * related to a Target object that he owns (as defined by "dspace.object.owner" metadata field)
+ * See {@link RestPermissionEvaluatorPlugin} for the inherited contract.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component
+public class SuggestionRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+            DSpaceRestPermission restPermission) {
+
+        if (!READ.equals(restPermission) && !WRITE.equals(restPermission) && !DELETE.equals(restPermission)) {
+            return false;
+        }
+
+        if (!StringUtils.equalsIgnoreCase(targetType, SuggestionRest.NAME)
+                && !StringUtils.startsWithIgnoreCase(targetType, SuggestionRest.NAME)) {
+            return false;
+        }
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+
+        EPerson currentUser = context.getCurrentUser();
+        if (currentUser == null) {
+            return false;
+        }
+
+        try {
+            String id = targetId.toString();
+            UUID uuid = null;
+            if (id.contains(":")) {
+                uuid = UUIDUtils.fromString(id.split(":", 3)[1]);
+            } else {
+                uuid = UUIDUtils.fromString(id);
+            }
+            if (uuid == null) {
+                return false;
+            }
+            Item item = itemService.find(context, uuid);
+            if (item != null) {
+                List<MetadataValue> mvalues = itemService.getMetadataByMetadataString(item, "dspace.object.owner");
+                if (mvalues != null) {
+                    for (MetadataValue mv : mvalues) {
+                        if (StringUtils.equals(mv.getAuthority(), currentUser.getID().toString())) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            return false;
+        }
+
+        return false;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SuggestionTargetRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SuggestionTargetRestPermissionEvaluatorPlugin.java
new file mode 100644
index 0000000000..3aa4a9fcf4
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/SuggestionTargetRestPermissionEvaluatorPlugin.java
@@ -0,0 +1,96 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.security;
+
+import static org.dspace.app.rest.security.DSpaceRestPermission.DELETE;
+import static org.dspace.app.rest.security.DSpaceRestPermission.READ;
+import static org.dspace.app.rest.security.DSpaceRestPermission.WRITE;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.model.SuggestionTargetRest;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.dspace.eperson.EPerson;
+import org.dspace.util.UUIDUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * An authenticated user is allowed to view a suggestion summary
+ * (SuggestionTarget) related to a Target object that they own
+ * (as defined by "dspace.object.owner" metadata field)
+ * See {@link RestPermissionEvaluatorPlugin} for the inherited contract.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+@Component
+public class SuggestionTargetRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    public boolean hasDSpacePermission(Authentication authentication, Serializable targetId, String targetType,
+            DSpaceRestPermission restPermission) {
+
+        if (!READ.equals(restPermission) && !WRITE.equals(restPermission) && !DELETE.equals(restPermission)) {
+            return false;
+        }
+
+        if (!StringUtils.equalsIgnoreCase(targetType, SuggestionTargetRest.NAME)
+                && !StringUtils.startsWithIgnoreCase(targetType, SuggestionTargetRest.NAME)) {
+            return false;
+        }
+
+        Context context = ContextUtil.obtainCurrentRequestContext();
+
+        EPerson currentUser = context.getCurrentUser();
+        if (currentUser == null) {
+            return false;
+        }
+
+        try {
+            String id = targetId.toString();
+            UUID uuid = null;
+            if (id.contains(":")) {
+                uuid = UUIDUtils.fromString(id.split(":", 2)[1]);
+            } else {
+                uuid = UUIDUtils.fromString(id);
+            }
+            if (uuid == null) {
+                return false;
+            }
+            Item item = itemService.find(context, uuid);
+            if (item != null) {
+                List<MetadataValue> mvalues = itemService.getMetadataByMetadataString(item, "dspace.object.owner");
+                if (mvalues != null) {
+                    for (MetadataValue mv : mvalues) {
+                        if (StringUtils.equals(mv.getAuthority(), currentUser.getID().toString())) {
+                            return true;
+                        }
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            return false;
+        }
+
+        return false;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/TemplateItemRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/TemplateItemRestPermissionEvaluatorPlugin.java
index cb977dff3a..9416844cbc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/TemplateItemRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/TemplateItemRestPermissionEvaluatorPlugin.java
@@ -12,6 +12,8 @@ import java.sql.SQLException;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.TemplateItemRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -21,8 +23,6 @@ import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class TemplateItemRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(TemplateItemRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -76,7 +76,7 @@ public class TemplateItemRestPermissionEvaluatorPlugin extends RestObjectPermiss
                 return true;
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UsageReportRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UsageReportRestPermissionEvaluatorPlugin.java
index 06254d561a..c29abd2f1a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UsageReportRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/UsageReportRestPermissionEvaluatorPlugin.java
@@ -13,6 +13,8 @@ import java.util.Objects;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.UsageReportRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.app.rest.utils.DSpaceObjectUtils;
@@ -22,8 +24,6 @@ import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -36,7 +36,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class UsageReportRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(UsageReportRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private ConfigurationService configurationService;
@@ -95,7 +95,7 @@ public class UsageReportRestPermissionEvaluatorPlugin extends RestObjectPermissi
                 }
                 return authorizeService.authorizeActionBoolean(context, dso, restPermission.getDspaceApiActionId());
             } catch (SQLException e) {
-                log.error(e.getMessage(), e);
+                log.error(e::getMessage, e);
             }
         }
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionHistoryRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionHistoryRestPermissionEvaluatorPlugin.java
index d69f6a21ca..de5980e3c3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionHistoryRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionHistoryRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.VersionHistoryRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -18,8 +20,6 @@ import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -31,7 +31,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class VersionHistoryRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(VersionHistoryRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -62,7 +62,7 @@ public class VersionHistoryRestPermissionEvaluatorPlugin extends RestObjectPermi
             }
             return true;
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPatchPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPatchPermissionEvaluatorPlugin.java
index 6cca749cd0..6f1b04b3fd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPatchPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPatchPermissionEvaluatorPlugin.java
@@ -6,11 +6,14 @@
  * http://www.dspace.org/license/
  */
 package org.dspace.app.rest.security;
+
 import java.io.Serializable;
 import java.sql.SQLException;
 import java.util.UUID;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -19,21 +22,19 @@ import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.service.VersioningService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
  * This class evaluate ADMIN permissions to patch operation over a Version.
- * 
+ *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
 @Component
 public class VersionRestPatchPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(VersionRestPatchPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -78,7 +79,7 @@ public class VersionRestPatchPermissionEvaluatorPlugin extends RestObjectPermiss
                 return true;
             }
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPermissionEvaluatorPlugin.java
index 0badd46e27..f882ce317d 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/VersionRestPermissionEvaluatorPlugin.java
@@ -12,6 +12,8 @@ import java.sql.SQLException;
 import java.util.Objects;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.VersionRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -21,20 +23,18 @@ import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.dspace.versioning.Version;
 import org.dspace.versioning.service.VersioningService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
  * This class acts as a PermissionEvaluator to decide whether a given request to a Versioning endpoint is allowed to
- * pass through or not
+ * pass through or not.
  */
 @Component
 public class VersionRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(VersionRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -77,7 +77,7 @@ public class VersionRestPermissionEvaluatorPlugin extends RestObjectPermissionEv
             }
 
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
index 7bd698a63a..af7116a2be 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityConfiguration.java
@@ -19,17 +19,17 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
-import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.ProviderManager;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler;
 import org.springframework.security.web.authentication.logout.LogoutFilter;
-import org.springframework.security.web.authentication.session.SessionAuthenticationStrategy;
 import org.springframework.security.web.csrf.CsrfTokenRepository;
+import org.springframework.security.web.csrf.CsrfTokenRequestAttributeHandler;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
 /**
@@ -41,8 +41,7 @@ import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 @EnableWebSecurity
 @Configuration
 @EnableConfigurationProperties(SecurityProperties.class)
-@EnableGlobalMethodSecurity(prePostEnabled = true)
-public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class WebSecurityConfiguration {
 
     public static final String ADMIN_GRANT = "ADMIN";
     public static final String AUTHENTICATED_GRANT = "AUTHENTICATED";
@@ -69,101 +68,105 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
     @Value("${management.endpoints.web.base-path:/actuator}")
     private String actuatorBasePath;
 
-    @Override
-    public void configure(WebSecurity webSecurity) throws Exception {
-        // Define URL patterns which Spring Security will ignore entirely.
-        webSecurity
-            .ignoring()
-                // These /login request types are purposefully unsecured, as they all throw errors.
-                .antMatchers(HttpMethod.GET, "/api/authn/login")
-                .antMatchers(HttpMethod.PUT, "/api/authn/login")
-                .antMatchers(HttpMethod.PATCH, "/api/authn/login")
-                .antMatchers(HttpMethod.DELETE, "/api/authn/login");
+    /**
+     * Create a Spring Security AuthenticationManager with our custom AuthenticationProvider
+     * @return AuthenticationManager
+     */
+    @Bean
+    public AuthenticationManager authenticationManager() {
+        ProviderManager manager = new ProviderManager(ePersonRestAuthenticationProvider);
+        return manager;
+
     }
 
+    /**
+     * Bean to customize security on specific endpoints
+     * @param http HttpSecurity
+     */
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        // Get the current AuthenticationManager (defined above) to apply filters below
+        AuthenticationManager authenticationManager = authenticationManager();
 
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
         // Configure authentication requirements for ${dspace.server.url}/api/ URL only
         // NOTE: REST API is hardcoded to respond on /api/. Other modules (OAI, SWORD, IIIF, etc) use other root paths.
-        http.requestMatchers()
-            .antMatchers("/api/**", "/iiif/**", actuatorBasePath + "/**", "/signposting/**")
-            .and()
-            // Enable Spring Security authorization on these paths
-            .authorizeRequests()
-                // Allow POST by anyone on the login endpoint
-                .antMatchers(HttpMethod.POST,"/api/authn/login").permitAll()
-                // Everyone can call GET on the status endpoint (used to check your authentication status)
-                .antMatchers(HttpMethod.GET, "/api/authn/status").permitAll()
-                .antMatchers(HttpMethod.GET, actuatorBasePath + "/info").hasAnyAuthority(ADMIN_GRANT)
-            .and()
+        http.securityMatcher("/api/**", "/iiif/**", actuatorBasePath + "/**", "/signposting/**")
+            .authorizeHttpRequests((requests) -> requests
+                // Ensure /actuator/info endpoint is restricted to admins
+                .requestMatchers(new AntPathRequestMatcher(actuatorBasePath + "/info", HttpMethod.GET.name()))
+                    .hasAnyAuthority(ADMIN_GRANT)
+                // All other requests should be permitted at this layer because we check permissions on each method
+                // via @PreAuthorize annotations. As this code runs first, we must permitAll() here in order to pass
+                // the request on to those annotations.
+                .anyRequest().permitAll())
             // Tell Spring to not create Sessions
-            .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
+            .sessionManagement((session) -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
             // Anonymous requests should have the "ANONYMOUS" security grant
-            .anonymous().authorities(ANONYMOUS_GRANT).and()
+            .anonymous((anonymous) -> anonymous.authorities(ANONYMOUS_GRANT))
             // Wire up the HttpServletRequest with the current SecurityContext values
-            .servletApi().and()
+            .servletApi(Customizer.withDefaults())
             // Enable CORS for Spring Security (see CORS settings in Application and ApplicationConfig)
-            .cors().and()
+            .cors(Customizer.withDefaults())
             // Enable CSRF protection with custom csrfTokenRepository and custom sessionAuthenticationStrategy
             // (both are defined below as methods).
             // While we primarily use JWT in headers, CSRF protection is needed because we also support JWT via Cookies
-            .csrf()
+            .csrf((csrf) -> csrf
                 .csrfTokenRepository(this.csrfTokenRepository())
-                .sessionAuthenticationStrategy(this.sessionAuthenticationStrategy())
-            .and()
-            .exceptionHandling()
+                .sessionAuthenticationStrategy(this.dSpaceCsrfAuthenticationStrategy())
+                // Disable SpringSecurity BREACH protection, as this is not working well with Cookie-based storage.
+                // When enabled, BREACH protection causes the CSRF token to grow in size until UI errors occur.
+                // See https://github.com/DSpace/DSpace/issues/9450
+                // NOTE: DSpace doesn't need BREACH protection as it's only necessary when sending the token via a
+                // request attribute (e.g. "_csrf") which the DSpace UI never does.
+                .csrfTokenRequestHandler(new CsrfTokenRequestAttributeHandler()))
+            .exceptionHandling((exceptionHandling) -> exceptionHandling
                 // Return 401 on authorization failures with a correct WWWW-Authenticate header
                 .authenticationEntryPoint(new DSpace401AuthenticationEntryPoint(restAuthenticationService))
                 // Custom handler for AccessDeniedExceptions, including CSRF exceptions
                 .accessDeniedHandler(accessDeniedHandler)
-            .and()
-
+            )
             // Logout configuration
-            .logout()
+            .logout((logout) -> logout
                 // On logout, clear the "session" salt
                 .addLogoutHandler(customLogoutHandler)
                 // Configure the logout entry point & require POST
                 .logoutRequestMatcher(new AntPathRequestMatcher("/api/authn/logout", HttpMethod.POST.name()))
                 // When logout is successful, return OK (204) status
                 .logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler(HttpStatus.NO_CONTENT))
-                // Everyone can call this endpoint
-                .permitAll()
-            .and()
-
+            )
             // Add a filter before any request to handle DSpace IP-based authorization/authentication
             // (e.g. anonymous users may be added to special DSpace groups if they are in a given IP range)
-            .addFilterBefore(new AnonymousAdditionalAuthorizationFilter(authenticationManager(), authenticationService),
+            .addFilterBefore(new AnonymousAdditionalAuthorizationFilter(authenticationManager, authenticationService),
                              StatelessAuthenticationFilter.class)
-            // Add a filter before our login endpoints to do the authentication based on the data in the HTTP request
-            .addFilterBefore(new StatelessLoginFilter("/api/authn/login", authenticationManager(),
-                                                      restAuthenticationService),
+            // Add a filter before our login endpoints to do the authentication based on the data in the HTTP request.
+            // This login endpoint only responds to POST as it is used for PasswordAuthentication
+            .addFilterBefore(new StatelessLoginFilter("/api/authn/login", HttpMethod.POST.name(),
+                                                      authenticationManager, restAuthenticationService),
                              LogoutFilter.class)
-            // Add a filter before our shibboleth endpoints to do the authentication based on the data in the
-            // HTTP request
-            .addFilterBefore(new ShibbolethLoginFilter("/api/authn/shibboleth", authenticationManager(),
-                                                       restAuthenticationService),
+            // Add a filter before our shibboleth endpoints to do the authentication based on the data in the HTTP
+            // request. This endpoint only responds to GET as the actual authentication is performed by Shibboleth,
+            // which then redirects to this endpoint to forward the authentication data to DSpace.
+            .addFilterBefore(new ShibbolethLoginFilter("/api/authn/shibboleth", HttpMethod.GET.name(),
+                                                       authenticationManager, restAuthenticationService),
                              LogoutFilter.class)
-            //Add a filter before our ORCID endpoints to do the authentication based on the data in the
-            // HTTP request
-            .addFilterBefore(new OrcidLoginFilter("/api/authn/orcid", authenticationManager(),
-                                                       restAuthenticationService),
+            // Add a filter before our ORCID endpoints to do the authentication based on the data in the HTTP request.
+            // This endpoint only responds to GET as the actual authentication is performed by ORCID, which then
+            // redirects to this endpoint to forward the authentication data to DSpace.
+            .addFilterBefore(new OrcidLoginFilter("/api/authn/orcid", HttpMethod.GET.name(),
+                                                  authenticationManager, restAuthenticationService),
                              LogoutFilter.class)
-            //Add a filter before our OIDC endpoints to do the authentication based on the data in the
-            // HTTP request
-            .addFilterBefore(new OidcLoginFilter("/api/authn/oidc", authenticationManager(),
-                                                      restAuthenticationService),
+            // Add a filter before our OIDC endpoints to do the authentication based on the data in the HTTP request.
+            // This endpoint only responds to GET as the actual authentication is performed by OIDC, which then
+            // redirects to this endpoint to forward the authentication data to DSpace.
+            .addFilterBefore(new OidcLoginFilter("/api/authn/oidc", HttpMethod.GET.name(),
+                                                 authenticationManager, restAuthenticationService),
                              LogoutFilter.class)
             // Add a custom Token based authentication filter based on the token previously given to the client
             // before each URL
-            .addFilterBefore(new StatelessAuthenticationFilter(authenticationManager(), restAuthenticationService,
+            .addFilterBefore(new StatelessAuthenticationFilter(authenticationManager, restAuthenticationService,
                                                                ePersonRestAuthenticationProvider, requestService),
                              StatelessLoginFilter.class);
-    }
-
-    @Override
-    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
-        auth.authenticationProvider(ePersonRestAuthenticationProvider);
+        return http.build();
     }
 
     /**
@@ -189,8 +192,13 @@ public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
     /**
      * Returns a custom DSpaceCsrfAuthenticationStrategy, which ensures that (after authenticating) the CSRF token
      * is only refreshed when it is used (or attempted to be used) by the client.
+     *
+     * This is defined as a bean so that it can also be used in other code to reset CSRF Tokens, see
+     * JWTTokenRestAuthenticationServiceImpl
      */
-    private SessionAuthenticationStrategy sessionAuthenticationStrategy() {
+    @Lazy
+    @Bean
+    public DSpaceCsrfAuthenticationStrategy dSpaceCsrfAuthenticationStrategy() {
         return new DSpaceCsrfAuthenticationStrategy(csrfTokenRepository());
     }
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityExpressionEvaluator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityExpressionEvaluator.java
index 364e93e297..35772e41fd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityExpressionEvaluator.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WebSecurityExpressionEvaluator.java
@@ -8,10 +8,10 @@
 package org.dspace.app.rest.security;
 
 import java.util.List;
-import javax.servlet.FilterChain;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java
index 626290fdc3..b59dbdc2f8 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkflowRestPermissionEvaluatorPlugin.java
@@ -12,6 +12,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.WorkflowItemRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.AuthorizeException;
@@ -25,8 +27,6 @@ import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.dspace.xmlworkflow.storedcomponents.service.ClaimedTaskService;
 import org.dspace.xmlworkflow.storedcomponents.service.PoolTaskService;
 import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
@@ -34,13 +34,13 @@ import org.springframework.stereotype.Component;
 /**
  * An authenticated user is allowed to interact with workflow item only if they belong to a task that they own or could
  * claim.
- * 
+ *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  */
 @Component
 public class WorkflowRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(WorkflowRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -99,7 +99,7 @@ public class WorkflowRestPermissionEvaluatorPlugin extends RestObjectPermissionE
             }
 
         } catch (SQLException | AuthorizeException | IOException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
         return false;
     }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java
index c0efbd60f2..ba4387835e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/WorkspaceItemRestPermissionEvaluatorPlugin.java
@@ -11,6 +11,8 @@ import java.io.Serializable;
 import java.sql.SQLException;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.WorkspaceItemRest;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authorize.service.AuthorizeService;
@@ -21,21 +23,19 @@ import org.dspace.eperson.EPerson;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
 import org.dspace.supervision.service.SupervisionOrderService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Component;
 
 /**
- * {@link RestPermissionEvaluatorPlugin} class that evaluate READ, WRITE and DELETE permissions over a WorkspaceItem
- * 
+ * {@link RestPermissionEvaluatorPlugin} class that evaluate READ, WRITE and DELETE permissions over a WorkspaceItem.
+ *
  * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.it)
  */
 @Component
 public class WorkspaceItemRestPermissionEvaluatorPlugin extends RestObjectPermissionEvaluatorPlugin {
 
-    private static final Logger log = LoggerFactory.getLogger(WorkspaceItemRestPermissionEvaluatorPlugin.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private RequestService requestService;
@@ -100,7 +100,7 @@ public class WorkspaceItemRestPermissionEvaluatorPlugin extends RestObjectPermis
             }
 
         } catch (SQLException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
 
         return false;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/AuthenticationMethodClaimProvider.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/AuthenticationMethodClaimProvider.java
index 84b8259dce..6e1469fa91 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/AuthenticationMethodClaimProvider.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/AuthenticationMethodClaimProvider.java
@@ -9,13 +9,13 @@ package org.dspace.app.rest.security.jwt;
 
 import java.sql.SQLException;
 import java.text.ParseException;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.core.Context;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -27,15 +27,17 @@ public class AuthenticationMethodClaimProvider implements JWTClaimProvider {
 
     public static final String AUTHENTICATION_METHOD = "authenticationMethod";
 
-    private static final Logger log = LoggerFactory.getLogger(AuthenticationMethodClaimProvider.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private AuthenticationService authenticationService;
 
+    @Override
     public String getKey() {
         return AUTHENTICATION_METHOD;
     }
 
+    @Override
     public Object getValue(final Context context, final HttpServletRequest request) {
         if (context.getAuthenticationMethod() != null) {
             return context.getAuthenticationMethod();
@@ -43,12 +45,13 @@ public class AuthenticationMethodClaimProvider implements JWTClaimProvider {
         return authenticationService.getAuthenticationMethod(context, request);
     }
 
+    @Override
     public void parseClaim(final Context context, final HttpServletRequest request, final JWTClaimsSet jwtClaimsSet)
             throws SQLException {
         try {
             context.setAuthenticationMethod(jwtClaimsSet.getStringClaim(AUTHENTICATION_METHOD));
         } catch (ParseException e) {
-            log.error(e.getMessage(), e);
+            log.error(e::getMessage, e);
         }
     }
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/EPersonClaimProvider.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/EPersonClaimProvider.java
index 39b61427b7..9a9142fbd1 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/EPersonClaimProvider.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/EPersonClaimProvider.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.security.jwt;
 
 import java.sql.SQLException;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTClaimProvider.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTClaimProvider.java
index f8ee6a44de..64df3b20ea 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTClaimProvider.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTClaimProvider.java
@@ -8,9 +8,9 @@
 package org.dspace.app.rest.security.jwt;
 
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 
 /**
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenHandler.java
index 6beab1aa85..727267744f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenHandler.java
@@ -11,7 +11,6 @@ import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.Date;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jose.CompressionAlgorithm;
 import com.nimbusds.jose.EncryptionMethod;
@@ -31,16 +30,17 @@ import com.nimbusds.jose.crypto.MACVerifier;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 import com.nimbusds.jwt.util.DateUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authorize.AuthorizeException;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
 import org.dspace.service.ClientInfoService;
 import org.dspace.services.ConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.crypto.keygen.BytesKeyGenerator;
@@ -59,7 +59,7 @@ public abstract class JWTTokenHandler {
     private static final int MAX_CLOCK_SKEW_SECONDS = 60;
     private static final String AUTHORIZATION_TOKEN_PARAMETER = "authentication-token";
 
-    private static final Logger log = LoggerFactory.getLogger(JWTTokenHandler.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private List<JWTClaimProvider> jwtClaimProviders;
@@ -135,7 +135,7 @@ public abstract class JWTTokenHandler {
         // As long as the JWT is valid, parse all claims and return the EPerson
         if (isValidToken(request, signedJWT, jwtClaimsSet, ePerson)) {
 
-            log.debug("Received valid token for username: " + ePerson.getEmail());
+            log.debug("Received valid token for username: {}", ePerson::getEmail);
 
             for (JWTClaimProvider jwtClaimProvider : jwtClaimProviders) {
                 jwtClaimProvider.parseClaim(context, request, jwtClaimsSet);
@@ -143,7 +143,7 @@ public abstract class JWTTokenHandler {
 
             return ePerson;
         } else {
-            log.warn(getIpAddress(request) + " tried to use an expired or non-valid token");
+            log.warn("{} tried to use an expired or non-valid token", getIpAddress(request));
             return null;
         }
     }
@@ -155,7 +155,8 @@ public abstract class JWTTokenHandler {
      * @param request current Request
      * @param previousLoginDate date of last login (before this one)
      * @return string version of signed JWT
-     * @throws JOSEException
+     * @throws JOSEException passed through.
+     * @throws SQLException passed through.
      */
     public String createTokenForEPerson(Context context, HttpServletRequest request, Date previousLoginDate)
         throws JOSEException, SQLException {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java
index c28729ff83..a2928fc96f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/JWTTokenRestAuthenticationServiceImpl.java
@@ -11,15 +11,18 @@ import java.io.IOException;
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.Iterator;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ws.rs.core.HttpHeaders;
 
 import com.nimbusds.jose.JOSEException;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.ws.rs.core.HttpHeaders;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.model.wrapper.AuthenticationToken;
 import org.dspace.app.rest.security.DSpaceAuthentication;
+import org.dspace.app.rest.security.DSpaceCsrfAuthenticationStrategy;
 import org.dspace.app.rest.security.RestAuthenticationService;
 import org.dspace.app.rest.utils.ContextUtil;
 import org.dspace.authenticate.AuthenticationMethod;
@@ -27,14 +30,10 @@ import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.ResponseCookie;
-import org.springframework.security.web.csrf.CsrfToken;
-import org.springframework.security.web.csrf.CsrfTokenRepository;
 import org.springframework.stereotype.Component;
 
 /**
@@ -47,7 +46,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class JWTTokenRestAuthenticationServiceImpl implements RestAuthenticationService, InitializingBean {
 
-    private static final Logger log = LoggerFactory.getLogger(RestAuthenticationService.class);
+    private static final Logger log = LogManager.getLogger();
     private static final String AUTHORIZATION_COOKIE = "Authorization-cookie";
     private static final String AUTHORIZATION_HEADER = "Authorization";
     private static final String AUTHORIZATION_TYPE = "Bearer";
@@ -67,7 +66,7 @@ public class JWTTokenRestAuthenticationServiceImpl implements RestAuthentication
 
     @Lazy
     @Autowired
-    private CsrfTokenRepository csrfTokenRepository;
+    private DSpaceCsrfAuthenticationStrategy dspaceCsrfAuthenticationStrategy;
 
     @Override
     public void afterPropertiesSet() throws Exception {
@@ -332,11 +331,8 @@ public class JWTTokenRestAuthenticationServiceImpl implements RestAuthentication
      * @param response current response
      */
     private void resetCSRFToken(HttpServletRequest request, HttpServletResponse response) {
-        // Remove current CSRF token & generate a new one
-        // We do this as we want the token to change anytime you login or logout
-        csrfTokenRepository.saveToken(null, request, response);
-        CsrfToken newToken = csrfTokenRepository.generateToken(request);
-        csrfTokenRepository.saveToken(newToken, request, response);
+        // Use our custom CsrfAuthenticationStrategy class to force reset the CSRF token in Spring Security
+        dspaceCsrfAuthenticationStrategy.resetCSRFToken(request, response);
     }
 
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandler.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandler.java
index fc4ab39407..ac7a73a796 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandler.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandler.java
@@ -8,7 +8,6 @@
 package org.dspace.app.rest.security.jwt;
 
 import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jose.JWSVerifier;
@@ -16,6 +15,7 @@ import com.nimbusds.jose.crypto.MACVerifier;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
 import com.nimbusds.jwt.util.DateUtils;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProvider.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProvider.java
index 2ce558133d..970bd812d3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProvider.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProvider.java
@@ -13,15 +13,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.authenticate.service.AuthenticationService;
 import org.dspace.core.Context;
 import org.dspace.eperson.Group;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -34,17 +34,19 @@ import org.springframework.stereotype.Component;
 @Component
 public class SpecialGroupClaimProvider implements JWTClaimProvider {
 
-    private static final Logger log = LoggerFactory.getLogger(SpecialGroupClaimProvider.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String SPECIAL_GROUPS = "sg";
 
     @Autowired
     private AuthenticationService authenticationService;
 
+    @Override
     public String getKey() {
         return SPECIAL_GROUPS;
     }
 
+    @Override
     public Object getValue(Context context, HttpServletRequest request) {
         List<Group> groups = new ArrayList<>();
         try {
@@ -57,6 +59,7 @@ public class SpecialGroupClaimProvider implements JWTClaimProvider {
         return groupIds;
     }
 
+    @Override
     public void parseClaim(Context context, HttpServletRequest request, JWTClaimsSet jwtClaimsSet) {
         try {
             List<String> groupIds = jwtClaimsSet.getStringListClaim(SPECIAL_GROUPS);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/package-info.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/package-info.java
new file mode 100644
index 0000000000..229a6d0c12
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/security/package-info.java
@@ -0,0 +1,35 @@
+/**
+ * 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/
+ */
+/**
+ * DSpace-specific concepts and behaviors to support Spring Security.
+ * These may be used by Spring EL expressions in Spring Security annotations.
+ *
+ * <p>{@code hasPermission} terms are evaluated by
+ * {@link DSpacePermissionEvaluator}, an implementation of Spring's
+ * {@link PermissionEvaluator}.  It tests access to specific model objects
+ * (Item, EPerson etc.) using those objects' policies.  It is injected with a
+ * collection of {@link RestPermissionEvaluatorPlugin}s which do the work.
+ *
+ * <p>{@code hasAuthority} terms are implemented by {@link GrantedAuthority}
+ * implementations such as {@link EPersonRestAuthenticationProvider}.  These
+ * test for authorization properties of the session itself, such as membership
+ * in the site administrators group.
+ *
+ * <p>{@code *PermissionEvaluatorPlugin} classes test permission for specific
+ * types of objects.  They implement {@link RestPermissionEvaluatorPlugin}.
+ *
+ * <p>Other classes TBD:
+ * <ul>
+ *   <li>*Filter</li>
+ *   <li>*Configuration</li>
+ * </ul>
+ */
+package org.dspace.app.rest.security;
+
+import org.springframework.security.access.PermissionEvaluator;
+import org.springframework.security.core.GrantedAuthority;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/controller/LinksetRestController.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/controller/LinksetRestController.java
index 2a940d79ab..b1731fb10b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/controller/LinksetRestController.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/controller/LinksetRestController.java
@@ -16,9 +16,9 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.signposting.converter.LinksetRestMessageConverter;
 import org.dspace.app.rest.signposting.model.Linkset;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/LinksetRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/LinksetRest.java
index df80cd5c2d..d1123f50f3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/LinksetRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/LinksetRest.java
@@ -49,6 +49,11 @@ public class LinksetRest extends RestAddressableModel {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/TypedLinkRest.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/TypedLinkRest.java
index 3ba09bf109..ce6668920a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/TypedLinkRest.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/model/TypedLinkRest.java
@@ -62,6 +62,11 @@ public class TypedLinkRest extends RestAddressableModel {
         return type;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     @Override
     public String getCategory() {
         return CATEGORY;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/SignPostingProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/SignPostingProcessor.java
index efcfd50ab5..a5cadf4627 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/SignPostingProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/SignPostingProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Context;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamLinksetProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamLinksetProcessor.java
index c65191cb07..97eb9f2a54 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamLinksetProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamLinksetProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.bitstream;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamParentItemProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamParentItemProcessor.java
index 815d7817d4..32928dfa88 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamParentItemProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamParentItemProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.bitstream;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamTypeProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamTypeProcessor.java
index 005a800983..8889a415d3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamTypeProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/bitstream/BitstreamTypeProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.bitstream;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemAuthorProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemAuthorProcessor.java
index 1bb215c468..f3a9e35198 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemAuthorProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemAuthorProcessor.java
@@ -14,8 +14,8 @@ import static org.dspace.content.Item.ANY;
 
 import java.text.MessageFormat;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemContentBitstreamsProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemContentBitstreamsProcessor.java
index 61bf371adb..0b91e57f7b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemContentBitstreamsProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemContentBitstreamsProcessor.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.signposting.processor.item;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemDescribedbyProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemDescribedbyProcessor.java
index a16770c4d1..20091e6d09 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemDescribedbyProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemDescribedbyProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.item;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemIdentifierProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemIdentifierProcessor.java
index c5ebe958d9..ba4794f378 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemIdentifierProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemIdentifierProcessor.java
@@ -12,8 +12,8 @@ import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 import java.text.MessageFormat;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLicenseProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLicenseProcessor.java
index 1a26fa7695..b60ee35d7f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLicenseProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLicenseProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.item;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLinksetProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLinksetProcessor.java
index 9008a28e29..2d09e56161 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLinksetProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemLinksetProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.item;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemTypeProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemTypeProcessor.java
index ddd2da12d5..49b3612cd9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemTypeProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/item/ItemTypeProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.item;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.signposting.model.LinksetNode;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/metadata/MetadataDescribesSignpostingProcessor.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/metadata/MetadataDescribesSignpostingProcessor.java
index baae16b883..8bf123dd04 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/metadata/MetadataDescribesSignpostingProcessor.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/processor/metadata/MetadataDescribesSignpostingProcessor.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.processor.metadata;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.app.rest.signposting.model.LinksetRelationType;
 import org.dspace.content.Item;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/LinksetService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/LinksetService.java
index 33d0c10b74..c6ad757e4e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/LinksetService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/LinksetService.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.signposting.service;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.signposting.model.LinksetNode;
 import org.dspace.content.DSpaceObject;
 import org.dspace.content.Item;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/impl/LinksetServiceImpl.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/impl/LinksetServiceImpl.java
index 399b7bd1e6..5b28817c94 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/impl/LinksetServiceImpl.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/signposting/service/impl/LinksetServiceImpl.java
@@ -11,8 +11,8 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.log4j.Logger;
 import org.dspace.app.rest.security.BitstreamMetadataReadPermissionEvaluatorPlugin;
 import org.dspace.app.rest.signposting.model.LinksetNode;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java
index 8c03f4ef82..bb8c7825e2 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/AbstractProcessingStep.java
@@ -7,6 +7,7 @@
  */
 package org.dspace.app.rest.submit;
 
+import org.dspace.app.rest.submit.factory.impl.NotifySubmissionService;
 import org.dspace.authorize.factory.AuthorizeServiceFactory;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.factory.ContentServiceFactory;
@@ -19,6 +20,7 @@ import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.WorkspaceItemService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.utils.DSpace;
 
 /**
  * Abstract processing class for DSpace Submission Steps. This retrieve several
@@ -35,4 +37,6 @@ public abstract class AbstractProcessingStep implements DataProcessingStep {
     protected MetadataFieldService metadataFieldService = ContentServiceFactory.getInstance().getMetadataFieldService();
     protected ConfigurationService configurationService = DSpaceServicesFactory.getInstance().getConfigurationService();
     protected WorkspaceItemService workspaceItemService = ContentServiceFactory.getInstance().getWorkspaceItemService();
+    protected NotifySubmissionService coarNotifySubmissionService = new DSpace().getServiceManager()
+        .getServiceByName("coarNotifySubmissionService", NotifySubmissionService.class);
 }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/DataProcessingStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/DataProcessingStep.java
index 99af309cdb..660d677cdd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/DataProcessingStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/DataProcessingStep.java
@@ -10,8 +10,8 @@ package org.dspace.app.rest.submit;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ErrorRest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.submit.step.validation.Validation;
@@ -39,8 +39,10 @@ public interface DataProcessingStep extends RestProcessingStep {
     public static final String ACCESS_CONDITION_STEP_OPERATION_ENTRY = "discoverable";
     public static final String ACCESS_CONDITION_POLICY_STEP_OPERATION_ENTRY = "accessConditions";
     public static final String SHOW_IDENTIFIERS_ENTRY = "identifiers";
+    public static final String PRIMARY_FLAG_ENTRY = "primary";
 
     public static final String UPLOAD_STEP_METADATA_PATH = "metadata";
+    public static final String COARNOTIFY_STEP_PATH = "coarnotify";
 
     /**
      * Method to expose data in the a dedicated section of the in progress submission. The step needs to return a
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/PatchConfigurationService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/PatchConfigurationService.java
index 186ebd6523..58e1fbe428 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/PatchConfigurationService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/PatchConfigurationService.java
@@ -12,7 +12,7 @@ import java.util.Map;
 import org.dspace.app.rest.submit.factory.impl.PatchOperation;
 
 /**
- * Class to mantain mapping configuration for PATCH operation needed by the Submission process
+ * Class to maintain mapping configuration for PATCH operation needed by the Submission process
  *
  * @author Luigi Andrea Pascarelli (luigiandrea.pascarelli at 4science.it)
  */
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java
index e3dbd566a8..66df73e7cd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/SubmissionService.java
@@ -10,13 +10,13 @@ package org.dspace.app.rest.submit;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.converter.ConverterService;
 import org.dspace.app.rest.exception.DSpaceBadRequestException;
 import org.dspace.app.rest.exception.RESTAuthorizationException;
@@ -27,9 +27,11 @@ import org.dspace.app.rest.model.BitstreamRest;
 import org.dspace.app.rest.model.CheckSumRest;
 import org.dspace.app.rest.model.ErrorRest;
 import org.dspace.app.rest.model.MetadataValueRest;
+import org.dspace.app.rest.model.PotentialDuplicateRest;
 import org.dspace.app.rest.model.WorkspaceItemRest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.model.step.DataCCLicense;
+import org.dspace.app.rest.model.step.DataDuplicateDetection;
 import org.dspace.app.rest.model.step.DataUpload;
 import org.dspace.app.rest.model.step.UploadBitstreamRest;
 import org.dspace.app.rest.projection.Projection;
@@ -48,11 +50,14 @@ import org.dspace.content.Item;
 import org.dspace.content.MetadataValue;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.DuplicateDetectionService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.content.virtual.PotentialDuplicate;
 import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.core.Utils;
+import org.dspace.discovery.SearchServiceException;
 import org.dspace.license.service.CreativeCommonsService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
@@ -65,6 +70,7 @@ import org.dspace.workflow.WorkflowService;
 import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.data.rest.webmvc.ResourceNotFoundException;
 import org.springframework.data.rest.webmvc.json.patch.PatchException;
 import org.springframework.jdbc.datasource.init.UncategorizedScriptException;
 import org.springframework.stereotype.Component;
@@ -102,6 +108,8 @@ public class SubmissionService {
     @Autowired
     private org.dspace.app.rest.utils.Utils utils;
     private SubmissionConfigService submissionConfigService;
+    @Autowired
+    private DuplicateDetectionService duplicateDetectionService;
 
     public SubmissionService() throws SubmissionConfigReaderException {
         submissionConfigService = SubmissionServiceFactory.getInstance().getSubmissionConfigService();
@@ -219,7 +227,7 @@ public class SubmissionService {
         data.setCheckSum(checksum);
         data.setSizeBytes(source.getSizeBytes());
         data.setUrl(configurationService.getProperty("dspace.server.url") + "/api/" + BitstreamRest.CATEGORY + "/" +
-                        English.plural(BitstreamRest.NAME) + "/" + source.getID() + "/content");
+                        BitstreamRest.PLURAL_NAME + "/" + source.getID() + "/content");
         return data;
     }
 
@@ -241,7 +249,7 @@ public class SubmissionService {
         if (StringUtils.isBlank(requestUriListString)) {
             throw new UnprocessableEntityException("Malformed body..." + requestUriListString);
         }
-        String regex = "\\/api\\/" + WorkspaceItemRest.CATEGORY + "\\/" + English.plural(WorkspaceItemRest.NAME)
+        String regex = "\\/api\\/" + WorkspaceItemRest.CATEGORY + "\\/" + WorkspaceItemRest.PLURAL_NAME
                 + "\\/";
         String[] split = requestUriListString.split(regex, 2);
         if (split.length != 2) {
@@ -314,6 +322,51 @@ public class SubmissionService {
         return result;
     }
 
+    /**
+     * Prepare section data containing a list of potential duplicates, for use in submission steps.
+     * This method belongs in SubmissionService and not DuplicateDetectionService because it depends on
+     * the DataDuplicateDetection class which only appears in the REST project.
+     *
+     * @param context DSpace context
+     * @param obj     The in-progress submission object
+     * @return        A DataDuplicateDetection object which implements SectionData for direct use in
+     *                a submission step (see DuplicateDetectionStep)
+     * @throws SearchServiceException if an error is encountered during Discovery search
+     */
+    public DataDuplicateDetection getDataDuplicateDetection(Context context, InProgressSubmission obj)
+            throws SearchServiceException {
+        // Test for a valid object or throw a not found exception
+        if (obj == null) {
+            throw new ResourceNotFoundException("Duplicate data step could not find valid in-progress submission obj");
+        }
+        // Initialise an empty section data object
+        DataDuplicateDetection data = new DataDuplicateDetection();
+
+        // Get the item for this submission object, throw a not found exception if null
+        Item item = obj.getItem();
+        if (item == null) {
+            throw new ResourceNotFoundException("Duplicate data step could not find valid item for the" +
+                    " current in-progress submission obj id=" + obj.getID());
+        }
+        // Initialise empty list of PotentialDuplicateRest objects for use in the section data object
+        List<PotentialDuplicateRest> potentialDuplicateRestList = new LinkedList<>();
+
+        // Get discovery search result for a duplicate detection search based on this item and populate
+        // the list of REST objects
+        List<PotentialDuplicate> potentialDuplicates = duplicateDetectionService.getPotentialDuplicates(context, item);
+        for (PotentialDuplicate potentialDuplicate : potentialDuplicates) {
+            // Convert and add the potential duplicate to the list
+            potentialDuplicateRestList.add(converter.toRest(
+                    potentialDuplicate, utils.obtainProjection()));
+        }
+
+        // Set the final duplicates list of the section data object
+        data.setPotentialDuplicates(potentialDuplicateRestList);
+
+        // Return section data
+        return data;
+    }
+
     /**
      * Utility method used by the {@link WorkspaceItemRestRepository} and
      * {@link WorkflowItemRestRepository} to deal with the upload in an inprogress
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionAddPatchOperation.java
index 750c50524d..ae8040136f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionAddPatchOperation.java
@@ -12,8 +12,8 @@ import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.AccessConditionDTO;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionDiscoverableReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionDiscoverableReplacePatchOperation.java
index bcc0dce65f..188a5e8dbe 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionDiscoverableReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionDiscoverableReplacePatchOperation.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.BooleanUtils;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.content.InProgressSubmission;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionRemovePatchOperation.java
index 61ed7e28c9..894a8234dc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionRemovePatchOperation.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.AccessConditionDTO;
 import org.dspace.authorize.ResourcePolicy;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionReplacePatchOperation.java
index d2529cbca3..ff34559a90 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AccessConditionReplacePatchOperation.java
@@ -14,9 +14,11 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.AccessConditionDTO;
 import org.dspace.app.rest.model.patch.JsonValueEvaluator;
@@ -31,8 +33,6 @@ import org.dspace.submit.model.AccessConditionConfiguration;
 import org.dspace.submit.model.AccessConditionConfigurationService;
 import org.dspace.submit.model.AccessConditionOption;
 import org.dspace.util.TimeHelpers;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -42,7 +42,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class AccessConditionReplacePatchOperation extends ReplacePatchOperation<AccessConditionDTO> {
 
-    private static final Logger log = LoggerFactory.getLogger(AccessConditionReplacePatchOperation.class);
+    private static final Logger log = LogManager.getLogger();
 
     @Autowired
     private ResourcePolicyService resourcePolicyService;
@@ -157,7 +157,7 @@ public class AccessConditionReplacePatchOperation extends ReplacePatchOperation<
             try {
                 return pattern.parse(date);
             } catch (ParseException e) {
-                log.error(e.getMessage(), e);
+                log.error(e::getMessage, e);
             }
         }
         throw new UnprocessableEntityException("Provided format of date:" + date + " is not supported!");
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AddPatchOperation.java
index 354208c3e5..d903325eda 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/AddPatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.core.Context;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueAddPatchOperation.java
index 38ec37e7d7..ad3fd06dbb 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueAddPatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.MetadataValueRest;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
 import org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils;
@@ -48,12 +48,13 @@ public class BitstreamMetadataValueAddPatchOperation extends MetadataValueAddPat
             throws Exception {
         //"path": "/sections/upload/files/0/metadata/dc.title/2"
         //"abspath": "/files/0/metadata/dc.title/2"
+        String stepId = getStepId(path);
         String absolutePath = getAbsolutePath(path);
         String[] split = absolutePath.split("/");
-        bitstreamMetadataValuePathUtils.validate(absolutePath);
+        bitstreamMetadataValuePathUtils.validate(stepId, absolutePath);
         Item item = source.getItem();
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
-        ;
+
         for (Bundle bb : bundle) {
             int idx = 0;
             for (Bitstream b : bb.getBitstreams()) {
@@ -67,10 +68,11 @@ public class BitstreamMetadataValueAddPatchOperation extends MetadataValueAddPat
                         // call with "-" or "index-based" we should receive only single
                         // object member
                         MetadataValueRest object = evaluateSingleObject((LateObjectEvaluator) value);
+                        String mdString = split[3];
                         // check if is not empty
                         List<MetadataValue> metadataByMetadataString =
-                            bitstreamService.getMetadataByMetadataString(b,split[3]);
-                        Assert.notEmpty(metadataByMetadataString);
+                            bitstreamService.getMetadataByMetadataString(b,mdString);
+                        Assert.notEmpty(metadataByMetadataString, "No metadata fields match ".concat(mdString));
                         if (split.length > 4) {
                             String controlChar = split[4];
                             switch (controlChar) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueMovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueMovePatchOperation.java
index 2726363b4c..9db1ab105b 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueMovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueMovePatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
@@ -44,9 +44,10 @@ public class BitstreamMetadataValueMovePatchOperation extends MetadataValueMoveP
             throws Exception {
         //"path": "/sections/upload/files/0/metadata/dc.title/2"
         //"abspath": "/files/0/metadata/dc.title/2"
+        String stepId = getStepId(path);
         String absolutePath = getAbsolutePath(path);
         String[] splitTo = absolutePath.split("/");
-        bitstreamMetadataValuePathUtils.validate(absolutePath);
+        bitstreamMetadataValuePathUtils.validate(stepId, absolutePath);
         Item item = source.getItem();
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
         for (Bundle bb : bundle) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java
index 6bbb7bb032..65a9626262 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueRemovePatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
@@ -44,9 +44,10 @@ public class BitstreamMetadataValueRemovePatchOperation extends MetadataValueRem
             Object value) throws Exception {
         //"path": "/sections/upload/files/0/metadata/dc.title/2"
         //"abspath": "/files/0/metadata/dc.title/2"
+        String stepId = getStepId(path);
         String absolutePath = getAbsolutePath(path);
         String[] split = absolutePath.split("/");
-        bitstreamMetadataValuePathUtils.validate(absolutePath);
+        bitstreamMetadataValuePathUtils.validate(stepId, absolutePath);
         Item item = source.getItem();
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
 
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueReplacePatchOperation.java
index 842771538c..eefecf9d56 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMetadataValueReplacePatchOperation.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.submit.factory.impl;
 
 import java.sql.SQLException;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.MetadataValueRest;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
 import org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils;
@@ -47,9 +47,10 @@ public class BitstreamMetadataValueReplacePatchOperation extends MetadataValueRe
             Object value) throws Exception {
         //"path": "/sections/upload/files/0/metadata/dc.title/2"
         //"abspath": "/files/0/metadata/dc.title/2"
+        String stepId = getStepId(path);
         String absolutePath = getAbsolutePath(path);
         String[] split = absolutePath.split("/");
-        bitstreamMetadataValuePathUtils.validate(absolutePath);
+        bitstreamMetadataValuePathUtils.validate(stepId, absolutePath);
         Item item = source.getItem();
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
         for (Bundle bb : bundle) {
@@ -67,7 +68,7 @@ public class BitstreamMetadataValueReplacePatchOperation extends MetadataValueRe
         throws SQLException, IllegalArgumentException, IllegalAccessException {
         String mdString = split[3];
         List<MetadataValue> metadataByMetadataString = bitstreamService.getMetadataByMetadataString(b, mdString);
-        Assert.notEmpty(metadataByMetadataString);
+        Assert.notEmpty(metadataByMetadataString, "No metadata fields match ".concat(mdString));
 
         int index = Integer.parseInt(split[4]);
         // if split size is one so we have a call to initialize or replace
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMovePatchOperation.java
index 27d01a8581..5b6842b8e7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamMovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.service.BundleService;
 import org.dspace.content.service.ItemService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamRemovePatchOperation.java
index 7068349300..ec9d178f14 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamRemovePatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
 import org.dspace.content.InProgressSubmission;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java
index 5e6274d78f..2d06b66ff7 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyAddPatchOperation.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.collections.CollectionUtils;
 import org.dspace.app.rest.model.AccessConditionDTO;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
@@ -54,7 +54,7 @@ public class BitstreamResourcePolicyAddPatchOperation extends AddPatchOperation<
         Item item = source.getItem();
 
         List<Bundle> bundle = itemService.getBundles(item, Constants.CONTENT_BUNDLE_NAME);
-        ;
+
         UploadConfiguration uploadConfig = uploadConfigurationService.getMap().get(splitPath[2]);
         for (Bundle bb : bundle) {
             int idx = 0;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java
index e936b0b0c7..986d6062bc 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyRemovePatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.AccessConditionDTO;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.authorize.service.ResourcePolicyService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java
index 19acc7b9f2..565287e945 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/BitstreamResourcePolicyReplacePatchOperation.java
@@ -11,8 +11,8 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.ResourcePolicyRest;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
 import org.dspace.authorize.ResourcePolicy;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java
index 602ae5e969..dace7c99ed 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseAddPatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
@@ -26,7 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * Example: <code>
  * curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type:
  * application/json" -d '[{ "op": "add", "path": "/sections/cclicense/uri",
- * "value":"https://creativecommons.org/licenses/by-nc-sa/3.0/us/"}]'
+ * "value":"https://creativecommons.org/licenses/by-nc-sa/4.0/us/"}]'
  * </code>
  */
 public class CCLicenseAddPatchOperation extends AddPatchOperation<String> {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseRemovePatchOperation.java
index b17749fe4e..57d9b60e31 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CCLicenseRemovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CollectionReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CollectionReplacePatchOperation.java
index 3cadb443d9..a26982c377 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CollectionReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/CollectionReplacePatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.sql.SQLException;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.util.DCInputsReaderException;
 import org.dspace.content.Collection;
 import org.dspace.content.InProgressSubmission;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueAddPatchOperation.java
index e749c4e793..8ab9bb4516 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueAddPatchOperation.java
@@ -12,8 +12,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
@@ -103,10 +103,11 @@ public class ItemMetadataValueAddPatchOperation extends MetadataValueAddPatchOpe
             // call with "-" or "index-based" we should receive only single
             // object member
             MetadataValueRest object = evaluateSingleObject((LateObjectEvaluator) value);
+            String mdString = split[0];
             // check if is not empty
             List<MetadataValue> metadataByMetadataString = itemService.getMetadataByMetadataString(source.getItem(),
-                                                                                                   split[0]);
-            Assert.notEmpty(metadataByMetadataString);
+                                                                                                   mdString);
+            Assert.notEmpty(metadataByMetadataString, "No metadata fields match ".concat(mdString));
             if (split.length > 1) {
                 String controlChar = split[1];
                 switch (controlChar) {
@@ -213,7 +214,7 @@ public class ItemMetadataValueAddPatchOperation extends MetadataValueAddPatchOpe
     private void updateRelationshipPlace(Context context, Item dso, int place, Relationship rs) {
 
         try {
-            if (rs.getLeftItem() == dso) {
+            if (rs.getLeftItem().equals(dso)) {
                 rs.setLeftPlace(place);
             } else {
                 rs.setRightPlace(place);
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueMovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueMovePatchOperation.java
index 17712f7148..d38a534642 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueMovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueMovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java
index 95206bc5ca..cf62f641b9 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueRemovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueReplacePatchOperation.java
index 148984cbfd..415c5b6712 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ItemMetadataValueReplacePatchOperation.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.MetadataValueRest;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
 import org.dspace.content.InProgressSubmission;
@@ -53,10 +53,10 @@ public class ItemMetadataValueReplacePatchOperation extends MetadataValueReplace
     void replace(Context context, HttpServletRequest currentRequest, InProgressSubmission source, String path,
             Object value) throws Exception {
         String[] split = getAbsolutePath(path).split("/");
-
+        String mdString = split[0];
         List<MetadataValue> metadataByMetadataString = itemService.getMetadataByMetadataString(source.getItem(),
-                                                                                               split[0]);
-        Assert.notEmpty(metadataByMetadataString);
+                                                                                               mdString);
+        Assert.notEmpty(metadataByMetadataString, "No metadata fields match ".concat(mdString));
 
         int index = Integer.parseInt(split[1]);
         // if split size is one so we have a call to initialize or replace
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseAddPatchOperation.java
index 6bbd4aae75..bae4056529 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseAddPatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseAddPatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.BooleanUtils;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseRemovePatchOperation.java
index 39ffdbbd67..75c244bf9c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseRemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseRemovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
 import org.dspace.content.service.ItemService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseReplacePatchOperation.java
index bdb3051010..699b27ab0e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/LicenseReplacePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.BooleanUtils;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.content.Item;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MovePatchOperation.java
index 750a2bc71b..fc6bc2736e 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/MovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.MoveOperation;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.content.InProgressSubmission;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceAddPatchOperation.java
new file mode 100644
index 0000000000..ff63fc49fb
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceAddPatchOperation.java
@@ -0,0 +1,107 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import java.sql.SQLException;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.patch.LateObjectEvaluator;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.utils.DSpace;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Submission "add" PATCH operation
+ *
+ * To add the COAR Notify Service of workspace item.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type:
+ * application/json" -d '[{ "op": "add", "path": "/sections/coarnotify/review/-"}, "value": ["1","2"]'
+ * </code>
+ */
+public class NotifyServiceAddPatchOperation extends AddPatchOperation<Integer> {
+
+    @Autowired
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private NotifySubmissionService coarNotifySubmissionService = new DSpace().getServiceManager()
+        .getServiceByName("coarNotifySubmissionService", NotifySubmissionService.class);
+
+    @Override
+    protected Class<Integer[]> getArrayClassForEvaluation() {
+        return Integer[].class;
+    }
+
+    @Override
+    protected Class<Integer> getClassForEvaluation() {
+        return Integer.class;
+    }
+
+    @Override
+    void add(Context context, HttpServletRequest currentRequest, InProgressSubmission source, String path,
+            Object value) throws Exception {
+
+        String pattern = coarNotifySubmissionService.extractPattern(path);
+        Set<Integer> servicesIds = new LinkedHashSet<>(evaluateArrayObject((LateObjectEvaluator) value));
+
+        coarNotifySubmissionService.checkCompatibilityWithPattern(context, pattern, servicesIds);
+
+        List<NotifyServiceEntity> services =
+            servicesIds.stream()
+                       .map(id ->
+                           findService(context, id))
+                       .collect(Collectors.toList());
+        if (services.isEmpty()) {
+            createNotifyPattern(context, source.getItem(), null, pattern);
+        } else {
+            services.forEach(service ->
+                createNotifyPattern(context, source.getItem(), service, pattern));
+        }
+    }
+
+    private NotifyServiceEntity findService(Context context, int serviceId) {
+        try {
+            NotifyServiceEntity service = notifyService.find(context, serviceId);
+            if (service == null) {
+                throw new UnprocessableEntityException("no service found for the provided value: " + serviceId + "");
+            }
+            return service;
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private void createNotifyPattern(Context context, Item item, NotifyServiceEntity service, String pattern) {
+        try {
+            NotifyPatternToTrigger notifyPatternToTrigger = notifyPatternToTriggerService.create(context);
+            notifyPatternToTrigger.setItem(item);
+            notifyPatternToTrigger.setNotifyService(service);
+            notifyPatternToTrigger.setPattern(pattern);
+            notifyPatternToTriggerService.update(context, notifyPatternToTrigger);
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceRemovePatchOperation.java
new file mode 100644
index 0000000000..4c8a440a56
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceRemovePatchOperation.java
@@ -0,0 +1,70 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.core.Context;
+import org.dspace.utils.DSpace;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Submission "remove" PATCH operation
+ *
+ * To remove the COAR Notify Service of workspace item.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type:
+ * application/json" -d '[{ "op": "remove", "path": "/sections/coarnotify/review/0"}]'
+ * </code>
+ */
+public class NotifyServiceRemovePatchOperation extends RemovePatchOperation<Integer> {
+
+    @Autowired
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    private NotifySubmissionService coarNotifySubmissionService = new DSpace().getServiceManager()
+        .getServiceByName("coarNotifySubmissionService", NotifySubmissionService.class);
+
+    @Override
+    protected Class<Integer[]> getArrayClassForEvaluation() {
+        return Integer[].class;
+    }
+
+    @Override
+    protected Class<Integer> getClassForEvaluation() {
+        return Integer.class;
+    }
+
+    @Override
+    void remove(Context context, HttpServletRequest currentRequest, InProgressSubmission source, String path,
+            Object value) throws Exception {
+
+        Item item = source.getItem();
+
+        String pattern = coarNotifySubmissionService.extractPattern(path);
+        int index = coarNotifySubmissionService.extractIndex(path);
+
+        List<NotifyPatternToTrigger> notifyPatterns =
+            notifyPatternToTriggerService.findByItemAndPattern(context, item, pattern);
+
+        if (index >= notifyPatterns.size()) {
+            throw new UnprocessableEntityException("the provided index[" + index + "] is out of the rang");
+        }
+
+        notifyPatternToTriggerService.delete(context, notifyPatterns.get(index));
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceReplacePatchOperation.java
new file mode 100644
index 0000000000..23946221fb
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifyServiceReplacePatchOperation.java
@@ -0,0 +1,84 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import java.util.List;
+import java.util.Set;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.DSpaceBadRequestException;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.core.Context;
+import org.dspace.utils.DSpace;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Submission "replace" PATCH operation
+ *
+ * To replace the COAR Notify Service of workspace item.
+ *
+ * Example: <code>
+ * curl -X PATCH http://${dspace.server.url}/api/submission/workspaceitems/31599 -H "Content-Type:
+ * application/json" -d '[{ "op": "replace", "path": "/sections/coarnotify/review/0"}, "value": "10"]'
+ * </code>
+ */
+public class NotifyServiceReplacePatchOperation extends ReplacePatchOperation<Integer> {
+
+    @Autowired
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private NotifySubmissionService coarNotifySubmissionService = new DSpace().getServiceManager()
+        .getServiceByName("coarNotifySubmissionService", NotifySubmissionService.class);
+
+    @Override
+    protected Class<Integer[]> getArrayClassForEvaluation() {
+        return Integer[].class;
+    }
+
+    @Override
+    protected Class<Integer> getClassForEvaluation() {
+        return Integer.class;
+    }
+
+    @Override
+    void replace(Context context, HttpServletRequest currentRequest, InProgressSubmission source, String path,
+            Object value) throws Exception {
+
+        int index = coarNotifySubmissionService.extractIndex(path);
+        String pattern = coarNotifySubmissionService.extractPattern(path);
+
+        List<NotifyPatternToTrigger> notifyPatterns =
+            notifyPatternToTriggerService.findByItemAndPattern(context, source.getItem(), pattern);
+
+        if (index >= notifyPatterns.size()) {
+            throw new DSpaceBadRequestException("the provided index[" + index + "] is out of the rang");
+        }
+
+        NotifyServiceEntity notifyServiceEntity = notifyService.find(context, Integer.parseInt(value.toString()));
+        if (notifyServiceEntity == null) {
+            throw new DSpaceBadRequestException("no service found for the provided value: " + value + "");
+        }
+
+        coarNotifySubmissionService.checkCompatibilityWithPattern(context,
+            pattern, Set.of(notifyServiceEntity.getID()));
+
+        NotifyPatternToTrigger notifyPatternToTriggerOld = notifyPatterns.get(index);
+        notifyPatternToTriggerOld.setNotifyService(notifyServiceEntity);
+
+        notifyPatternToTriggerService.update(context, notifyPatternToTriggerOld);
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifySubmissionService.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifySubmissionService.java
new file mode 100644
index 0000000000..7cebc33416
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/NotifySubmissionService.java
@@ -0,0 +1,152 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.app.rest.model.step.DataNotify;
+import org.dspace.authorize.AuthorizeException;
+import org.dspace.coarnotify.NotifyConfigurationService;
+import org.dspace.coarnotify.NotifyPattern;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * Service to manipulate COAR Notify section of in-progress submissions.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com
+ */
+@Component
+public class NotifySubmissionService {
+
+    @Autowired
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    @Autowired
+    private NotifyConfigurationService coarNotifyConfigurationService;
+
+    @Autowired
+    private NotifyService notifyService;
+
+    private NotifySubmissionService() { }
+
+
+    /**
+     * Builds the COAR Notify data of an in-progress submission
+     *
+     * @param obj   - the in progress submission
+     * @return an object representing the CC License data
+     * @throws SQLException
+     * @throws IOException
+     * @throws AuthorizeException
+     */
+    public DataNotify getDataCOARNotify(InProgressSubmission obj) throws SQLException {
+        Context context = new Context();
+
+        List<NotifyPatternToTrigger> patternsToTrigger =
+            notifyPatternToTriggerService.findByItem(context, obj.getItem());
+
+        Map<String, List<Integer>> data =
+            patternsToTrigger.stream()
+                             .collect(Collectors.groupingBy(
+                                 NotifyPatternToTrigger::getPattern,
+                                 Collectors.mapping(patternToTrigger ->
+                                         patternToTrigger.getNotifyService().getID(),
+                                     Collectors.toList())
+                             ));
+
+        return new DataNotify(data);
+    }
+
+
+    public int extractIndex(String path) {
+        Pattern pattern = Pattern.compile("/(\\d+)$");
+        Matcher matcher = pattern.matcher(path);
+
+        if (matcher.find()) {
+            return Integer.parseInt(matcher.group(1));
+        } else {
+            throw new UnprocessableEntityException("Index not found in the path");
+        }
+    }
+
+    /**
+     * extract pattern from path. see COARNotifyConfigurationService bean
+     * @param path
+     * @return the extracted pattern
+     */
+    public String extractPattern(String path) {
+        Pattern pattern = Pattern.compile("/([^/]+)/([^/]+)/([^/]+)");
+        Matcher matcher = pattern.matcher(path);
+        if (matcher.find()) {
+            String patternValue = matcher.group(3);
+            String config = matcher.group(2);
+            if (!isContainPattern(config, patternValue)) {
+                throw new UnprocessableEntityException(
+                    "Invalid Pattern (" + patternValue + ") of " + config);
+            }
+            return patternValue;
+        } else {
+            throw new UnprocessableEntityException("Pattern not found in the path");
+        }
+    }
+
+    private boolean isContainPattern(String config, String pattern) {
+        List<NotifyPattern> patterns = coarNotifyConfigurationService.getPatterns().get(config);
+        if (CollectionUtils.isEmpty(patterns)) {
+            return false;
+        }
+
+        return patterns.stream()
+                       .map(NotifyPattern::getPattern)
+                       .anyMatch(v ->
+                           v.equals(pattern));
+    }
+
+    /**
+     * check that the provided services ids are compatible
+     * with the provided inbound pattern
+     *
+     * @param context the context
+     * @param pattern the inbound pattern
+     * @param servicesIds notify services ids
+     * @throws SQLException if something goes wrong
+     */
+    public void checkCompatibilityWithPattern(Context context, String pattern, Set<Integer> servicesIds)
+        throws SQLException {
+
+        List<Integer> manualServicesIds =
+            notifyService.findManualServicesByInboundPattern(context, pattern)
+                         .stream()
+                         .map(NotifyServiceEntity::getID)
+                         .collect(Collectors.toList());
+
+        for (Integer servicesId : servicesIds) {
+            if (!manualServicesIds.contains(servicesId)) {
+                throw new UnprocessableEntityException("notify service with id (" + servicesId +
+                    ") is not compatible with pattern " + pattern);
+            }
+        }
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PatchOperation.java
index 230d931e83..f073fd355c 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PatchOperation.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.submit.factory.impl;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.LateObjectEvaluator;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.content.InProgressSubmission;
@@ -60,6 +60,15 @@ public abstract class PatchOperation<T extends Object> {
         return absolutePath;
     }
 
+    public String getStepId(String fullpath) {
+        String[] path = fullpath.substring(1).split("/", 3);
+        String stepId = "";
+        if (path.length > 1) {
+            stepId = path[1];
+        }
+        return stepId;
+    }
+
     protected abstract Class<T[]> getArrayClassForEvaluation();
 
     protected abstract Class<T> getClassForEvaluation();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamAddPatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamAddPatchOperation.java
new file mode 100644
index 0000000000..6704c8c2bb
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamAddPatchOperation.java
@@ -0,0 +1,87 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import static org.dspace.core.Constants.CONTENT_BUNDLE_NAME;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Submission "add" operation to set primary bitstream.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class PrimaryBitstreamAddPatchOperation extends AddPatchOperation<String> {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    void add(Context context, HttpServletRequest currentRequest, InProgressSubmission source, String path, Object value)
+        throws Exception {
+        Item item = source.getItem();
+        UUID primaryUUID = parseValue(value);
+        List<Bundle> bundles = itemService.getBundles(item, CONTENT_BUNDLE_NAME);
+        Optional<Bundle> currentPrimaryBundle = bundles.stream()
+                                                       .filter(bundle -> Objects.nonNull(bundle.getPrimaryBitstream()))
+                                                       .findFirst();
+
+        Optional<Bitstream> primaryBitstreamToAdd = null;
+        for (Bundle bundle : bundles) {
+            primaryBitstreamToAdd = bundle.getBitstreams().stream()
+                                                          .filter(b -> b.getID().equals(primaryUUID))
+                                                          .findFirst();
+            if (primaryBitstreamToAdd.isPresent()) {
+                if (currentPrimaryBundle.isPresent()) {
+                    currentPrimaryBundle.get().setPrimaryBitstreamID(null);
+                }
+                bundle.setPrimaryBitstreamID(primaryBitstreamToAdd.get());
+                break;
+            }
+        }
+
+        if (primaryBitstreamToAdd.isEmpty()) {
+            throw new UnprocessableEntityException("The provided uuid: " + primaryUUID +
+                                                   " of bitstream to set as primary doesn't match any bitstream!");
+        }
+    }
+
+    private UUID parseValue(Object value) {
+        UUID primaryBitstreamUUID;
+        try {
+            primaryBitstreamUUID = UUID.fromString((String) value);
+        } catch (Exception e) {
+            throw new UnprocessableEntityException("The provided value is invalid!", e);
+        }
+        return primaryBitstreamUUID;
+    }
+
+    @Override
+    protected Class<String[]> getArrayClassForEvaluation() {
+        return null;
+    }
+
+    @Override
+    protected Class<String> getClassForEvaluation() {
+        return null;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamRemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamRemovePatchOperation.java
new file mode 100644
index 0000000000..c6c8f4d6c5
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamRemovePatchOperation.java
@@ -0,0 +1,50 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import static org.dspace.core.Constants.CONTENT_BUNDLE_NAME;
+
+import java.util.List;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.content.Bundle;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Submission "remove" operation to remove primary bitstream.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class PrimaryBitstreamRemovePatchOperation extends RemovePatchOperation<String> {
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    void remove(Context context, HttpServletRequest request, InProgressSubmission source, String path, Object value)
+         throws Exception {
+        Item item = source.getItem();
+        List<Bundle> bundles = itemService.getBundles(item, CONTENT_BUNDLE_NAME);
+        bundles.forEach(b -> b.setPrimaryBitstreamID(null));
+    }
+
+    @Override
+    protected Class<String[]> getArrayClassForEvaluation() {
+        return null;
+    }
+
+    @Override
+    protected Class<String> getClassForEvaluation() {
+        return null;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamReplacePatchOperation.java
new file mode 100644
index 0000000000..8ebeb78d34
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/PrimaryBitstreamReplacePatchOperation.java
@@ -0,0 +1,88 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.factory.impl;
+
+import static org.dspace.core.Constants.CONTENT_BUNDLE_NAME;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.exception.UnprocessableEntityException;
+import org.dspace.content.Bitstream;
+import org.dspace.content.Bundle;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.core.Context;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Submission "replace" operation to replace primary bitstream.
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk@4science.com)
+ */
+public class PrimaryBitstreamReplacePatchOperation extends ReplacePatchOperation<String> {
+
+    private final String EX_MESSAGE = "It is impossible to replace primary bitstrem if it wasn't set!";
+
+    @Autowired
+    private ItemService itemService;
+
+    @Override
+    void replace(Context context, HttpServletRequest request, InProgressSubmission source, String path, Object value)
+         throws Exception {
+        Item item = source.getItem();
+        UUID primaryUUID = parseValue(value);
+        List<Bundle> bundles = itemService.getBundles(item, CONTENT_BUNDLE_NAME);
+        Bundle currentPrimaryBundle = bundles.stream()
+                                             .filter(bundle -> Objects.nonNull(bundle.getPrimaryBitstream()))
+                                             .findFirst()
+                                             .orElseThrow(() -> new UnprocessableEntityException(EX_MESSAGE));
+
+        Optional<Bitstream> primaryBitstream = null;
+        for (Bundle bundle : bundles) {
+            primaryBitstream = bundle.getBitstreams().stream()
+                                                     .filter(b -> b.getID().equals(primaryUUID))
+                                                     .findFirst();
+            if (primaryBitstream.isPresent()) {
+                currentPrimaryBundle.setPrimaryBitstreamID(null);
+                bundle.setPrimaryBitstreamID(primaryBitstream.get());
+                break;
+            }
+        }
+
+        if (primaryBitstream.isEmpty()) {
+            throw new UnprocessableEntityException("The provided uuid: " + primaryUUID +
+                                                   " of bitstream to set as primary doesn't match any bitstream!");
+        }
+    }
+
+    private UUID parseValue(Object value) {
+        UUID primaryBitstreamUUID;
+        try {
+            primaryBitstreamUUID = UUID.fromString((String) value);
+        } catch (Exception e) {
+            throw new UnprocessableEntityException("The provided value is invalid!", e);
+        }
+        return primaryBitstreamUUID;
+    }
+
+    @Override
+    protected Class<String[]> getArrayClassForEvaluation() {
+        return null;
+    }
+
+    @Override
+    protected Class<String> getClassForEvaluation() {
+        return null;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/RemovePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/RemovePatchOperation.java
index 0fa50562b3..b90fd1875f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/RemovePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/RemovePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.core.Context;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ReplacePatchOperation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ReplacePatchOperation.java
index b5ca61f543..f24fbde59a 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ReplacePatchOperation.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/factory/impl/ReplacePatchOperation.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.factory.impl;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.content.InProgressSubmission;
 import org.dspace.core.Context;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/AccessConditionStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/AccessConditionStep.java
index 070e4a3cbf..29353d0ffd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/AccessConditionStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/AccessConditionStep.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.submit.step;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.AccessConditionDTO;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CCLicenseStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CCLicenseStep.java
index 34ae259090..357c0c48dd 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CCLicenseStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CCLicenseStep.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.step;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.model.step.DataCCLicense;
 import org.dspace.app.rest.submit.AbstractProcessingStep;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CollectionStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CollectionStep.java
index 09e19f2980..b7b93fe2d3 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CollectionStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/CollectionStep.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.step;
 
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.submit.DataProcessingStep;
 import org.dspace.app.rest.submit.SubmissionService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
index ee81d14ca7..5d1f104b92 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DescribeStep.java
@@ -9,8 +9,8 @@ package org.dspace.app.rest.submit.step;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DuplicateDetectionStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DuplicateDetectionStep.java
new file mode 100644
index 0000000000..032a27f83c
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/DuplicateDetectionStep.java
@@ -0,0 +1,112 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.step;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.step.DataDuplicateDetection;
+import org.dspace.app.rest.submit.AbstractProcessingStep;
+import org.dspace.app.rest.submit.SubmissionService;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.util.SubmissionStepConfig;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.core.Context;
+import org.dspace.handle.service.HandleService;
+import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.services.model.Request;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Submission processing step to detect potential duplicates of this item and list them so that
+ * the submitter can choose to cancel or continue with their submission
+ *
+ * @author Kim Shepherd
+ */
+public class DuplicateDetectionStep extends AbstractProcessingStep {
+
+    private static final Logger log = LogManager.getLogger(DuplicateDetectionStep.class);
+
+    @Autowired(required = true)
+    protected HandleService handleService;
+    @Autowired(required = true)
+    protected ContentServiceFactory contentServiceFactory;
+
+    /**
+     * Override DataProcessing.getData, return a list of potential duplicates
+     *
+     * @param submissionService The submission service
+     * @param obj               The workspace or workflow item
+     * @param config            The submission step configuration
+     * @return                  A simple DataIdentifiers bean containing doi, handle and list of other identifiers
+     */
+    @Override
+    public DataDuplicateDetection getData(SubmissionService submissionService, InProgressSubmission obj,
+                                          SubmissionStepConfig config) throws Exception {
+        // Validate in progress submission object and wrapped item
+        if (obj == null) {
+            throw new IllegalArgumentException("Null in-progress wrapper object");
+        }
+        if (obj.getItem() == null) {
+            throw new IllegalArgumentException("Null in-progress item");
+        }
+        // Immediately return an empty if this feature is not configured
+        if (!configurationService.getBooleanProperty("duplicate.enable", false)) {
+            log.debug("Duplicate detection is not enabled, returning empty section");
+            return new DataDuplicateDetection();
+        }
+        // Validate context
+        Context context = getContext();
+        if (context == null) {
+            throw new ServletException("Null context");
+        }
+
+        // Return the constructed data section
+        return submissionService.getDataDuplicateDetection(context, obj);
+    }
+
+    /**
+     * Utility method to get DSpace context from the HTTP request
+     * @return  DSpace context
+     */
+    private Context getContext() {
+        Context context;
+        Request currentRequest = DSpaceServicesFactory.getInstance().getRequestService().getCurrentRequest();
+        if (currentRequest != null) {
+            HttpServletRequest request = currentRequest.getHttpServletRequest();
+            context = ContextUtil.obtainContext(request);
+        } else {
+            context = new Context();
+        }
+
+        return context;
+    }
+
+    /**
+     * This step is currently just for displaying identifiers and does not take additional patch operations
+     * @param context
+     *            the DSpace context
+     * @param currentRequest
+     *            the http request
+     * @param source
+     *            the in progress submission
+     * @param op
+     *            the json patch operation
+     * @param stepConf
+     * @throws Exception
+     */
+    @Override
+    public void doPatchProcessing(Context context, HttpServletRequest currentRequest, InProgressSubmission source,
+                                  Operation op, SubmissionStepConfig stepConf) throws Exception {
+        log.warn("Not implemented");
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java
index 053530d862..f374dcd788 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/LicenseStep.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.submit.step;
 
-import javax.servlet.http.HttpServletRequest;
-
+import jakarta.servlet.http.HttpServletRequest;
 import org.atteo.evo.inflector.English;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.BitstreamRest;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/NotifyStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/NotifyStep.java
new file mode 100644
index 0000000000..e6297217a4
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/NotifyStep.java
@@ -0,0 +1,61 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.step;
+
+import jakarta.servlet.http.HttpServletRequest;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.step.DataNotify;
+import org.dspace.app.rest.submit.AbstractProcessingStep;
+import org.dspace.app.rest.submit.SubmissionService;
+import org.dspace.app.rest.submit.factory.PatchOperationFactory;
+import org.dspace.app.rest.submit.factory.impl.PatchOperation;
+import org.dspace.app.util.SubmissionStepConfig;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.core.Context;
+
+/**
+ * COARNotify Step for DSpace Spring Rest. Expose information about
+ * the COAR Notify services for the in progress submission.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyStep extends AbstractProcessingStep {
+
+    /**
+     * Retrieves the COAR Notify services data of the in progress submission
+     *
+     * @param submissionService the submission service
+     * @param obj               the in progress submission
+     * @param config            the submission step configuration
+     * @return the COAR Notify data of the in progress submission
+     * @throws Exception
+     */
+    @Override
+    public DataNotify getData(SubmissionService submissionService, InProgressSubmission obj,
+                                             SubmissionStepConfig config) throws Exception {
+        return coarNotifySubmissionService.getDataCOARNotify(obj);
+    }
+
+    /**
+     * Processes a patch for the COAR Notify data
+     *
+     * @param context        the DSpace context
+     * @param currentRequest the http request
+     * @param source         the in progress submission
+     * @param op             the json patch operation
+     * @throws Exception
+     */
+    @Override
+    public void doPatchProcessing(Context context, HttpServletRequest currentRequest, InProgressSubmission source,
+            Operation op, SubmissionStepConfig stepConf) throws Exception {
+
+        PatchOperation<?> patchOperation = new PatchOperationFactory().instanceOf(
+            COARNOTIFY_STEP_PATH, op.getOp());
+        patchOperation.perform(context, currentRequest, source, op);
+    }
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java
index d37182904b..206b3fab59 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/SherpaPolicyStep.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.submit.step;
 
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.model.step.SherpaPolicy;
 import org.dspace.app.rest.submit.AbstractProcessingStep;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/ShowIdentifiersStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/ShowIdentifiersStep.java
index e63d38ab2e..47eac49f49 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/ShowIdentifiersStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/ShowIdentifiersStep.java
@@ -10,8 +10,8 @@ package org.dspace.app.rest.submit.step;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/UploadStep.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/UploadStep.java
index b91916ca31..e0a9cb17e0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/UploadStep.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/UploadStep.java
@@ -10,8 +10,10 @@ package org.dspace.app.rest.submit.step;
 import java.io.BufferedInputStream;
 import java.io.InputStream;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
+import java.util.Objects;
 
+import jakarta.servlet.http.HttpServletRequest;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.rest.exception.UnprocessableEntityException;
 import org.dspace.app.rest.model.ErrorRest;
@@ -46,8 +48,6 @@ public class UploadStep extends AbstractProcessingStep
 
     private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(UploadStep.class);
 
-    public static final String UPLOAD_STEP_METADATA_SECTION = "bitstream-metadata";
-
     @Override
     public DataUpload getData(SubmissionService submissionService, InProgressSubmission obj,
                               SubmissionStepConfig config) throws Exception {
@@ -56,8 +56,12 @@ public class UploadStep extends AbstractProcessingStep
         List<Bundle> bundles = itemService.getBundles(obj.getItem(), Constants.CONTENT_BUNDLE_NAME);
         for (Bundle bundle : bundles) {
             for (Bitstream source : bundle.getBitstreams()) {
+                Bitstream primaryBitstream = bundle.getPrimaryBitstream();
                 UploadBitstreamRest b = submissionService.buildUploadBitstream(configurationService, source);
                 result.getFiles().add(b);
+                if (Objects.nonNull(primaryBitstream)) {
+                    result.setPrimary(primaryBitstream.getID());
+                }
             }
         }
         return result;
@@ -73,6 +77,8 @@ public class UploadStep extends AbstractProcessingStep
                 instance = UPLOAD_STEP_METADATA_OPERATION_ENTRY;
             } else if (op.getPath().contains(UPLOAD_STEP_ACCESSCONDITIONS_OPERATION_ENTRY)) {
                 instance = stepConf.getType() + "." + UPLOAD_STEP_ACCESSCONDITIONS_OPERATION_ENTRY;
+            } else if (op.getPath().contains(PRIMARY_FLAG_ENTRY)) {
+                instance = PRIMARY_FLAG_ENTRY;
             } else {
                 instance = UPLOAD_STEP_REMOVE_OPERATION_ENTRY;
             }
@@ -87,9 +93,11 @@ public class UploadStep extends AbstractProcessingStep
                 instance = stepConf.getType() + "." + UPLOAD_STEP_ACCESSCONDITIONS_OPERATION_ENTRY;
             } else if (op.getPath().contains(UPLOAD_STEP_METADATA_PATH)) {
                 instance = UPLOAD_STEP_METADATA_OPERATION_ENTRY;
+            } else if (op.getPath().contains(PRIMARY_FLAG_ENTRY)) {
+                instance = PRIMARY_FLAG_ENTRY;
             }
         }
-        if (instance == null) {
+        if (StringUtils.isBlank(instance)) {
             throw new UnprocessableEntityException("The path " + op.getPath() + " is not supported by the operation "
                                                                               + op.getOp());
         }
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/CclicenseValidator.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/CclicenseValidator.java
new file mode 100644
index 0000000000..d0cfd14ec8
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/CclicenseValidator.java
@@ -0,0 +1,120 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.step.validation;
+
+import static org.dspace.app.rest.repository.WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
+
+import org.dspace.app.rest.model.ErrorRest;
+import org.dspace.app.rest.submit.SubmissionService;
+import org.dspace.app.util.DCInputsReaderException;
+import org.dspace.app.util.SubmissionStepConfig;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.dspace.license.CreativeCommonsServiceImpl;
+import org.dspace.services.ConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * This class validates that the Creative Commons License has been granted for the
+ * in-progress submission.
+ *
+ * @author Mattia Vianelli (Mattia.Vianelli@4science.com)
+ */
+public class CclicenseValidator extends AbstractValidation {
+
+    /**
+     * Construct a Creative Commons License configuration.
+     * @param configurationService DSpace configuration provided by the DI container.
+     */
+    @Inject
+    public CclicenseValidator(ConfigurationService configurationService) {
+        this.configurationService = configurationService;
+    }
+
+    private final ConfigurationService configurationService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private CreativeCommonsServiceImpl creativeCommonsService;
+
+    public static final String ERROR_VALIDATION_CCLICENSEREQUIRED = "error.validation.cclicense.required";
+
+    private String name;
+
+    /**
+     * Validate the license of the item.
+     * @param item The item whose cclicense is to be validated.
+     * @param config The configuration for the submission step for cclicense.
+     * @return A list of validation errors.
+     */
+    private List<ErrorRest> validateLicense(Item item, SubmissionStepConfig config) {
+        List<ErrorRest> errors = new ArrayList<>(1);
+
+        String licenseURI = creativeCommonsService.getLicenseURI(item);
+        if (licenseURI == null || licenseURI.isBlank()) {
+            addError(errors, ERROR_VALIDATION_CCLICENSEREQUIRED, "/" + OPERATION_PATH_SECTIONS + "/" + config.getId());
+        }
+
+        return errors;
+    }
+
+    public ItemService getItemService() {
+        return itemService;
+    }
+
+    public void setItemService(ItemService itemService) {
+        this.itemService = itemService;
+    }
+
+    /**
+     * Check if at least one Creative Commons License is required when submitting a new Item.
+     * @return true if a Creative Commons License is required setting true for the property cc.license.required.
+     */
+    public Boolean isRequired() {
+        return configurationService.getBooleanProperty("cc.license.required", false);
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Perform validation on the item and config(ccLicense).
+     * @param obj The submission to be validated.
+     * @param config The configuration for the submission step for cclicense.
+     * @return A list of validation errors.
+     * @throws SQLException If there is a problem accessing the database.
+     */
+
+    @Override
+    public List<? extends ErrorRest> validate(SubmissionService submissionService,
+                                              InProgressSubmission obj,
+                                              SubmissionStepConfig config)
+            throws DCInputsReaderException, SQLException {
+
+        if (this.isRequired() && obj != null && obj.getItem() != null) {
+            return validateLicense(obj.getItem(), config);
+        } else {
+            return List.of();
+        }
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/NotifyValidation.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/NotifyValidation.java
new file mode 100644
index 0000000000..04a1567fda
--- /dev/null
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/submit/step/validation/NotifyValidation.java
@@ -0,0 +1,117 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.submit.step.validation;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.dspace.app.ldn.NotifyPatternToTrigger;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyPatternToTriggerService;
+import org.dspace.app.rest.model.ErrorRest;
+import org.dspace.app.rest.repository.WorkspaceItemRestRepository;
+import org.dspace.app.rest.submit.SubmissionService;
+import org.dspace.app.rest.utils.ContextUtil;
+import org.dspace.app.util.DCInputsReaderException;
+import org.dspace.app.util.SubmissionStepConfig;
+import org.dspace.coarnotify.NotifyConfigurationService;
+import org.dspace.coarnotify.NotifyPattern;
+import org.dspace.content.InProgressSubmission;
+import org.dspace.content.Item;
+import org.dspace.content.logic.LogicalStatement;
+import org.dspace.core.Context;
+import org.dspace.utils.DSpace;
+
+/**
+ * Execute check validation of Coar notify services filters
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyValidation extends AbstractValidation {
+
+    private static final String ERROR_VALIDATION_INVALID_FILTER = "error.validation.coarnotify.invalidfilter";
+
+    private NotifyConfigurationService coarNotifyConfigurationService;
+
+    private NotifyPatternToTriggerService notifyPatternToTriggerService;
+
+    @Override
+    public List<ErrorRest> validate(SubmissionService submissionService, InProgressSubmission obj,
+                                    SubmissionStepConfig config) throws DCInputsReaderException, SQLException {
+
+        List<ErrorRest> errors = new ArrayList<>();
+        Context context = ContextUtil.obtainCurrentRequestContext();
+        Item item = obj.getItem();
+
+        List<String> patterns =
+            coarNotifyConfigurationService.getPatterns().getOrDefault(config.getId(), List.of())
+                                          .stream()
+                                          .map(NotifyPattern::getPattern)
+                                          .collect(Collectors.toList());
+
+        patterns.forEach(pattern -> {
+            List<NotifyServiceEntity> services = findByItemAndPattern(context, item, pattern);
+            IntStream.range(0, services.size()).forEach(i ->
+                services.get(i)
+                        .getInboundPatterns()
+                        .stream()
+                        .filter(inboundPattern -> inboundPattern.getPattern().equals(pattern))
+                        .filter(inboundPattern -> !inboundPattern.isAutomatic() &&
+                            !inboundPattern.getConstraint().isEmpty())
+                        .forEach(inboundPattern -> {
+                            LogicalStatement filter =
+                                new DSpace().getServiceManager()
+                                            .getServiceByName(inboundPattern.getConstraint(), LogicalStatement.class);
+
+                            if (filter == null || !filter.getResult(context, item)) {
+                                addError(errors, ERROR_VALIDATION_INVALID_FILTER,
+                                    "/" + WorkspaceItemRestRepository.OPERATION_PATH_SECTIONS +
+                                        "/" + config.getId() +
+                                        "/" + inboundPattern.getPattern() +
+                                        "/" + i
+                                );
+                            }
+                        }));
+        });
+
+        return errors;
+    }
+
+    private List<NotifyServiceEntity> findByItemAndPattern(Context context, Item item, String pattern) {
+        try {
+            return notifyPatternToTriggerService.findByItemAndPattern(context, item, pattern)
+                                                .stream()
+                                                .map(NotifyPatternToTrigger::getNotifyService)
+                                                .collect(Collectors.toList());
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public NotifyConfigurationService getCoarNotifyConfigurationService() {
+        return coarNotifyConfigurationService;
+    }
+
+    public void setCoarNotifyConfigurationService(
+        NotifyConfigurationService coarNotifyConfigurationService) {
+        this.coarNotifyConfigurationService = coarNotifyConfigurationService;
+    }
+
+    public NotifyPatternToTriggerService getNotifyPatternToTriggerService() {
+        return notifyPatternToTriggerService;
+    }
+
+    public void setNotifyPatternToTriggerService(
+        NotifyPatternToTriggerService notifyPatternToTriggerService) {
+        this.notifyPatternToTriggerService = notifyPatternToTriggerService;
+    }
+
+}
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
index 48538deb13..ba43fdf956 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ApplicationConfig.java
@@ -34,7 +34,8 @@ import org.springframework.context.annotation.Configuration;
     "org.dspace.app.rest.utils",
     "org.dspace.app.configuration",
     "org.dspace.iiif",
-    "org.dspace.app.iiif"
+    "org.dspace.app.iiif",
+    "org.dspace.app.ldn"
 })
 public class ApplicationConfig {
     // Allowed CORS origins ("Access-Control-Allow-Origin" header)
@@ -71,6 +72,10 @@ public class ApplicationConfig {
     @Value("${dspace.ui.url:http://localhost:4000}")
     private String uiURL;
 
+    // LDN enable status
+    @Value("${ldn.enabled}")
+    private boolean ldnEnabled;
+
     /**
      * Return the array of allowed origins (client URLs) for the CORS "Access-Control-Allow-Origin" header
      * Used by Application class
@@ -129,6 +134,14 @@ public class ApplicationConfig {
         return corsAllowCredentials;
     }
 
+    /**
+     * Return the ldn.enabled value
+     * @return true or false
+     */
+    public boolean getLdnEnabled() {
+        return this.ldnEnabled;
+    }
+
     /**
      * Return whether to allow credentials (cookies) on IIIF requests. This is used to set the
      * CORS "Access-Control-Allow-Credentials" header in Application class. Defaults to false.
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamMetadataValuePathUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamMetadataValuePathUtils.java
index dda661e491..c1c05c41f4 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamMetadataValuePathUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/BitstreamMetadataValuePathUtils.java
@@ -8,10 +8,12 @@
 package org.dspace.app.rest.utils;
 
 import org.dspace.app.rest.exception.UnprocessableEntityException;
-import org.dspace.app.rest.submit.step.UploadStep;
 import org.dspace.app.util.DCInputSet;
 import org.dspace.app.util.DCInputsReader;
 import org.dspace.app.util.DCInputsReaderException;
+import org.dspace.submit.model.UploadConfiguration;
+import org.dspace.submit.model.UploadConfigurationService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * Utils class offering methods to validate patch operations for bitstream metadata in the submission
@@ -22,6 +24,9 @@ public class BitstreamMetadataValuePathUtils {
 
     private DCInputsReader inputReader;
 
+    @Autowired
+    UploadConfigurationService uploadConfigurationService;
+
     BitstreamMetadataValuePathUtils() throws DCInputsReaderException {
         inputReader = new DCInputsReader();
     }
@@ -29,20 +34,22 @@ public class BitstreamMetadataValuePathUtils {
     /**
      * Method to verify that the path included in the patch operation is supported
      * by the submission configuration of the upload section
-     * 
+     *
+     * @param stepId the name of the upload configuration
      * @param absolutePath the path in the json patch operation
      * @throws DCInputsReaderException      if an error occurs reading the
      *                                      submission configuration
      * @throws UnprocessableEntityException if the path is invalid
      */
-    public void validate(String absolutePath) throws DCInputsReaderException {
+    public void validate(String stepId, String absolutePath) throws DCInputsReaderException {
+        UploadConfiguration uploadService = uploadConfigurationService.getMap().get(stepId);
+        DCInputSet inputConfig = inputReader.getInputsByFormName(uploadService.getMetadata());
         String[] split = absolutePath.split("/");
-        DCInputSet inputConfig = inputReader.getInputsByFormName(UploadStep.UPLOAD_STEP_METADATA_SECTION);
         // according to the rest contract the absolute path must be something like files/:idx/metadata/dc.title
         if (split.length >= 4) {
             if (!inputConfig.isFieldPresent(split[3])) {
                 throw new UnprocessableEntityException("The field " + split[3] + " is not present in section "
-                                                                    + UploadStep.UPLOAD_STEP_METADATA_SECTION);
+                                                                    + stepId);
             }
         } else {
             throw new UnprocessableEntityException("The path " + absolutePath + " cannot be patched ");
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ContextUtil.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ContextUtil.java
index 73813c01b5..3ba853dbd6 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ContextUtil.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/ContextUtil.java
@@ -10,10 +10,10 @@ package org.dspace.app.rest.utils;
 import java.sql.SQLException;
 import java.util.Enumeration;
 import java.util.Locale;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.dspace.core.Context;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceAPIRequestLoggingFilter.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceAPIRequestLoggingFilter.java
index 6dfebe3203..36888a7403 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceAPIRequestLoggingFilter.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceAPIRequestLoggingFilter.java
@@ -8,8 +8,8 @@
 package org.dspace.app.rest.utils;
 
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.ThreadContext;
 import org.dspace.services.ConfigurationService;
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceConfigurationInitializer.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceConfigurationInitializer.java
index 9291a436c7..c04ac976e0 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceConfigurationInitializer.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceConfigurationInitializer.java
@@ -11,8 +11,6 @@ import org.apache.commons.configuration2.Configuration;
 import org.dspace.servicemanager.config.DSpaceConfigurationPropertySource;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 
@@ -29,8 +27,6 @@ import org.springframework.context.ConfigurableApplicationContext;
  */
 public class DSpaceConfigurationInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final Logger log = LoggerFactory.getLogger(DSpaceConfigurationInitializer.class);
-
     @Override
     public void initialize(final ConfigurableApplicationContext applicationContext) {
         // Load DSpace Configuration service (requires kernel already initialized)
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceKernelInitializer.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceKernelInitializer.java
index 73a96259bf..88a093c057 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceKernelInitializer.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceKernelInitializer.java
@@ -12,13 +12,13 @@ import javax.naming.Context;
 import javax.naming.InitialContext;
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.kernel.DSpaceKernel;
 import org.dspace.kernel.DSpaceKernelManager;
 import org.dspace.servicemanager.DSpaceKernelImpl;
 import org.dspace.servicemanager.DSpaceKernelInit;
 import org.dspace.servicemanager.config.DSpaceConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -31,7 +31,7 @@ import org.springframework.core.env.ConfigurableEnvironment;
  */
 public class DSpaceKernelInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
 
-    private static final Logger log = LoggerFactory.getLogger(DSpaceKernelInitializer.class);
+    private static final Logger log = LogManager.getLogger();
 
     private transient DSpaceKernel dspaceKernel;
 
@@ -81,6 +81,7 @@ public class DSpaceKernelInitializer implements ApplicationContextInitializer<Co
      * Initially look for JNDI Resource called "java:/comp/env/dspace.dir".
      * If not found, use value provided in "dspace.dir" in Spring Environment
      */
+    @SuppressWarnings("BanJNDI")
     private String getDSpaceHome(ConfigurableEnvironment environment) {
         // Load the "dspace.dir" property from Spring Boot's Configuration (application.properties)
         // This gives us the location of our DSpace configurations, necessary to start the kernel
@@ -119,6 +120,7 @@ public class DSpaceKernelInitializer implements ApplicationContextInitializer<Co
             this.kernel = kernel;
         }
 
+        @Override
         public void onApplicationEvent(final ContextClosedEvent event) {
             if (this.kernel != null) {
                 this.kernel.destroy();
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
index d68c710a3c..d1b80c3675 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/HttpHeadersInitializer.java
@@ -7,21 +7,21 @@
  */
 package org.dspace.app.rest.utils;
 
+import static jakarta.mail.internet.MimeUtility.encodeText;
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static javax.mail.internet.MimeUtility.encodeText;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Objects;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.tomcat.util.http.FastHttpDateFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.http.HttpHeaders;
 
 /**
@@ -32,7 +32,7 @@ import org.springframework.http.HttpHeaders;
  */
 public class HttpHeadersInitializer {
 
-    protected final Logger log = LoggerFactory.getLogger(this.getClass());
+    protected final Logger log = LogManager.getLogger();
 
     private static final String MULTIPART_BOUNDARY = "MULTIPART_BYTERANGES";
     private static final String CONTENT_TYPE_MULTITYPE_WITH_BOUNDARY = "multipart/byteranges; boundary=" +
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RegexUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RegexUtils.java
index 8739f6b8d5..df525f6793 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RegexUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RegexUtils.java
@@ -13,7 +13,7 @@ package org.dspace.app.rest.utils;
  */
 public class RegexUtils {
 
-    private RegexUtils(){}
+    private RegexUtils() {}
 
     /**
      * Regular expression in the request mapping to accept UUID as identifier
@@ -27,13 +27,19 @@ public class RegexUtils {
     public static final String REGEX_REQUESTMAPPING_IDENTIFIER_AS_UUID =
         "/{uuid:" + REGEX_UUID + "}";
 
+    /**
+     * Regular expression in the request mapping to accept LDN identifiers
+     */
+    public static final String REGEX_REQUESTMAPPING_IDENTIFIER_AS_URN_UUID =
+        "/{id:^urn:uuid:" + REGEX_UUID + "}";
+
     /**
      * Regular expression in the request mapping to accept a string as identifier but not the other kind of
      * identifier (digits or uuid)
      */
     public static final String REGEX_REQUESTMAPPING_IDENTIFIER_AS_STRING_VERSION_STRONG = "/{id:^(?!^\\d+$)" +
         "(?!^[0-9a-fxA-FX]{8}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{4}-[0-9a-fxA-FX]{12}$)"
-        + "[\\w+\\-\\.:]+$+}";
+        + "[\\w+\\-\\.:!]+$+}";
 
     /**
      * Regular expression in the request mapping to accept number as identifier
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestRepositoryUtils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestRepositoryUtils.java
index 69a9cc11e0..12869a5638 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestRepositoryUtils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/RestRepositoryUtils.java
@@ -105,7 +105,7 @@ public class RestRepositoryUtils {
      */
     public Method getSearchMethod(String searchMethodName, DSpaceRestRepository repository) {
         Method searchMethod = null;
-        // DSpaceRestRepository is possibly enhanced with a Spring AOP proxy. Therefor use ClassUtils to determine
+        // DSpaceRestRepository is possibly enhanced with a Spring AOP proxy. Therefore use ClassUtils to determine
         // the underlying implementation class.
         Method[] methods = ClassUtils.getUserClass(repository.getClass()).getMethods();
         for (Method method : methods) {
diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
index ed6e26ed0f..f66d794a8f 100644
--- a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
+++ b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/Utils.java
@@ -43,10 +43,10 @@ import java.util.Scanner;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.UUID;
-import javax.annotation.Nullable;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -267,8 +267,7 @@ public class Utils {
      */
     public DSpaceRestRepository getResourceRepository(String apiCategory, String modelPlural)
             throws RepositoryNotFoundException {
-        String model = makeSingular(modelPlural);
-        return getResourceRepositoryByCategoryAndModel(apiCategory, model);
+        return getResourceRepositoryByCategoryAndModel(apiCategory, modelPlural);
     }
 
     /**
@@ -276,16 +275,16 @@ public class Utils {
      * as returned by the {@link RestAddressableModel#getType()} method
      *
      * @param apiCategory
-     * @param modelSingular
+     * @param modelPlural
      * @return the requested repository.
      * @throws RepositoryNotFoundException if no such repository can be found.
      */
-    public DSpaceRestRepository getResourceRepositoryByCategoryAndModel(String apiCategory, String modelSingular)
+    public DSpaceRestRepository getResourceRepositoryByCategoryAndModel(String apiCategory, String modelPlural)
             throws RepositoryNotFoundException {
         try {
-            return applicationContext.getBean(apiCategory + "." + modelSingular, DSpaceRestRepository.class);
+            return applicationContext.getBean(apiCategory + "." + modelPlural, DSpaceRestRepository.class);
         } catch (NoSuchBeanDefinitionException e) {
-            throw new RepositoryNotFoundException(apiCategory, modelSingular);
+            throw new RepositoryNotFoundException(apiCategory, modelPlural);
         }
     }
 
@@ -343,11 +342,10 @@ public class Utils {
      * @return
      */
     public LinkRestRepository getLinkResourceRepository(String apiCategory, String modelPlural, String rel) {
-        String model = makeSingular(modelPlural);
         try {
-            return applicationContext.getBean(apiCategory + "." + model + "." + rel, LinkRestRepository.class);
+            return applicationContext.getBean(apiCategory + "." + modelPlural + "." + rel, LinkRestRepository.class);
         } catch (NoSuchBeanDefinitionException e) {
-            throw new RepositoryNotFoundException(apiCategory, model);
+            throw new RepositoryNotFoundException(apiCategory, modelPlural);
         }
     }
 
@@ -742,7 +740,7 @@ public class Utils {
         }
         Projection projection = resource.getContent().getProjection();
         LinkRestRepository linkRepository = getLinkResourceRepository(resource.getContent().getCategory(),
-                resource.getContent().getType(), rel);
+                resource.getContent().getTypePlural(), rel);
         if (linkRepository.isEmbeddableRelation(resource.getContent(), rel)) {
             Method method = requireMethod(linkRepository.getClass(), linkRest.method());
             Object contentId = getContentIdForLinkMethod(resource.getContent(), method);
@@ -973,7 +971,7 @@ public class Utils {
     public Object getDSpaceAPIObjectFromRest(Context context, BaseObjectRest restObj)
             throws IllegalArgumentException, SQLException {
         DSpaceRestRepository repository = getResourceRepositoryByCategoryAndModel(restObj.getCategory(),
-                restObj.getType());
+                restObj.getTypePlural());
         Serializable pk = castToPKClass((ReloadableEntityObjectRepository) repository, restObj.getId().toString());
         return ((ReloadableEntityObjectRepository) repository).findDomainObjectByPk(context, pk);
     }
diff --git a/dspace-server-webapp/src/main/javadoc/overview.html b/dspace-server-webapp/src/main/javadoc/overview.html
new file mode 100644
index 0000000000..5c58d2fc74
--- /dev/null
+++ b/dspace-server-webapp/src/main/javadoc/overview.html
@@ -0,0 +1,29 @@
+<!--
+
+    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/
+
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>The DSpace Web API</title>
+  </head>
+  <body>
+    <p>
+      The REST back-end of DSpace.  A front-end program such as
+      <a href='https://github.com/DSpace/dspace-angular/'>dspace-angular</a>
+      can use this to query, fetch and manipulate DSpace objects and related
+      data.  The REST layer sits between front-ends and the DSpace business
+      logic (chiefly in {@code dspace-api}).
+    </p>
+
+    <p>Where To Find It:</p>
+    <ul>
+      <li>Endpoint access authorization:  {@link org.dspace.app.rest.security}</li>
+    </ul>
+  </body>
+</html>
diff --git a/dspace-server-webapp/src/main/resources/application.properties b/dspace-server-webapp/src/main/resources/application.properties
index f6fba076c0..8233298ef0 100644
--- a/dspace-server-webapp/src/main/resources/application.properties
+++ b/dspace-server-webapp/src/main/resources/application.properties
@@ -38,6 +38,11 @@
 # 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
 #
diff --git a/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml b/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml
index f39d553c96..50204bf5c4 100644
--- a/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml
+++ b/dspace-server-webapp/src/main/resources/spring/spring-dspace-addon-validation-services.xml
@@ -27,7 +27,19 @@
         <property name="uploadConfigurationService" ref="uploadConfigurationService"/>
     </bean>
 
+    <bean name="cclicenseValidation" class="org.dspace.app.rest.submit.step.validation.CclicenseValidator">
+        <property name="itemService" ref="org.dspace.content.ItemServiceImpl"/>
+        <property name="name" value="cclicense"/>
+    </bean>
+
     <bean name="licenseValidation" class="org.dspace.app.rest.submit.step.validation.LicenseValidation">
         <property name="name" value="license"/>
     </bean>
+
+    <bean name="COARNotifyValidation" class="org.dspace.app.rest.submit.step.validation.NotifyValidation" scope="prototype">
+        <property name="name" value="coarnotify"/>
+        <property name="coarNotifyConfigurationService" ref="org.dspace.coarnotify.NotifyConfigurationService"/>
+        <property name="notifyPatternToTriggerService" ref="org.dspace.app.ldn.service.impl.NotifyPatternToTriggerImpl"/>
+    </bean>
+
 </beans>
diff --git a/dspace-server-webapp/src/main/resources/spring/spring-dspace-core-services.xml b/dspace-server-webapp/src/main/resources/spring/spring-dspace-core-services.xml
index bb56393d0b..e865c0d5e7 100644
--- a/dspace-server-webapp/src/main/resources/spring/spring-dspace-core-services.xml
+++ b/dspace-server-webapp/src/main/resources/spring/spring-dspace-core-services.xml
@@ -20,18 +20,15 @@
                     <map>
                         <!-- WARNING do not change "key" it match with Java code (TODO dynamic discover from PATCH operation); -->
                         <entry key="itemmetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueMovePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueMovePatchOperation"/>
                         </entry>
                         <entry key="bitstreammetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueMovePatchOperation">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueMovePatchOperation">
                                 <property name="bitstreamMetadataValuePathUtils" ref="org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils" />
                             </bean>
                         </entry>
                         <entry key="bitstreammove">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamMovePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamMovePatchOperation"/>
                         </entry>
                     </map>
                 </entry>
@@ -39,90 +36,86 @@
                     <map>
                         <!-- WARNING do not change "key" it match with Java code (TODO dynamic discover from PATCH operation); -->
                         <entry key="itemmetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueAddPatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueAddPatchOperation"/>
                         </entry>
                         <entry key="bitstreammetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueAddPatchOperation">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueAddPatchOperation">
                                 <property name="bitstreamMetadataValuePathUtils" ref="org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils" />
                             </bean>
                         </entry>
                         <entry key="granted">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.LicenseAddPatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.LicenseAddPatchOperation"/>
                         </entry>
                         <entry key="upload.accessConditions">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamResourcePolicyAddPatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamResourcePolicyAddPatchOperation"/>
                         </entry>
                         <entry key="cclicense/uri">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.CCLicenseAddPatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.CCLicenseAddPatchOperation"/>
                         </entry>
                         <entry key="accessConditions">
                             <bean class="org.dspace.app.rest.submit.factory.impl.AccessConditionAddPatchOperation"/>
                         </entry>
+                        <entry key="coarnotify">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.NotifyServiceAddPatchOperation"/>
+                        </entry>
+                        <entry key="primary">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.PrimaryBitstreamAddPatchOperation"/>
+                        </entry>
                     </map>
                 </entry>
                 <entry key="remove">
                     <map>
                         <!-- WARNING do not change "key" it match with Java code (TODO dynamic discover from PATCH operation); -->
                         <entry key="itemmetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueRemovePatchOperation" />
+                            <bean class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueRemovePatchOperation" />
                         </entry>
                         <entry key="bitstreammetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueRemovePatchOperation">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueRemovePatchOperation">
                                 <property name="bitstreamMetadataValuePathUtils" ref="org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils" />
                             </bean>
                         </entry>
                         <entry key="granted">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.LicenseRemovePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.LicenseRemovePatchOperation"/>
                         </entry>
                         <entry key="bitstreamremove">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamRemovePatchOperation" />
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamRemovePatchOperation" />
                         </entry>
                         <entry key="upload.accessConditions">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamResourcePolicyRemovePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamResourcePolicyRemovePatchOperation"/>
                         </entry>
                         <entry key="cclicense/uri">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.CCLicenseRemovePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.CCLicenseRemovePatchOperation"/>
                         </entry>
                         <entry key="accessConditions">
                             <bean class="org.dspace.app.rest.submit.factory.impl.AccessConditionRemovePatchOperation"/>
                         </entry>
+                        <entry key="coarnotify">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.NotifyServiceRemovePatchOperation"/>
+                        </entry>
+                        <entry key="primary">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.PrimaryBitstreamRemovePatchOperation"/>
+                        </entry>
                     </map>
                 </entry>
                 <entry key="replace">
                     <map>
                         <!-- WARNING do not change "key" it match with Java code (TODO dynamic discover from PATCH operation); -->
                         <entry key="itemmetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueReplacePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.ItemMetadataValueReplacePatchOperation"/>
                         </entry>
                         <entry key="bitstreammetadata">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueReplacePatchOperation">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamMetadataValueReplacePatchOperation">
                                 <property name="bitstreamMetadataValuePathUtils" ref="org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils" />
                             </bean>
                         </entry>
                         <entry key="granted">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.LicenseReplacePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.LicenseReplacePatchOperation"/>
                         </entry>
                         <entry key="upload.accessConditions">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.BitstreamResourcePolicyReplacePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.BitstreamResourcePolicyReplacePatchOperation"/>
                         </entry>
                         <entry key="collection">
-                            <bean
-                                    class="org.dspace.app.rest.submit.factory.impl.CollectionReplacePatchOperation"/>
+                            <bean class="org.dspace.app.rest.submit.factory.impl.CollectionReplacePatchOperation"/>
                         </entry>
                         <entry key="discoverable">
                             <bean class="org.dspace.app.rest.submit.factory.impl.AccessConditionDiscoverableReplacePatchOperation"/>
@@ -130,6 +123,12 @@
                         <entry key="accessConditions">
                             <bean class="org.dspace.app.rest.submit.factory.impl.AccessConditionReplacePatchOperation"/>
                         </entry>
+                        <entry key="coarnotify">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.NotifyServiceReplacePatchOperation"/>
+                        </entry>
+                        <entry key="primary">
+                            <bean class="org.dspace.app.rest.submit.factory.impl.PrimaryBitstreamReplacePatchOperation"/>
+                        </entry>
                     </map>
                 </entry>
             </map>
@@ -137,4 +136,7 @@
     </bean>
 
     <bean id="org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils" class="org.dspace.app.rest.utils.BitstreamMetadataValuePathUtils"/>
+
+    <bean id="coarNotifySubmissionService" class="org.dspace.app.rest.submit.factory.impl.NotifySubmissionService"/>
+
 </beans>
diff --git a/dspace-server-webapp/src/main/webapp/index.html b/dspace-server-webapp/src/main/resources/static/index.html
similarity index 99%
rename from dspace-server-webapp/src/main/webapp/index.html
rename to dspace-server-webapp/src/main/resources/static/index.html
index c780286107..0b80f80676 100644
--- a/dspace-server-webapp/src/main/webapp/index.html
+++ b/dspace-server-webapp/src/main/resources/static/index.html
@@ -321,7 +321,7 @@ Content-Type: application/json
 
 <script src="browser/js/hal/views/documentation.js"></script>
 
-<script src="webjars/json-editor__json-editor/2.6.1/dist/jsoneditor.js"></script>
+<script src="webjars/json-editor__json-editor/2.15.1/dist/jsoneditor.js"></script>
 <script src="js/vendor/CustomPostForm.js"></script>
 
 <script>
diff --git a/dspace-server-webapp/src/main/webapp/js/hal/http/client.js b/dspace-server-webapp/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-server-webapp/src/main/resources/static/js/hal/http/client.js
diff --git a/dspace-server-webapp/src/main/webapp/js/vendor/CustomPostForm.js b/dspace-server-webapp/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-server-webapp/src/main/resources/static/js/vendor/CustomPostForm.js
diff --git a/dspace-server-webapp/src/main/webapp/login.html b/dspace-server-webapp/src/main/resources/static/login.html
similarity index 62%
rename from dspace-server-webapp/src/main/webapp/login.html
rename to dspace-server-webapp/src/main/resources/static/login.html
index 50d95b8047..959190020a 100644
--- a/dspace-server-webapp/src/main/webapp/login.html
+++ b/dspace-server-webapp/src/main/resources/static/login.html
@@ -32,7 +32,7 @@
             border-radius: 5px;
             box-shadow: 0 1px 2px rgba(0, 0, 0, .05);
         }
-        .form-signin .form-signin-heading, .form-signin .checkbox {
+        .form-signin .form-signin-heading, .form-signin {
             margin-bottom: 10px;
         }
         .form-signin input[type="text"], .form-signin input[type="password"] {
@@ -94,63 +94,71 @@
             "onclick" : function() { toastr.remove(); }
         }
 
+        // retrieves a valid CSRF token (please note that this method works both in DS 7 and DS 8)
+        // HTTP response code 403 is expected at this point (the response contains the DSPACE-XSRF-TOKEN header)
+        $.ajax({
+            url : window.location.href.replace("login.html", "") + 'api/authn/login',
+            type : 'POST',
+            error : function(xhr) {
+                // Check for an update to the CSRF Token & save to a MyHalBrowserCsrfToken cookie (if found)
+                checkForUpdatedCSRFTokenInResponse(xhr);
+            }
+        });
+
         // When the login page loads, we do *two* AJAX requests.
-        // (1) Call GET /api/authn/status. This call has two purposes. First, it checks to see if you are logged in,
-        //     (if not, WWW-Authenticate will return login options). Second, it retrieves the CSRF token, if a
-        //     new one has been assigned (as a valid CSRF token is required for the POST call).
+        // (1) Call GET /api/authn/status. This call checks to see if you are logged in
+        //     (if not, WWW-Authenticate will return login options).
         // (2) If that /api/authn/status call finds authentication data, call POST /api/authn/login.
-        //     This scenario occurs when you login via an external authentication system (e.g. Shibboleth)...
+        //     This scenario occurs when you log in via an external authentication system (e.g. Shibboleth)
         //     in which case the main role of /api/authn/login is to simply ensure the "Authorization" header
         //     is sent back to the client (based on your authentication data).
         $.ajax({
-          url : window.location.href.replace("login.html", "") + 'api/authn/status',
-          type : 'GET',
-          success : function(result, status, xhr) {
-            // Check for an update to the CSRF Token & save to a MyHalBrowserCsrfToken cookie (if found)
-            checkForUpdatedCSRFTokenInResponse(xhr);
+            url : window.location.href.replace("login.html", "") + 'api/authn/status',
+            type : 'GET',
+            success : function(result, status, xhr) {
 
-            // Check for WWW-Authenticate header. If found, this means we are not yet authenticated, and
-            // therefore we need to display available authentication options.
-            var authenticate = xhr.getResponseHeader("WWW-Authenticate");
-            if (authenticate !== null) {
-                var element = $('div.other-login-methods');
-                var realms = authenticate.match(/(\w+ (\w+=((".*?")|[^,]*)(, )?)*)/g);
-                if (realms.length == 1){
-                    var loc = /location="([^,]*)"/.exec(authenticate);
-                    if (loc !== null && loc.length === 2) {
-                        document.location = loc[1];
-                    }
-                } else if (realms.length > 1){
-                    for (var i = 0; i < realms.length; i++){
-                        addLocationButton(realms[i], element);
+                // Check for WWW-Authenticate header. If found, this means we are not yet authenticated, and
+                // therefore we need to display available authentication options.
+                var authenticate = xhr.getResponseHeader("WWW-Authenticate");
+                if (authenticate !== null && authenticate.includes('location=')) {
+                    var element = $('div.other-login-methods');
+                    var realms = authenticate.match(/(\w+ (\w+=((".*?")|[^,]*)(, )?)*)/g);
+                    if (realms.length === 1){
+                        var loc = /location="([^,]*)"/.exec(authenticate);
+                        if (loc !== null && loc.length === 2) {
+                            document.location = loc[1];
+                        }
+                    } else if (realms.length > 1){
+                        for (var i = 0; i < realms.length; i++){
+                            addLocationButton(realms[i], element);
+                        }
                     }
+                } else {
+                    // If Authentication data was found, do a POST /api/authn/login to ensure that data's JWT
+                    // is sent back in the "Authorization" header. This simply completes an external authentication
+                    // process (e.g. Shibboleth)
+                    $.ajax({
+                        url : window.location.href.replace("login.html", "") + 'api/authn/login',
+                        type : 'POST',
+                        beforeSend: function (xhr) {
+                            // If CSRF token found in cookie, send it back as X-XSRF-Token header
+                            var csrfToken = getCSRFToken();
+                            if (csrfToken != null) {
+                                xhr.setRequestHeader('X-XSRF-Token', csrfToken);
+                            }
+                        },
+                        success : successHandler,
+                        error : function(xhr) {
+                            // Check for an update to the CSRF Token & save to a MyHalBrowserCsrfToken cookie (if found)
+                            checkForUpdatedCSRFTokenInResponse(xhr);
+                            toastr.error('Failed to logged in. Please check for errors in Javascript console.', 'Login Failed');
+                        }
+                    });
                 }
-            } else {
-                // If Authentication data was found, do a POST /api/authn/login to ensure that data's JWT
-                // is sent back in the "Authorization" header. This simply completes an external authentication
-                // process (e.g. Shibboleth)
-                $.ajax({
-                  url : window.location.href.replace("login.html", "") + 'api/authn/login',
-                  type : 'POST',
-                  beforeSend: function (xhr, settings) {
-                       // If CSRF token found in cookie, send it back as X-XSRF-Token header
-                       var csrfToken = getCSRFToken();
-                       if (csrfToken != null) {
-                           xhr.setRequestHeader('X-XSRF-Token', csrfToken);
-                       }
-                  },
-                  success : successHandler,
-                  error : function(xhr, textStatus, errorThrown) {
-                      // Check for an update to the CSRF Token & save to a MyHalBrowserCsrfToken cookie (if found)
-                      checkForUpdatedCSRFTokenInResponse(xhr);
-                      toastr.error('Failed to logged in. Please check for errors in Javascript console.', 'Login Failed');
-                  }
-                });
+            },
+            error : function() {
+                toastr.error('Failed to connect with backend. Please check for errors in Javascript console.', 'Could Not Load');
             }
-          },
-          error : function(xhr, textStatus, errorThrown) {
-            toastr.error('Failed to connect with backend. Please check for errors in Javascript console.', 'Could Not Load');
-          }
         });
 
         function addLocationButton(realm, element){
@@ -166,22 +174,22 @@
             return string.charAt(0).toUpperCase() + string.slice(1);
         }
 
-       /**
-        * Check current response headers to see if the CSRF Token has changed. If a new value is found in headers,
-        * save the new value into our "MyHalBrowserCsrfToken" cookie.
-        **/
+        /**
+         * Check current response headers to see if the CSRF Token has changed. If a new value is found in headers,
+         * save the new value into our "MyHalBrowserCsrfToken" cookie.
+         **/
         function checkForUpdatedCSRFTokenInResponse(jqxhr) {
             // look for DSpace-XSRF-TOKEN header & save to our MyHalBrowserCsrfToken cookie (if found)
             var updatedCsrfToken = jqxhr.getResponseHeader('DSPACE-XSRF-TOKEN');
             if (updatedCsrfToken != null) {
-               document.cookie = "MyHalBrowserCsrfToken=" + updatedCsrfToken;
+                document.cookie = "MyHalBrowserCsrfToken=" + updatedCsrfToken;
             }
         }
 
-       /**
-        * Get CSRF Token by parsing it out of the "MyHalBrowserCsrfToken" cookie.
-        * This cookie is set in login.html after a successful login occurs.
-        **/
+        /**
+         * Get CSRF Token by parsing it out of the "MyHalBrowserCsrfToken" cookie.
+         * This cookie is set in login.html after a successful login occurs.
+         **/
         function getCSRFToken() {
             var cookie = document.cookie.match('(^|;)\\s*' + 'MyHalBrowserCsrfToken' + '\\s*=\\s*([^;]+)');
             if (cookie != null) {
@@ -204,11 +212,11 @@
                     user: $("#username").val(),
                     password: $("#password").val()
                 },
-                beforeSend: function (xhr, settings) {
+                beforeSend: function (xhr) {
                     // If CSRF token found in cookie, send it back as X-XSRF-Token header
                     var csrfToken = getCSRFToken();
                     if (csrfToken != null) {
-                       xhr.setRequestHeader('X-XSRF-Token', csrfToken);
+                        xhr.setRequestHeader('X-XSRF-Token', csrfToken);
                     }
                 },
                 success : successHandler,
diff --git a/dspace-server-webapp/src/main/webapp/styles.css b/dspace-server-webapp/src/main/resources/static/styles.css
similarity index 100%
rename from dspace-server-webapp/src/main/webapp/styles.css
rename to dspace-server-webapp/src/main/resources/static/styles.css
diff --git a/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml b/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
index eca9acf79f..e42b7386ab 100644
--- a/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
+++ b/dspace-server-webapp/src/test/data/dspaceFolder/config/item-submission.xml
@@ -135,28 +135,28 @@
             <heading>fake.workflow.readonly</heading> <processing-class>org.dspace.submit.step.SampleStep</processing-class> 
             <type>sample</type> <scope visibility="read-only">workflow</scope> </step-definition> -->
 
-        <!-- OpenAIRE submission steps/forms -->
-        <step-definition id="openAIREProjectForm" mandatory="true">
+        <!-- Openaire submission steps/forms -->
+        <step-definition id="openaireProjectForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREPersonForm" mandatory="true">
+        <step-definition id="openairePersonForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREOrganizationForm" mandatory="true">
+        <step-definition id="openaireOrganizationForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREPublicationPageoneForm" mandatory="true">
+        <step-definition id="openairePublicationPageoneForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREPublicationPagetwoForm" mandatory="true">
+        <step-definition id="openairePublicationPagetwoForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
@@ -259,13 +259,13 @@
             <step id="license"/>
         </submission-process>
 
-        <!-- OpenAIRE submission processes -->
-        <submission-process name="openAIREPublicationSubmission">
+        <!-- Openaire submission processes -->
+        <submission-process name="openairePublicationSubmission">
             <step id="collection"/>
 
             <!--Step will be to Describe the item. -->
-            <step id="openAIREPublicationPageoneForm"/>
-            <step id="openAIREPublicationPagetwoForm"/>
+            <step id="openairePublicationPageoneForm"/>
+            <step id="openairePublicationPagetwoForm"/>
 
             <!--Step will be to Upload the item -->
             <!-- step id="upload-with-embargo"/-->
@@ -274,17 +274,17 @@
             <!--Step will be to Sign off on the License -->
             <step id="license"/>
         </submission-process>
-        <submission-process name="openAIREPersonSubmission">
+        <submission-process name="openairePersonSubmission">
             <step id="collection"/>
-            <step id="openAIREPersonForm"/>
+            <step id="openairePersonForm"/>
         </submission-process>
-        <submission-process name="openAIREProjectSubmission">
+        <submission-process name="openaireProjectSubmission">
             <step id="collection"/>
-            <step id="openAIREProjectForm"/>
+            <step id="openaireProjectForm"/>
         </submission-process>
-        <submission-process name="openAIREOrganizationSubmission">
+        <submission-process name="openaireOrganizationSubmission">
             <step id="collection"/>
-            <step id="openAIREOrganizationForm"/>
+            <step id="openaireOrganizationForm"/>
         </submission-process>
     </submission-definitions>
 
diff --git a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
index 9db02440e4..b045865fe0 100644
--- a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
+++ b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/external-openaire.xml
@@ -4,8 +4,8 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
 	default-lazy-init="true">
 
-	<bean id="openAIRERestConnector"
-		class="org.dspace.external.OpenAIRERestConnector">
+	<bean id="openaireRestConnector"
+		class="org.dspace.external.OpenaireRestConnector">
 		<constructor-arg
 			value="${openaire.api.url:https://api.openaire.eu}" />
 		<property name="tokenEnabled"
@@ -18,10 +18,10 @@
 			value="${openaire.token.clientSecret}" />
 	</bean>
 	<bean
-		class="org.dspace.external.provider.impl.MockOpenAIREFundingDataProvider"
+		class="org.dspace.external.provider.impl.MockOpenaireFundingDataProvider"
 		init-method="init">
-		<property name="sourceIdentifier" value="openAIREFunding" />
-		<property name="connector" ref="openAIRERestConnector" />
+		<property name="sourceIdentifier" value="openaireFunding" />
+		<property name="connector" ref="openaireRestConnector" />
 		<property name="supportedEntityTypes">
 			<list>
 				<value>Project</value>
diff --git a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/test-discovery.xml b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/test-discovery.xml
index 4a91ef051e..dd78bffda3 100644
--- a/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/test-discovery.xml
+++ b/dspace-server-webapp/src/test/data/dspaceFolder/config/spring/api/test-discovery.xml
@@ -86,10 +86,12 @@
 
                 <!-- search for an entity that can be a Person or an OrgUnit -->
                 <entry key="personOrOrgunit" value-ref="personOrOrgunit"/>
-                <!-- OpenAIRE4 guidelines - search for an OrgUnit that have a specific dc.type=FundingOrganization -->
-                <entry key="openAIREFundingAgency" value-ref="openAIREFundingAgency"/>
+                <!-- Openaire4 guidelines - search for an OrgUnit that have a specific dc.type=FundingOrganization -->
+                <entry key="openaireFundingAgency" value-ref="openaireFundingAgency"/>
                 <entry key="eperson_claims" value-ref="eperson_claims"/>
-
+                <!-- COAR NOTIFY LDN MESSAGES configuration -->
+                <entry key="NOTIFY.incoming" value-ref="NOTIFY.incoming"/>
+                <entry key="NOTIFY.outgoing" value-ref="NOTIFY.outgoing"/>
 
                 <!-- Configuration for scope based tests -->
                 <!-- See org.dspace.app.rest.DiscoveryScopeBasedRestControllerIT for more information -->
@@ -1115,4 +1117,180 @@
         <property name="exposeMinAndMaxValue" value="true"/>
     </bean>
 
+    <bean id="ldnMessageEntityBaseConfig"
+          class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype">
+        <property name="id" value="ldnMessages" />
+        <!--Which sidebar facets are to be displayed -->
+        <property name="sidebarFacets">
+            <list>
+                <ref bean="searchFilterNotifyRelatedItem" />
+                <ref bean="searchFilterNotifyOrigin" />
+                <ref bean="searchFilterNotifyTarget" />
+                <ref bean="searchFilterNotifyQueueStatus" />
+                <ref bean="searchFilterNotifyActivityStreamType" />
+                <ref bean="searchFilterNotifyCoarNotifyType" />
+                <ref bean="searchFilterNotifyNotificationType" />
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page -->
+        <property name="searchFilters">
+            <list>
+                <ref bean="searchFilterNotifyRelatedItem" />
+                <ref bean="searchFilterNotifyOrigin" />
+                <ref bean="searchFilterNotifyTarget" />
+                <ref bean="searchFilterNotifyQueueStatus" />
+                <ref bean="searchFilterNotifyActivityStreamType" />
+                <ref bean="searchFilterNotifyCoarNotifyType" />
+                <ref bean="searchFilterNotifyNotificationType" />
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortLastModified"/>
+                        <ref bean="sortLastModifiedAsc"/>
+                        <ref bean="sortQueueLastStartTimeDesc"/>
+                        <ref bean="sortQueueLastStartTimeAsc"/>
+                        <ref bean="sortQueueAttemptsDesc"/>
+                        <ref bean="sortQueueAttemptsAsc"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+            </list>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10" />
+    </bean>
+
+    <bean id="NOTIFY.incoming" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="ldnMessageEntityBaseConfig">
+        <property name="id" value="NOTIFY.incoming"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="NOTIFY.outgoing" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="ldnMessageEntityBaseConfig">
+        <property name="id" value="NOTIFY.outgoing"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="searchFilterNotifyRelatedItem" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="relateditem"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyOrigin" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="origin"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyTarget" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="target"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyQueueStatus" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="queue_status"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyActivityStreamType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="activity_stream_type"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyCoarNotifyType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="coar_notify_type"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyNotificationType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="notification_type"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+
 </beans>
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 0000000000..8db55b6ded
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/TestApplication.java
@@ -0,0 +1,22 @@
+/**
+ * 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;
+
+/**
+ * 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/rdf/RdfIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rdf/RdfIT.java
index 85ab3dcadd..8db30d4ffb 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
@@ -117,7 +117,7 @@ public class RdfIT extends AbstractWebClientIntegrationTest {
         // Turtle response should include the RDF identifier of Community
         assertThat(response.getBody(), containsString(communityIdentifier));
         // Turtle response should also note that this Community is part of our Site object
-        assertThat(response.getBody(), containsString("dspace:isPartOfRepository  <" + siteIdentifier + "> ;"));
+        assertThat(response.getBody(), containsString("dspace:isPartOfRepository  <" + siteIdentifier + ">;"));
     }
 
     @Test
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java
index 4878cdecab..892e83c79d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ADSImportMetadataSourceServiceIT.java
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
index 1da807ad71..a95ae38618 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthenticationRestControllerIT.java
@@ -22,7 +22,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
@@ -36,11 +35,11 @@ import java.io.InputStream;
 import java.text.ParseException;
 import java.util.Base64;
 import java.util.Map;
-import javax.servlet.http.Cookie;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.servlet.http.Cookie;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
 import org.dspace.app.rest.authorization.Authorization;
@@ -791,7 +790,7 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
 
         // POSTing to /login should be a valid request...it just refreshes your token (see testRefreshToken())
         // However, in this case, we are POSTing with an *INVALID* CSRF Token in Header.
-        getClient().perform(post("/api/authn/login").with(csrf().useInvalidToken().asHeader())
+        getClient().perform(post("/api/authn/login").with(invalidCsrfToken())
                                                     .secure(true)
                                                     .cookie(cookies))
                    // Should return a 403 Forbidden, for an invalid CSRF token
@@ -944,7 +943,7 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
         //request a new token
         token = getAuthToken(eperson.getEmail(), password);
 
-        //Check if we succesfully authenticated again
+        //Check if we successfully authenticated again
         getClient(token).perform(get("/api/authn/status"))
                         .andExpect(status().isOk())
                         .andExpect(jsonPath("$.okay", is(true)))
@@ -1401,7 +1400,7 @@ public class AuthenticationRestControllerIT extends AbstractControllerIntegratio
 
         // Same request as prior method, but this time we are sending the CSRF token as a querystring param.
         // NOTE: getClient() method defaults to sending CSRF tokens as Headers, so we are overriding its behavior here
-        getClient(token).perform(post("/api/authn/shortlivedtokens").with(csrf()))
+        getClient(token).perform(post("/api/authn/shortlivedtokens").with(validCsrfTokenViaParam()))
             // BECAUSE we sent the CSRF token on querystring, it should be regenerated & a new token
             // is sent back (in cookie and header).
             .andExpect(cookie().exists("DSPACE-XSRF-COOKIE"))
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureRestRepositoryIT.java
index 0aadff7a99..c318a10387 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureRestRepositoryIT.java
@@ -37,12 +37,12 @@ public class AuthorizationFeatureRestRepositoryIT extends AbstractControllerInte
     @Autowired
     private AuthorizationFeatureService authzFeatureService;
 
-    @Test
     /**
-     * All the features should be returned
+     * All the features should be returned.
      *
      * @throws Exception
      */
+    @Test
     public void findAllTest() throws Exception {
         int featuresNum = authzFeatureService.findAll().size();
         int expReturn = featuresNum > 20 ? 20 : featuresNum;
@@ -62,20 +62,20 @@ public class AuthorizationFeatureRestRepositoryIT extends AbstractControllerInte
 
     }
 
-    @Test
     /**
      * The feature endpoint must provide proper pagination. Unauthorized and
      * forbidden scenarios are managed in the findAllTest
      *
      * @throws Exception
      */
+    @Test
     public void findAllWithPaginationTest() throws Exception {
         int featuresNum = authzFeatureService.findAll().size();
 
         String adminToken = getAuthToken(admin.getEmail(), password);
-        List<String> featureIDs = new ArrayList<String>();
+        List<String> featureIDs = new ArrayList<>();
         for (int page = 0; page < featuresNum; page++) {
-            AtomicReference<String> idRef = new AtomicReference<String>();
+            AtomicReference<String> idRef = new AtomicReference<>();
 
             getClient(adminToken)
                 .perform(get("/api/authz/features").param("page", String.valueOf(page)).param("size", "1"))
@@ -101,12 +101,13 @@ public class AuthorizationFeatureRestRepositoryIT extends AbstractControllerInte
         }
     }
 
-    @Test
     /**
-     * The feature resource endpoint must expose the proper structure and be reserved to administrators
+     * The feature resource endpoint must expose the proper structure and be
+     * reserved to administrators.
      *
      * @throws Exception
      */
+    @Test
     public void findOneTest() throws Exception {
         getClient().perform(get("/api/authz/features/withdrawItem")).andExpect(status().isOk())
                    .andExpect(jsonPath("$.id", is("withdrawItem")))
@@ -121,12 +122,12 @@ public class AuthorizationFeatureRestRepositoryIT extends AbstractControllerInte
 
     }
 
-    @Test
     /**
      * It should be possible to find features by resourcetype. The endpoint is only available to administrators
      *
      * @throws Exception
      */
+    @Test
     public void findByResourceTypeTest() throws Exception {
         AuthorizationFeature alwaysTrueFeature = authzFeatureService.find(AlwaysTrueFeature.NAME);
         String adminToken = getAuthToken(admin.getEmail(), password);
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureServiceIT.java
index 66be810352..31db90f54f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationFeatureServiceIT.java
@@ -49,12 +49,12 @@ public class AuthorizationFeatureServiceIT extends AbstractControllerIntegration
     @Autowired
     private AuthorizationFeatureService authzFeatureService;
 
-    @Test
     /**
-     * All the features available in the Sprint Context should be returned
+     * All the features available in the Sprint Context should be returned.
      *
      * @throws Exception
      */
+    @Test
     public void findAllTest() throws Exception {
         List<AuthorizationFeature> authzFeatureServiceFindAll = authzFeatureService.findAll();
 
@@ -70,12 +70,13 @@ public class AuthorizationFeatureServiceIT extends AbstractControllerIntegration
                 equalTo(featureNames.size()));
     }
 
-    @Test
     /**
-     * The find method should return existing feature and null in the case the feature doesn't exist
+     * The find method should return existing feature  or {@code null} in the
+     * case the feature doesn't exist.
      *
      * @throws Exception
      */
+    @Test
     public void findTest() throws Exception {
         AuthorizationFeature aFeature = authzFeatureService.find(AlwaysTrueFeature.NAME);
         assertThat("check that one of our mock feature is retrieved", aFeature.getName(),
@@ -85,12 +86,12 @@ public class AuthorizationFeatureServiceIT extends AbstractControllerIntegration
         assertThat("check that not existing feature name return null", aNotExistingFeature, equalTo(null));
     }
 
-    @Test
     /**
-     * The findByResourceType must return only features that support the specified type
+     * The findByResourceType must return only features that support the specified type.
      *
      * @throws Exception
      */
+    @Test
     public void findByResourceTypeTest() throws Exception {
         // we have at least one feature that support the Site object
         final String siteUniqueType = SiteRest.CATEGORY + "." + SiteRest.NAME;
@@ -119,12 +120,13 @@ public class AuthorizationFeatureServiceIT extends AbstractControllerIntegration
         assertThat(notExistingTypeFeatures.size(), equalTo(0));
     }
 
-    @Test
     /**
-     * The isAuthorized must return true for authorized feature and false for not authorized feature
+     * The isAuthorized must return {@code true} for authorized feature and
+     * {@code false} for not authorized feature.
      *
      * @throws Exception
      */
+    @Test
     public void isAuthorizedTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java
index c334d110b1..9fcf1bab47 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/AuthorizationRestRepositoryIT.java
@@ -70,7 +70,7 @@ import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilde
 
 /**
  * Test suite for the Authorization endpoint
- * 
+ *
  * @author Andrea Bollini (andrea.bollini at 4science.it)
  *
  */
@@ -99,37 +99,37 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
     private Utils utils;
     private SiteService siteService;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link AlwaysTrueFeature}
      */
     private AuthorizationFeature alwaysTrue;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link AlwaysFalseFeature}
      */
     private AuthorizationFeature alwaysFalse;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link AlwaysThrowExceptionFeature}
      */
     private AuthorizationFeature alwaysException;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link TrueForAdminsFeature}
      */
     private AuthorizationFeature trueForAdmins;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link TrueForLoggedUsersFeature}
      */
     private AuthorizationFeature trueForLoggedUsers;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link TrueForTestFeature}
      */
     private AuthorizationFeature trueForTestUsers;
 
-    /** 
+    /**
      * this hold a reference to the test feature {@link TrueForUsersInGroupTestFeature}
      */
     private AuthorizationFeature trueForUsersInGroupTest;
@@ -150,12 +150,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
         configurationService.setProperty("webui.user.assumelogin", true);
     }
 
-    @Test
     /**
      * This method is not implemented
      *
      * @throws Exception
      */
+    @Test
     public void findAllTest() throws Exception {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(get("/api/authz/authorizations"))
@@ -164,12 +164,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .andExpect(status().isMethodNotAllowed());
     }
 
-    @Test
     /**
      * Verify that an user can access a specific authorization
      *
      * @throws Exception
      */
+    @Test
     public void findOneTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -206,12 +206,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                             Matchers.is(AuthorizationMatcher.matchAuthorization(authAnonymousUserSite))));
     }
 
-    @Test
     /**
      * Verify that the unauthorized return code is used in the appropriate scenarios
      *
      * @throws Exception
      */
+    @Test
     public void findOneUnauthorizedTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -229,12 +229,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .andExpect(status().isUnauthorized());
     }
 
-    @Test
     /**
      * Verify that the forbidden return code is used in the appropriate scenarios
      *
      * @throws Exception
      */
+    @Test
     public void findOneForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
         Site site = siteService.findSite(context);
@@ -265,12 +265,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .andExpect(status().isForbidden());
     }
 
-    @Test
     /**
      * Verify that the not found return code is used in the appropriate scenarios
      *
      * @throws Exception
      */
+    @Test
     public void findOneNotFoundTest() throws Exception {
         context.turnOffAuthorisationSystem();
         Site site = siteService.findSite(context);
@@ -352,12 +352,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
     }
 
-    @Test
     /**
      * Verify that an exception in the feature check will be reported back
      *
      * @throws Exception
      */
+    @Test
     public void findOneInternalServerErrorTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -375,16 +375,16 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .andExpect(status().isInternalServerError());
     }
 
-    @Test
     /**
      * Verify that the search by object works properly in allowed scenarios:
      * - for an administrator
      * - for an administrator that want to inspect permission of the anonymous users or another user
      * - for a logged-in "normal" user
      * - for anonymous
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -547,7 +547,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.size", is(20)))
             .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(2)));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("projection", "full")
                 .param("uri", siteUri)
@@ -589,7 +589,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.size", is(20)))
             .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(2)));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("projection", "full")
                 .param("uri", siteUri)
@@ -667,13 +667,13 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(1)));
     }
 
-    @Test
     /**
      * Verify that the findByObject return an empty page when the requested object doesn't exist but the uri is
      * potentially valid (i.e. deleted object)
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByNotExistingObjectTest() throws Exception {
         String wrongSiteUri = "http://localhost/api/core/sites/" + UUID.randomUUID();
 
@@ -726,7 +726,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.size", is(20)))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", wrongSiteUri)
                 .param("eperson", eperson.getID().toString()))
@@ -737,7 +737,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.size", is(20)))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", wrongSiteUri)
                 .header("X-On-Behalf-Of", eperson.getID()))
@@ -759,12 +759,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
     }
 
-    @Test
     /**
      * Verify that the findByObject return the 400 Bad Request response for invalid or missing URI (required parameter)
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectBadRequestTest() throws Exception {
         String[] invalidUris = new String[] {
                 "invalid-uri",
@@ -803,14 +803,14 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .param("uri", invalidUri))
                 .andExpect(status().isBadRequest());
 
-            // verify that it works for administators inspecting other users with an invalid or missing uri - by
+            // verify that it works for administrators inspecting other users with an invalid or missing uri - by
             // using the eperson parameter
             getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                     .param("uri", invalidUri)
                     .param("eperson", eperson.getID().toString()))
                 .andExpect(status().isBadRequest());
 
-            // verify that it works for administators inspecting other users with an invalid or missing uri - by
+            // verify that it works for administrators inspecting other users with an invalid or missing uri - by
             // assuming login
             getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                     .param("uri", invalidUri)
@@ -837,12 +837,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isBadRequest());
     }
 
-    @Test
     /**
      * Verify that the findByObject return the 401 Unauthorized response when an eperson is involved
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectUnauthorizedTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -876,13 +876,13 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isUnauthorized());
     }
 
-    @Test
     /**
      * Verify that the findByObject return the 403 Forbidden response when a non-admin eperson try to search the
-     * authorization of another eperson
-     * 
+     * authorization of another eperson.
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectForbiddenTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -920,11 +920,11 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isForbidden());
     }
 
-    @Test
     /**
      * Verify that an exception in the feature check will be reported back
      * @throws Exception
      */
+    @Test
     public void findByObjectInternalServerErrorTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -977,16 +977,18 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isInternalServerError());
     }
 
-    @Test
     /**
-     * Verify that the search by object and feature works properly in allowed scenarios:
-     * - for an administrator
-     * - for an administrator that want to inspect permission of the anonymous users or another user
-     * - for a logged-in "normal" user
-     * - for anonymous
-     * 
+     * Verify that the search by object and feature works properly in allowed scenarios.
+     * <ul>
+     *  <li>for an administrator</li>
+     *  <li>for an administrator that wants to inspect permission of the anonymous users or another user</li>
+     *  <li>for a logged-in "normal" user</li>
+     *  <li>for a not-logged-in "normal" user</li>
+     * </ul>
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectAndFeatureTest() throws Exception {
         context.turnOffAuthorisationSystem();
         Community com = CommunityBuilder.createCommunity(context).withName("A test community").build();
@@ -1081,7 +1083,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                         )
                 )));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", comUri)
                 .param("projection", "level")
@@ -1103,7 +1105,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                         )
                 )));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", comUri)
                 .param("projection", "level")
@@ -1146,12 +1148,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 )));
     }
 
-    @Test
     /**
      * Verify that the search by object and feature works return 204 No Content when a feature is not granted
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectAndFeatureNotGrantedTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -1187,14 +1189,14 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 .param("feature", trueForAdmins.getName()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("feature", trueForAdmins.getName())
                 .param("eperson", eperson.getID().toString()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", siteUri)
                 .param("feature", trueForAdmins.getName())
@@ -1208,13 +1210,13 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
     }
 
-    @Test
     /**
      * Verify that the findByObject return the 204 No Content code when the requested object doesn't exist but the uri
      * is potentially valid (i.e. deleted object) or the feature doesn't exist
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByNotExistingObjectAndFeatureTest() throws Exception {
         String wrongSiteUri = "http://localhost/api/core/sites/" + UUID.randomUUID();
         Site site = siteService.findSite(context);
@@ -1277,7 +1279,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 .param("feature", "not-existing-feature"))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", wrongSiteUri)
                 .param("feature", alwaysTrue.getName())
@@ -1290,7 +1292,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 .param("eperson", eperson.getID().toString()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                 .param("uri", wrongSiteUri)
                 .param("feature", alwaysTrue.getName())
@@ -1315,13 +1317,13 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
     }
 
-    @Test
     /**
-     * Verify that the findByObject return the 400 Bad Request response for invalid or missing URI or feature (required
-     * parameters)
+     * Verify that the findByObject return the 400 Bad Request response for
+     * invalid or missing URI or feature (required parameters).
      *
      * @throws Exception
      */
+    @Test
     public void findByObjectAndFeatureBadRequestTest() throws Exception {
         String[] invalidUris = new String[] {
                 "invalid-uri",
@@ -1366,7 +1368,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .param("feature", alwaysTrue.getName()))
                 .andExpect(status().isBadRequest());
 
-            // verify that it works for administators inspecting other users with an invalid or missing uri - by
+            // verify that it works for administrators inspecting other users with an invalid or missing uri - by
             // using the eperson parameter
             getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                     .param("uri", invalidUri)
@@ -1374,7 +1376,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                     .param("eperson", eperson.getID().toString()))
                 .andExpect(status().isBadRequest());
 
-            // verify that it works for administators inspecting other users with an invalid or missing uri - by
+            // verify that it works for administrators inspecting other users with an invalid or missing uri - by
             // assuming login
             getClient(adminToken).perform(get("/api/authz/authorizations/search/object")
                     .param("uri", invalidUri)
@@ -1390,12 +1392,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
         }
     }
 
-    @Test
     /**
      * Verify that the findByObjectAndFeature return the 401 Unauthorized response when an eperson is involved
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectAndFeatureUnauthorizedTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -1433,13 +1435,14 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isUnauthorized());
     }
 
-    @Test
     /**
-     * Verify that the findByObjectAndFeature return the 403 Forbidden response when a non-admin eperson try to search
-     * the authorization of another eperson
-     * 
+     * Verify that the findByObjectAndFeature returns the 403 Forbidden response
+     * when a non-admin eperson tries to search the authorization of another
+     * eperson.
+     *
      * @throws Exception
      */
+    @Test
     public void findByObjectAndFeatureForbiddenTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -1481,11 +1484,11 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isForbidden());
     }
 
-    @Test
     /**
-     * Verify that an exception in the feature check will be reported back
+     * Verify that an exception in the feature check will be reported back.
      * @throws Exception
      */
+    @Test
     public void findByObjectAndFeatureInternalServerErrorTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -1528,16 +1531,18 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isInternalServerError());
     }
 
-    @Test
     /**
-     * Verify that the search by multiple objects and features works properly in allowed scenarios:
-     * - for an administrator
-     * - for an administrator that want to inspect permission of the anonymous users or another user
-     * - for a logged-in "normal" user
-     * - for anonymous
+     * Verify that the search by multiple objects and features works properly in allowed scenarios.
+     * <ul>
+     *  <li>for an administrator</li>
+     *  <li>for an administrator that wants to inspect permission of the anonymous users or another user</li>
+     *  <li>for a logged-in "normal" user</li>
+     *  <li>for a not-logged-in user</li>
+     * </ul>
      *
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeaturesTest() throws Exception {
         context.turnOffAuthorisationSystem();
         Community com = CommunityBuilder.createCommunity(context).withName("A test community").build();
@@ -1554,7 +1559,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         Supplier<MockHttpServletRequestBuilder> baseFeatureRequest = () ->
             get("/api/authz/authorizations/search/objects")
-                .param("type", "core.community")
+                .param("type", "core.communities")
                 .param("uuid", comId)
                 .param("uuid", secondComId)
                 .param("projection", "level")
@@ -1777,7 +1782,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 )
             )));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(baseFeatureRequest.get()
             .param("eperson", eperson.getID().toString()))
             .andExpect(status().isOk())
@@ -1825,7 +1830,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 )
             )));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(baseFeatureRequest.get()
             .header("X-On-Behalf-Of", eperson.getID()))
             .andExpect(status().isOk())
@@ -1899,16 +1904,19 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             )));
     }
 
-    @Test
     /**
-     * Verify that the paginated search by multiple objects and features works properly in allowed scenarios:
-     * - for an administrator
-     * - for an administrator that want to inspect permission of the anonymous users or another user
-     * - for a logged-in "normal" user
-     * - for anonymous
+     * Verify that the paginated search by multiple objects and features works
+     * properly in allowed scenarios.
+     * <ul>
+     * <li>for an administrator</li>
+     * <li>for an administrator that wants to inspect permission of the anonymous users or another user</li>
+     * <li>for a logged-in "normal" user</li>
+     * <li>for a not-logged-in user</li>
+     * </ul>
      *
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeaturesPaginationTest() throws Exception {
         context.turnOffAuthorisationSystem();
 
@@ -1927,7 +1935,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         Supplier<MockHttpServletRequestBuilder> baseFeatureRequest = () ->
             get("/api/authz/authorizations/search/objects")
-                .param("type", "core.community")
+                .param("type", "core.communities")
                 .param("uuid", comId)
                 .param("uuid", secondComId)
                 .param("projection", "level")
@@ -2029,7 +2037,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                                    )
                                )));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(baseFeatureRequest.get()
                                                         .param("eperson", eperson.getID().toString()))
                              .andExpect(status().isOk())
@@ -2052,7 +2060,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                                  )
                              )));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(baseFeatureRequest.get()
                                                         .header("X-On-Behalf-Of", eperson.getID()))
                              .andExpect(status().isOk())
@@ -2098,12 +2106,12 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                                        )));
     }
 
-    @Test
     /**
      * Verify that the search by many objects and features works return 204 No Content when no feature is granted.
      *
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeatureNotGrantedTest() throws Exception {
 
         context.turnOffAuthorisationSystem();
@@ -2123,7 +2131,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for administrators - with eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
@@ -2132,7 +2140,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for administrators - without eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
@@ -2143,7 +2151,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for normal loggedin users - with eperson parameter
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
@@ -2153,16 +2161,16 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for normal loggedin users - without eperson parameter
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
             .param("feature", trueForAdmins.getName()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
@@ -2170,9 +2178,9 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .param("eperson", eperson.getID().toString()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
@@ -2182,7 +2190,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for anonymous users
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("uuid", itemId)
             .param("uuid", secondItemId)
             .param("feature", alwaysFalse.getName())
@@ -2190,14 +2198,15 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
     }
 
-    @Test
     /**
      * Verify that the find by multiple objects and features
-     * return the 204 No Content code when the requested object doesn't exist but the uri
-     * is potentially valid (i.e. deleted object) or the feature doesn't exist
+     * return the 204 No Content code when the requested object doesn't exist
+     * but the uri is potentially valid (a deleted object) or the feature
+     * doesn't exist.
      *
      * @throws Exception
      */
+    @Test
     public void findByNotExistingMultipleObjectsAndFeatureTest() throws Exception {
         String wrongSiteId = UUID.randomUUID().toString();
         Site site = siteService.findSite(context);
@@ -2210,7 +2219,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for administrators, no result - with eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", alwaysTrue.getName())
             .param("eperson", admin.getID().toString()))
@@ -2218,7 +2227,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-feature")
             .param("eperson", admin.getID().toString()))
@@ -2226,13 +2235,13 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for administrators, no result - without eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", alwaysTrue.getName()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", "not-existing-feature"))
@@ -2242,7 +2251,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for normal loggedin users - with eperson parameter
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", alwaysTrue.getName())
@@ -2250,7 +2259,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", "not-existing-feature")
@@ -2259,22 +2268,22 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for normal loggedin users - without eperson parameter
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", alwaysTrue.getName()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", "not-existing-feature"))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by using the eperson parameter
+        // verify that it works for administrators inspecting other users - by using the eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", alwaysTrue.getName())
@@ -2282,16 +2291,16 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", "not-existing-feature")
             .param("eperson", eperson.getID().toString()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
-        // verify that it works for administators inspecting other users - by assuming login
+        // verify that it works for administrators inspecting other users - by assuming login
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", alwaysTrue.getName())
@@ -2299,7 +2308,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", "not-existing-feature")
@@ -2308,27 +2317,27 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for anonymous users
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", alwaysTrue.getName()))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
 
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", wrongSiteId)
             .param("feature", "not-existing-one")
             .param("feature", "not-existing-feature"))
             .andExpect(jsonPath("$.page.totalElements", is(0)));
     }
 
-    @Test
     /**
      * Verify that the find by multiple objects and features
      * return the 400 Bad Request response for invalid or missing UUID or type
      *
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeatureBadRequestTest() throws Exception {
         String[] invalidUris = new String[] {
             "foo",
@@ -2344,7 +2353,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
             // verify that it works for administrators with an invalid or missing uuid - with eperson parameter
             getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2355,7 +2364,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
             // verify that it works for administrators with an invalid or missing uuid - without eperson parameter
             getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2365,7 +2374,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
             // verify that it works for normal loggedin users with an invalid or missing uuid - with eperson parameter
             getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2377,7 +2386,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             // verify that it works for normal loggedin users with an invalid or missing
             // uuid - without eperson parameter
             getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2385,10 +2394,10 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 .param("feature", alwaysTrue.getName()))
                 .andExpect(status().isBadRequest());
 
-            // verify that it works for administators inspecting other users with an invalid or missing uri - by
+            // verify that it works for administrators inspecting other users with an invalid or missing uri - by
             // using the eperson parameter
             getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2397,10 +2406,10 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 .param("eperson", eperson.getID().toString()))
                 .andExpect(status().isBadRequest());
 
-            // verify that it works for administators inspecting other users with an invalid or missing uri - by
+            // verify that it works for administrators inspecting other users with an invalid or missing uri - by
             // assuming login
             getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2411,7 +2420,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
             // verify that it works for anonymous users with an invalid or missing uri
             getClient().perform(get("/api/authz/authorizations/search/objects")
-                .param("type", "core.item")
+                .param("type", "core.items")
                 .param("uuid", "foo")
                 .param("uuid", "")
                 .param("uuid", "invalid")
@@ -2436,18 +2445,18 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that returns bad request for missing uuid
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.item")
+            .param("type", "core.items")
             .param("feature", alwaysTrue.getName()))
             .andExpect(status().isBadRequest());
     }
 
-    @Test
     /**
      * Verify that the find by multiple objects and features return
      * the 401 Unauthorized response when an eperson is involved
      *
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeatureUnauthorizedTest() throws Exception {
         Site site = siteService.findSite(context);
         String siteId = site.getID().toString();
@@ -2457,7 +2466,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for an anonymous user inspecting an admin user - by using the eperson parameter
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysTrue.getName())
             .param("eperson", admin.getID().toString()))
@@ -2465,7 +2474,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for an anonymous user inspecting an admin user - by assuming login
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysTrue.getName())
             .header("X-On-Behalf-Of", admin.getID()))
@@ -2473,7 +2482,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for an anonymous user inspecting a normal user - by using the eperson parameter
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysTrue.getName())
             .param("eperson", eperson.getID().toString()))
@@ -2481,14 +2490,13 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for an anonymous user inspecting a normal user - by assuming login
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysTrue.getName())
             .header("X-On-Behalf-Of", eperson.getID()))
             .andExpect(status().isUnauthorized());
     }
 
-    @Test
     /**
      * Verify that the find by multiple objects and features
      * returns the 403 Forbidden response when a non-admin eperson try to search
@@ -2496,6 +2504,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
      *
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeatureForbiddenTest() throws Exception {
         Site site = siteService.findSite(context);
         String siteId = site.getID().toString();
@@ -2510,7 +2519,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that admin cannot search the admin authorizations - by using the eperson parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysFalse.getName())
             .param("feature", alwaysTrue.getName())
@@ -2519,7 +2528,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that admin cannot search the admin authorizations - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysFalse.getName())
             .param("feature", alwaysTrue.getName())
@@ -2528,7 +2537,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that eperson cannot search the authorizations of another "normal" eperson - by using the parameter
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysFalse.getName())
             .param("feature", alwaysTrue.getName())
@@ -2537,7 +2546,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that eperson cannot search the authorizations of another "normal" eperson - by assuming login
         getClient(anotherToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysFalse.getName())
             .param("feature", alwaysTrue.getName())
@@ -2545,11 +2554,11 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
             .andExpect(status().isForbidden());
     }
 
-    @Test
     /**
      * Verify that an exception in the multiple authorization features check will be reported back
      * @throws Exception
      */
+    @Test
     public void findByMultipleObjectsAndFeatureInternalServerErrorTest() throws Exception {
         Site site = siteService.findSite(context);
         String siteId = site.getID().toString();
@@ -2558,7 +2567,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for administrators - with eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysException.getName())
             .param("eperson", admin.getID().toString()))
@@ -2566,7 +2575,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for administrators - without eperson parameter
         getClient(adminToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysException.getName()))
             .andExpect(status().isInternalServerError());
@@ -2575,7 +2584,7 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for normal loggedin users - with eperson parameter
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysException.getName())
             .param("eperson", eperson.getID().toString()))
@@ -2583,27 +2592,27 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
 
         // verify that it works for normal loggedin users - without eperson parameter
         getClient(epersonToken).perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysException.getName()))
             .andExpect(status().isInternalServerError());
 
         // verify that it works for anonymous users
         getClient().perform(get("/api/authz/authorizations/search/objects")
-            .param("type", "core.site")
+            .param("type", "core.sites")
             .param("uuid", siteId)
             .param("feature", alwaysException.getName()))
             .andExpect(status().isInternalServerError());
     }
 
-    @Test
     /**
      * This test will check that special group are correctly used to verify
-     * authorization for the current loggedin user but not inherited from the
+     * authorization for the current logged-in user but not inherited from the
      * Administrators login when they look to authorization of third users
-     * 
+     *
      * @throws Exception
      */
+    @Test
     public void verifySpecialGroupMembershipTest() throws Exception {
         Site site = siteService.findSite(context);
         SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
@@ -2802,5 +2811,4 @@ public class AuthorizationRestRepositoryIT extends AbstractControllerIntegration
                 + id.toString();
     }
 
-
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
index 855fedbaa2..4dca18d65d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestControllerIT.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.app.rest;
 
+import static jakarta.mail.internet.MimeUtility.encodeText;
 import static java.util.UUID.randomUUID;
-import static javax.mail.internet.MimeUtility.encodeText;
 import static org.apache.commons.codec.CharEncoding.UTF_8;
 import static org.apache.commons.collections.CollectionUtils.isEmpty;
 import static org.apache.commons.io.IOUtils.toInputStream;
@@ -49,6 +49,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.time.Period;
 import java.util.UUID;
 
 import org.apache.commons.io.IOUtils;
@@ -405,7 +406,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("6 months")
+                .withEmbargoPeriod(Period.ofMonths(6))
                 .build();
         }
         context.restoreAuthSystemState();
@@ -449,7 +450,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
             context.restoreAuthSystemState();
@@ -492,7 +493,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("-3 months")
+                .withEmbargoPeriod(Period.ofMonths(-3))
                 .build();
         }
             context.restoreAuthSystemState();
@@ -570,7 +571,7 @@ public class BitstreamRestControllerIT extends AbstractControllerIntegrationTest
                     .withName("Bitstream")
                     .withDescription("Description")
                     .withMimeType("text/plain")
-                    .withEmbargoPeriod("2 week")
+                    .withEmbargoPeriod(Period.ofWeeks(2))
                     .build();
         }
         context.restoreAuthSystemState();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
index bd79dc2f2b..a18dde701b 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BitstreamRestRepositoryIT.java
@@ -7,8 +7,8 @@
  */
 package org.dspace.app.rest;
 
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-import static javax.servlet.http.HttpServletResponse.SC_OK;
+import static jakarta.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static jakarta.servlet.http.HttpServletResponse.SC_OK;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadata;
 import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataDoesNotExist;
 import static org.dspace.app.rest.repository.patch.operation.BitstreamRemoveOperation.OPERATION_PATH_BITSTREAM_REMOVE;
@@ -25,12 +25,13 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.InputStream;
+import java.time.Period;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
 import org.dspace.app.rest.matcher.BitstreamFormatMatcher;
@@ -49,6 +50,7 @@ import org.dspace.builder.BundleBuilder;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.ItemBuilder;
 import org.dspace.builder.ResourcePolicyBuilder;
 import org.dspace.content.Bitstream;
@@ -310,7 +312,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
         context.restoreAuthSystemState();
@@ -363,7 +365,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType(bitstreamFormat.getMIMEType())
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
         context.restoreAuthSystemState();
@@ -517,7 +519,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -577,7 +579,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType(bitstreamFormat.getMIMEType())
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -638,7 +640,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -701,7 +703,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType(bitstreamFormat.getMIMEType())
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -768,7 +770,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -826,7 +828,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -1307,7 +1309,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
         getClient(token)
             .perform(patch("/api/core/bitstreams/" + bitstream.getID())
             .content(requestBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isOk())
             .andExpect(
                  jsonPath("$.metadata",
@@ -1945,7 +1947,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                                       .withTitle("Test")
                                       .withIssueDate("2010-10-17")
                                       .withAuthor("Smith, Donald")
-                                      .withEmbargoPeriod("6 months")
+                                      .withEmbargoPeriod(Period.ofMonths(6))
                                       .build();
 
         String bitstreamContent = "This is an archived bitstream";
@@ -2418,7 +2420,7 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withName("Test Embargoed Bitstream")
                 .withDescription("This bitstream is embargoed")
                 .withMimeType("text/plain")
-                .withEmbargoPeriod("3 months")
+                .withEmbargoPeriod(Period.ofMonths(3))
                 .build();
         }
 
@@ -2767,10 +2769,12 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                                           .withEmail("col2admin@test.com")
                                           .withPassword(password)
                                           .build();
-        Group col1_AdminGroup = collectionService.createAdministrators(context, col1);
-        Group col2_AdminGroup = collectionService.createAdministrators(context, col2);
-        groupService.addMember(context, col1_AdminGroup, col1Admin);
-        groupService.addMember(context, col2_AdminGroup, col2Admin);
+        Group col1_AdminGroup = GroupBuilder.createCollectionAdminGroup(context, col1)
+                .addMember(col1Admin)
+                .build();
+        Group col2_AdminGroup = GroupBuilder.createCollectionAdminGroup(context, col2)
+                .addMember(col2Admin)
+                .build();
         Item publicItem1 = ItemBuilder.createItem(context, col1)
                                       .withTitle("Test item 1")
                                       .build();
@@ -2871,8 +2875,9 @@ public class BitstreamRestRepositoryIT extends AbstractControllerIntegrationTest
                                           .withEmail("parentComAdmin@test.com")
                                           .withPassword(password)
                                           .build();
-        Group parentComAdminGroup = communityService.createAdministrators(context, parentCommunity);
-        groupService.addMember(context, parentComAdminGroup, parentCommunityAdmin);
+        Group parentComAdminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity)
+                .addMember(parentCommunityAdmin)
+                .build();
         Item publicItem1 = ItemBuilder.createItem(context, col1)
                                       .withTitle("Test item 1")
                                       .build();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
index d1791ab872..8f28c50610 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BrowsesResourceControllerIT.java
@@ -21,6 +21,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
+import java.time.Period;
+
 import org.dspace.app.rest.matcher.BrowseEntryResourceMatcher;
 import org.dspace.app.rest.matcher.BrowseIndexMatcher;
 import org.dspace.app.rest.matcher.ItemMatcher;
@@ -776,7 +778,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                                         .withIssueDate("2017-08-10")
                                         .withAuthor("Mouse, Mickey")
                                         .withSubject("Cartoons").withSubject("Mice")
-                                        .withEmbargoPeriod("12 months")
+                                        .withEmbargoPeriod(Period.ofMonths(12))
                                         .build();
 
         //5. An item that is only readable for an internal groups
@@ -909,7 +911,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                                         .withIssueDate("2017-08-10")
                                         .withAuthor("Mouse, Mickey")
                                         .withSubject("Cartoons").withSubject("Mice")
-                                        .withEmbargoPeriod("12 months")
+                                        .withEmbargoPeriod(Period.ofMonths(12))
                                         .build();
 
         //5. An item that is only readable for an internal groups
@@ -1454,7 +1456,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    .andExpect(jsonPath("$._embedded.entries",
                                        contains(BrowseEntryResourceMatcher.matchBrowseEntry("Turing, Alan Mathison", 1)
                                        )))
-                   //Verify that the startsWith paramater is included in the links
+                   //Verify that the startsWith parameter is included in the links
                     .andExpect(jsonPath("$._links.self.href", containsString("?startsWith=T")));
 
         //** WHEN **
@@ -1477,7 +1479,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    .andExpect(jsonPath("$._embedded.entries",
                                        contains(BrowseEntryResourceMatcher.matchBrowseEntry("Computing", 3)
                                        )))
-                   //Verify that the startsWith paramater is included in the links
+                   //Verify that the startsWith parameter is included in the links
                     .andExpect(jsonPath("$._links.self.href", containsString("?startsWith=C")));
 
     };
@@ -1579,7 +1581,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                                        contains(BrowseEntryResourceMatcher.matchBrowseEntry("Ögren, Name", 1),
                                                 BrowseEntryResourceMatcher.matchBrowseEntry("Ortiz, Nombre", 1)
                                                )))
-                   //Verify that the startsWith paramater is included in the links
+                   //Verify that the startsWith parameter is included in the links
                    .andExpect(jsonPath("$._links.self.href", containsString("?startsWith=Ó")));
 
 
@@ -1606,7 +1608,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                                                 BrowseEntryResourceMatcher.matchBrowseEntry("Teléfono", 1),
                                                 BrowseEntryResourceMatcher.matchBrowseEntry("Televisor", 1)
                                                )))
-                   //Verify that the startsWith paramater is included in the links
+                   //Verify that the startsWith parameter is included in the links
                    .andExpect(jsonPath("$._links.self.href", containsString("?startsWith=Tele")));
 
         //** WHEN **
@@ -1629,7 +1631,7 @@ public class BrowsesResourceControllerIT extends AbstractControllerIntegrationTe
                    .andExpect(jsonPath("$._embedded.entries",
                                        contains(BrowseEntryResourceMatcher.matchBrowseEntry("Guion", 1)
                                                )))
-                   //Verify that the startsWith paramater is included in the links
+                   //Verify that the startsWith parameter is included in the links
                    .andExpect(jsonPath("$._links.self.href", containsString("?startsWith=Guión")));
 
     };
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java
index 6b148e88e1..628e090a1b 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleRestRepositoryIT.java
@@ -22,9 +22,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
 import org.dspace.app.rest.matcher.BitstreamMatcher;
@@ -567,7 +567,7 @@ public class BundleRestRepositoryIT extends AbstractControllerIntegrationTest {
         getClient(token)
             .perform(patch("/api/core/bundles/" + bundle1.getID())
             .content(requestBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isOk())
             .andExpect(
                  jsonPath("$.metadata",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java
index f80b194ca6..9f1a232121 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/BundleUploadBitstreamControllerIT.java
@@ -387,7 +387,7 @@ public class BundleUploadBitstreamControllerIT extends AbstractEntityIntegration
                                 BitstreamMatcher.matchBitstreamEntry(UUID.fromString(bitstreamId), file.getSize()))));
     }
 
-    // TODO This test doesn't work either as it seems that only the first file is ever transfered into the request
+    // TODO This test doesn't work either as it seems that only the first file is ever transferred into the request
     // Thus we cannot check for this and we have no way of knowing how many files we gave to the request
     @Test
     @Ignore
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
index eb49661259..0aaf456808 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseAddPatchOperationIT.java
@@ -18,8 +18,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.dspace.app.rest.model.patch.AddOperation;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
index dd2b99d158..78ad735d3f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CCLicenseRemovePatchOperationIT.java
@@ -17,8 +17,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.dspace.app.rest.model.patch.AddOperation;
 import org.dspace.app.rest.model.patch.Operation;
 import org.dspace.app.rest.model.patch.RemoveOperation;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java
index 87f1bf7d8d..b8d21fb7a7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CiniiImportMetadataSourceServiceIT.java
@@ -51,7 +51,7 @@ public class CiniiImportMetadataSourceServiceIT extends AbstractLiveImportIntegr
         InputStream ciniiRefResp2 = null;
         InputStream ciniiRefResp3 = null;
         try {
-            ciniiRefResp = getClass().getResourceAsStream("cinii-responce-ids.xml");
+            ciniiRefResp = getClass().getResourceAsStream("cinii-response-ids.xml");
             ciniiRefResp2 = getClass().getResourceAsStream("cinii-first.xml");
             ciniiRefResp3 = getClass().getResourceAsStream("cinii-second.xml");
 
@@ -89,7 +89,7 @@ public class CiniiImportMetadataSourceServiceIT extends AbstractLiveImportIntegr
         context.turnOffAuthorisationSystem();
         CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
         CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
-        try (InputStream file = getClass().getResourceAsStream("cinii-responce-ids.xml")) {
+        try (InputStream file = getClass().getResourceAsStream("cinii-response-ids.xml")) {
             String ciniiXmlResp = IOUtils.toString(file, Charset.defaultCharset());
 
             liveImportClientImpl.setHttpClient(httpClient);
@@ -107,31 +107,31 @@ public class CiniiImportMetadataSourceServiceIT extends AbstractLiveImportIntegr
     private ArrayList<ImportRecord> getRecords() {
         ArrayList<ImportRecord> records = new ArrayList<>();
         //define first record
-        List<MetadatumDTO> metadatums  = new ArrayList<MetadatumDTO>();
+        List<MetadatumDTO> metadata  = new ArrayList<MetadatumDTO>();
         MetadatumDTO title = createMetadatumDTO("dc", "title", null,
                 "Understanding the impact of mandatory accrual accounting on management practices:"
                 + " Interpretation of Japanese local governments’ behavior");
         MetadatumDTO identifier = createMetadatumDTO("dc", "identifier", "other", "1010572092222310146");
 
-        metadatums.add(title);
-        metadatums.add(identifier);
+        metadata.add(title);
+        metadata.add(identifier);
 
-        ImportRecord firstrRecord = new ImportRecord(metadatums);
+        ImportRecord firstRecord = new ImportRecord(metadata);
 
         //define second record
-        List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
+        List<MetadatumDTO> metadata2  = new ArrayList<MetadatumDTO>();
         MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
                 "Band structures of passive films on titanium in simulated bioliquids determined"
                 + " by photoelectrochemical response: principle governing the biocompatibility");
         MetadatumDTO language = createMetadatumDTO("dc", "language", "iso", "en");
         MetadatumDTO identifier2 = createMetadatumDTO("dc", "identifier", "other", "1050010687833449984");
 
-        metadatums2.add(title2);
-        metadatums2.add(language);
-        metadatums2.add(identifier2);
+        metadata2.add(title2);
+        metadata2.add(language);
+        metadata2.add(identifier2);
 
-        ImportRecord secondRecord = new ImportRecord(metadatums2);
-        records.add(firstrRecord);
+        ImportRecord secondRecord = new ImportRecord(metadata2);
+        records.add(firstRecord);
         records.add(secondRecord);
         return records;
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java
index f6ab10c087..8d49010922 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionGroupRestControllerIT.java
@@ -28,9 +28,9 @@ import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.builder.CollectionBuilder;
 import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.WorkspaceItemBuilder;
 import org.dspace.content.Collection;
-import org.dspace.content.service.CollectionService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.service.GroupService;
@@ -41,10 +41,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 
 public class CollectionGroupRestControllerIT extends AbstractControllerIntegrationTest {
 
-
-    @Autowired
-    private CollectionService collectionService;
-
     @Autowired
     private GroupService groupService;
 
@@ -68,7 +64,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionAdminGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -81,7 +77,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionAdminGroupTestParentCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -95,7 +91,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionAdminGroupTestCollectionAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -109,7 +105,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionAdminGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        collectionService.createAdministrators(context, collection);
+        GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/collections/" + collection.getID() + "/adminGroup"))
@@ -119,7 +115,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionAdminGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        collectionService.createAdministrators(context, collection);
+        GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -413,7 +409,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionAdminGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -428,7 +424,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionAdminGroupTestParentCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -443,7 +439,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionAdminGroupTestCollectionAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -458,7 +454,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionAdminGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         getClient().perform(delete("/api/core/collections/" + collection.getID() + "/adminGroup"))
@@ -474,7 +470,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionAdminGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -493,7 +489,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionAdminGroupNotFoundTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -512,7 +508,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionSubmittersGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submitters = collectionService.createSubmitters(context, collection);
+        Group submitters = GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -525,7 +521,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionSubmittersGroupTestParentCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submitters = collectionService.createSubmitters(context, collection);
+        Group submitters = GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -539,7 +535,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionSubmittersGroupTestCollectionAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submitters = collectionService.createSubmitters(context, collection);
+        Group submitters = GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -553,7 +549,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionSubmittersGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        collectionService.createSubmitters(context, collection);
+        GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/collections/" + collection.getID() + "/submittersGroup"))
@@ -563,7 +559,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getCollectionSubmittersGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        collectionService.createSubmitters(context, collection);
+        GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -860,7 +856,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionSubmitterGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submittersGroup = collectionService.createSubmitters(context, collection);
+        GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -875,7 +871,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionSubmittersGroupTestParentCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submittersGroup = collectionService.createSubmitters(context, collection);
+        GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -890,7 +886,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionSubmittersGroupTestCollectionAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submittersGroup = collectionService.createSubmitters(context, collection);
+        GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -905,7 +901,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionSubmittersGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submittersGroup = collectionService.createSubmitters(context, collection);
+        Group submittersGroup = GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         getClient().perform(delete("/api/core/collections/" + collection.getID() + "/submittersGroup"))
@@ -924,7 +920,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionSubmittersGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submittersGroup = collectionService.createSubmitters(context, collection);
+        Group submittersGroup = GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -945,7 +941,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionSubmittersGroupNotFoundTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group submittersGroup = collectionService.createSubmitters(context, collection);
+        GroupBuilder.createCollectionSubmitterGroup(context, collection).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -961,7 +957,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -977,7 +974,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
 
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
@@ -995,7 +993,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1012,7 +1011,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/collections/" + collection.getID() + "/itemReadGroup"))
@@ -1025,7 +1025,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -1321,7 +1322,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection, itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -1345,7 +1346,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection, itemGroupString, defaultItemRead).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1367,7 +1368,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection, itemGroupString, defaultItemRead).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1389,7 +1390,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         getClient().perform(delete("/api/core/collections/" + collection.getID() + "/itemReadGroup"))
@@ -1408,7 +1410,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -1430,7 +1433,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, itemGroupString, defaultItemRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection, itemGroupString, defaultItemRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -1445,8 +1448,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -1462,8 +1465,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1480,8 +1483,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1498,8 +1501,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/collections/" + collection.getID() + "/bitstreamReadGroup"))
@@ -1512,8 +1515,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -1811,8 +1814,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -1835,8 +1838,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1859,8 +1862,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1882,8 +1885,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        Group role = GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
 
         getClient().perform(delete("/api/core/collections/" + collection.getID() + "/bitstreamReadGroup"))
@@ -1902,8 +1905,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
         String token = getAuthToken(eperson.getEmail(), password);
 
@@ -1918,8 +1921,8 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group role = collectionService.createDefaultReadGroup(context, collection, bitstreamGroupString,
-                                                              defaultBitstreamRead);
+        GroupBuilder.createCollectionDefaultReadGroup(context, collection,
+                bitstreamGroupString, defaultBitstreamRead).build();
         context.restoreAuthSystemState();
         String token = getAuthToken(eperson.getEmail(), password);
 
@@ -1931,7 +1934,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     public void getWorkflowGroupForCollectionAndRole() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group group = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -1944,7 +1947,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getWorkflowGroupForCollectionAndRoleParentCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group group = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -1958,7 +1961,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getWorkflowGroupForCollectionAndRoleWrongUUIDCollectionNotFound() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -1979,7 +1982,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     public void getWorkflowGroupCommunityAdmin() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group group = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
 
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
@@ -1994,7 +1997,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getWorkflowGroupCollectionAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group group = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
 
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
@@ -2009,7 +2012,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getWorkflowGroupUnAuthorized() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/collections/" + collection.getID() + "/workflowGroups/reviewer"))
@@ -2019,7 +2022,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void getWorkflowGroupForbidden() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -2324,7 +2327,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -2339,7 +2342,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupTestParentCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
 
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
@@ -2355,7 +2358,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupTestCollectionAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
 
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
@@ -2371,7 +2374,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group group = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         getClient().perform(delete("/api/core/collections/" + collection.getID() + "/workflowGroups/reviewer"))
@@ -2387,7 +2390,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group group = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -2406,7 +2409,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupNotFoundTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group group = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -2418,7 +2421,7 @@ public class CollectionGroupRestControllerIT extends AbstractControllerIntegrati
     @Test
     public void deleteCollectionWorkflowGroupWithPooledTaskTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group reviewer = workflowService.createWorkflowRoleGroup(context, collection, "reviewer");
+        Group reviewer = GroupBuilder.createCollectionWorkflowRoleGroup(context, collection, "reviewer").build();
 
         // Submit an Item into the workflow -> moves to the "reviewer" step's pool.
         // The role must have at least one EPerson, otherwise the WSI gets archived immediately
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java
index 014a31c501..fcc1c68d26 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CollectionRestRepositoryIT.java
@@ -1259,7 +1259,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
         authorizeService.addPolicy(context, parentCommunity, Constants.ADD, eperson);
         context.restoreAuthSystemState();
 
-        AtomicReference<UUID> idRef = new AtomicReference<UUID>();
+        AtomicReference<UUID> idRef = new AtomicReference<>();
         try {
         String authToken = getAuthToken(eperson.getEmail(), password);
 
@@ -3147,7 +3147,7 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
         getClient(token)
             .perform(patch("/api/core/collections/" + col.getID())
             .content(requestBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isOk())
             .andExpect(
                  jsonPath("$.metadata",
@@ -3197,15 +3197,15 @@ public class CollectionRestRepositoryIT extends AbstractControllerIntegrationTes
                                        )))
                              .andExpect(jsonPath("$.page.totalElements", is(1)));
 
-        List<Operation> updateTitle = new ArrayList<Operation>();
-        Map<String, String> value = new HashMap<String, String>();
+        List<Operation> updateTitle = new ArrayList<>();
+        Map<String, String> value = new HashMap<>();
         value.put("value", "New Name");
         updateTitle.add(new ReplaceOperation("/metadata/dc.title/0", value));
 
         String patchBody = getPatchContent(updateTitle);
         getClient(adminToken).perform(patch("/api/core/collections/" + col.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$.metadata['dc.title'][0].value", is("New Name")));
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityAdminGroupRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityAdminGroupRestControllerIT.java
index 37548553b1..074a7e6a35 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityAdminGroupRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityAdminGroupRestControllerIT.java
@@ -34,8 +34,6 @@ import org.dspace.builder.EPersonBuilder;
 import org.dspace.builder.GroupBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.CommunityService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
@@ -49,19 +47,12 @@ import org.springframework.http.MediaType;
 
 public class CommunityAdminGroupRestControllerIT extends AbstractControllerIntegrationTest {
 
-
-    @Autowired
-    private CommunityService communityService;
-
     @Autowired
     private GroupService groupService;
 
     @Autowired
     private AuthorizeService authorizeService;
 
-    @Autowired
-    private CollectionService collectionService;
-
     @Autowired
     private ConfigurationService configurationService;
 
@@ -78,7 +69,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void getCommunityAdminGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -91,7 +82,8 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void getCommunityAdminGroupTestCommunityAdmin() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
+        // TODO: this should actually be "add member", not directly setting a policy, right?
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -106,7 +98,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void getCommunityAdminGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        communityService.createAdministrators(context, parentCommunity);
+        GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
 
         getClient().perform(get("/api/core/communities/" + parentCommunity.getID() + "/adminGroup"))
@@ -116,7 +108,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void getCommunityAdminGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        communityService.createAdministrators(context, parentCommunity);
+        GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
         String token = getAuthToken(eperson.getEmail(), password);
         getClient(token).perform(get("/api/core/communities/" + parentCommunity.getID() + "/adminGroup"))
@@ -379,7 +371,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void deleteCommunityAdminGroupTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(admin.getEmail(), password);
@@ -397,7 +389,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
         Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
                                            .withName("Sub Community")
                                            .build();
-        Group adminGroup = communityService.createAdministrators(context, child1);
+        GroupBuilder.createCommunityAdminGroup(context, child1).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         context.restoreAuthSystemState();
 
@@ -412,7 +404,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void deleteCommunityAdminGroupUnAuthorizedTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
 
         getClient().perform(delete("/api/core/communities/" + parentCommunity.getID() + "/adminGroup"))
@@ -429,7 +421,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void deleteCommunityAdminGroupForbiddenTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -449,7 +441,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     @Test
     public void deleteCommunityAdminGroupNotFoundTest() throws Exception {
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         context.restoreAuthSystemState();
 
         String token = getAuthToken(eperson.getEmail(), password);
@@ -462,7 +454,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminAddMembersToCommunityAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         configurationService.setProperty("core.authorization.community-admin.admin-group", false);
@@ -489,7 +481,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminRemoveMembersFromCommunityAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         context.restoreAuthSystemState();
@@ -526,7 +518,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminAddChildGroupToCommunityAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         configurationService.setProperty("core.authorization.community-admin.admin-group", false);
@@ -554,7 +546,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminRemoveChildGroupFromCommunityAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = communityService.createAdministrators(context, parentCommunity);
+        Group adminGroup = GroupBuilder.createCommunityAdminGroup(context, parentCommunity).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
@@ -591,7 +583,9 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminAddChildGroupToCollectionAdminGroupSuccess() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        // TODO: Why is this test in CommunityAdmin? it seems to purely be a collection group test?
+        //       copy paste gone wrong and we should actually be testing for community admin group sub?
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
@@ -617,7 +611,9 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminRemoveChildGroupFromCollectionAdminGroupSuccess() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        // TODO: Why is this test in CommunityAdmin? it seems to purely be a collection group test?
+        //       copy paste gone wrong and we should actually be testing for community admin group sub?
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
@@ -653,7 +649,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminAddMembersToCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false);
@@ -681,7 +677,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminRemoveMembersFromCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         context.restoreAuthSystemState();
@@ -719,7 +715,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminAddChildGroupToCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false);
@@ -748,7 +744,7 @@ public class CommunityAdminGroupRestControllerIT extends AbstractControllerInteg
     public void communityAdminRemoveChildGroupFromCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection).build();
         authorizeService.addPolicy(context, parentCommunity, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
index 22e62c2416..6837b89003 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CommunityRestRepositoryIT.java
@@ -109,6 +109,12 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
     private EPerson collectionAdmin;
     private EPerson submitter;
 
+    @Test
+    public void singularEndpointShouldNotExist() throws Exception {
+        getClient().perform(get("/api/core/community"))
+            .andExpect(status().isNotFound());
+    }
+
     @Test
     public void createTest() throws Exception {
         ObjectMapper mapper = new ObjectMapper();
@@ -1404,11 +1410,11 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
                 .withAdminGroup(child2Admin)
                 .build();
 
-        Community ommunityChild1Child1 = CommunityBuilder.createSubCommunity(context, communityChild1)
+        Community communityChild1Child1 = CommunityBuilder.createSubCommunity(context, communityChild1)
                 .withName("Sub1 Community 1")
                 .build();
 
-        Community сommunityChild2Child1 = CommunityBuilder.createSubCommunity(context, communityChild2)
+        Community communityChild2Child1 = CommunityBuilder.createSubCommunity(context, communityChild2)
                 .withName("Sub2 Community 1")
                 .build();
 
@@ -1987,7 +1993,7 @@ public class CommunityRestRepositoryIT extends AbstractControllerIntegrationTest
         getClient(token)
             .perform(patch("/api/core/communities/" + parentCommunity.getID())
             .content(requestBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isOk())
             .andExpect(
                  jsonPath("$.metadata",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ConfigurationRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ConfigurationRestRepositoryIT.java
index 1eab1ef68e..45a98a2039 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ConfigurationRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ConfigurationRestRepositoryIT.java
@@ -51,5 +51,10 @@ public class ConfigurationRestRepositoryIT extends AbstractControllerIntegration
     public void getAll() throws Exception {
         getClient().perform(get("/api/config/properties/"))
             .andExpect(status().isMethodNotAllowed());
+
+        // Sanity check - Verify same result with no trailing slash, as DSpace should not care whether this
+        // findAll endpoint ends in a slash or not.
+        getClient().perform(get("/api/config/properties"))
+                   .andExpect(status().isMethodNotAllowed());
     }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ContentReportRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ContentReportRestRepositoryIT.java
new file mode 100644
index 0000000000..425b5f7a06
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ContentReportRestRepositoryIT.java
@@ -0,0 +1,263 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.dspace.app.rest.matcher.ContentReportMatcher;
+import org.dspace.app.rest.matcher.HalMatcher;
+import org.dspace.app.rest.model.FilteredCollectionsQuery;
+import org.dspace.app.rest.model.FilteredItemsQueryPredicate;
+import org.dspace.app.rest.model.FilteredItemsQueryRest;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.contentreport.Filter;
+import org.dspace.contentreport.FilteredCollection;
+import org.dspace.contentreport.QueryOperator;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for the content reports ported from DSpace 6.x
+ * (Filtered Collections and Filtered Items).
+ * @author Jean-François Morin (Université Laval)
+ */
+public class ContentReportRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Test
+    public void testFilteredCollections() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("contentreport.enable", Boolean.TRUE);
+
+        TestKit testKit = setupCollectionsAndItems();
+        Collection col1 = testKit.collections.get(0);
+        Collection col2 = testKit.collections.get(1);
+
+        context.restoreAuthSystemState();
+        String token = getAuthToken(admin.getEmail(), password);
+
+        Map<Filter, Integer> valuesCol1 = Map.of(Filter.IS_DISCOVERABLE, 1);
+        FilteredCollection fcol1 = FilteredCollection.of(col1.getName(), col1.getHandle(),
+                parentCommunity.getName(), parentCommunity.getHandle(),
+                1, 1, valuesCol1, true);
+        Map<Filter, Integer> valuesCol2 = Map.of(Filter.IS_DISCOVERABLE, 2);
+        FilteredCollection fcol2 = FilteredCollection.of(col2.getName(), col2.getHandle(),
+                parentCommunity.getName(), parentCommunity.getHandle(),
+                2, 2, valuesCol2, true);
+
+        FilteredCollectionsQuery query = FilteredCollectionsQuery.of(Set.of(Filter.IS_DISCOVERABLE));
+
+        getClient(token).perform(get("/api/contentreport/filteredcollections?" + query.toQueryString()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.collections", Matchers.containsInAnyOrder(
+                           ContentReportMatcher.matchFilteredCollectionProperties(fcol1),
+                           ContentReportMatcher.matchFilteredCollectionProperties(fcol2)
+                   )))
+                   .andExpect(jsonPath("type", is("filteredcollectionsreport")))
+                   .andExpect(jsonPath("$.summary",
+                           ContentReportMatcher.matchFilteredCollectionSummary(3, 3)))
+                   .andExpect(jsonPath("$._links.self.href",
+                           Matchers.containsString("/api/contentreport/filteredcollections")));
+    }
+
+    @Test
+    public void testFilteredCollectionsUnauthorized() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("contentreport.enable", Boolean.TRUE);
+
+        setupCollectionsAndItems();
+
+        context.restoreAuthSystemState();
+
+        FilteredCollectionsQuery query = FilteredCollectionsQuery.of(Set.of(Filter.IS_DISCOVERABLE));
+
+        getClient().perform(get("/api/contentreport/filteredcollections?" + query.toQueryString()))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void testFilteredCollectionsOff() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("contentreport.enable", Boolean.FALSE);
+
+        setupCollectionsAndItems();
+
+        context.restoreAuthSystemState();
+        String token = getAuthToken(admin.getEmail(), password);
+
+        FilteredCollectionsQuery query = FilteredCollectionsQuery.of(Set.of(Filter.IS_DISCOVERABLE));
+
+        getClient(token).perform(get("/api/contentreport/filteredcollections?" + query.toQueryString()))
+                   .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void testFilteredItems() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("contentreport.enable", Boolean.TRUE);
+
+        TestKit testKit = setupCollectionsAndItems();
+        Item publicItem2 = testKit.items.get(1);
+        Item publicItem3 = testKit.items.get(2);
+
+        context.restoreAuthSystemState();
+        String token = getAuthToken(admin.getEmail(), password);
+
+        FilteredItemsQueryRest query = FilteredItemsQueryRest.of(null,
+                List.of(FilteredItemsQueryPredicate.of("dc.contributor.author", QueryOperator.EQUALS, "Doe, Jane")),
+                100, null, List.of("dc.subject"));
+
+        getClient(token).perform(get("/api/contentreport/filtereditems?" + query.toQueryString()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", HalMatcher.matchNoEmbeds()))
+                .andExpect(jsonPath("$.itemCount", is(2)))
+                .andExpect(jsonPath("$.items", Matchers.containsInAnyOrder(
+                        matchItemProperties(publicItem2),
+                        matchItemProperties(publicItem3)
+                )));
+    }
+
+    @Test
+    public void testFilteredItemsUnauthorized() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("contentreport.enable", Boolean.TRUE);
+
+        setupCollectionsAndItems();
+
+        context.restoreAuthSystemState();
+
+        FilteredItemsQueryRest query = FilteredItemsQueryRest.of(null,
+                List.of(FilteredItemsQueryPredicate.of("dc.contributor.author", QueryOperator.EQUALS, "Doe, Jane")),
+                100, null, List.of("dc.subject"));
+
+        getClient().perform(get("/api/contentreport/filtereditems?" + query.toQueryString()))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void testFilteredItemsOff() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        configurationService.setProperty("contentreport.enable", Boolean.FALSE);
+
+        setupCollectionsAndItems();
+
+        context.restoreAuthSystemState();
+        String token = getAuthToken(admin.getEmail(), password);
+
+        FilteredItemsQueryRest query = FilteredItemsQueryRest.of(null,
+                List.of(FilteredItemsQueryPredicate.of("dc.contributor.author", QueryOperator.EQUALS, "Doe, Jane")),
+                100, null, List.of("dc.subject"));
+
+        getClient(token).perform(get("/api/contentreport/filtereditems?" + query.toQueryString()))
+                .andExpect(status().isNotFound());
+    }
+
+    // Need for a specific filtered item type...
+    private static Matcher<? super Object> matchItemProperties(Item item) {
+        return allOf(
+            hasJsonPath("$.uuid", is(item.getID().toString())),
+            hasJsonPath("$.name", is(item.getName())),
+            hasJsonPath("$.handle", is(item.getHandle())),
+            hasJsonPath("$.inArchive", is(item.isArchived())),
+            hasJsonPath("$.discoverable", is(item.isDiscoverable())),
+            hasJsonPath("$.withdrawn", is(item.isWithdrawn())),
+            hasJsonPath("$.lastModified", is(notNullValue())),
+            hasJsonPath("$.type", is("filtered-item"))
+        );
+    }
+
+    private TestKit setupCollectionsAndItems() {
+        //** GIVEN **
+        //1. A community with two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("My Community")
+                .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Collection col2 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 2").build();
+
+        LocalDate today = LocalDate.now();
+        LocalDate pastDate = today.minusDays(10);
+        String fmtPastDate = DateTimeFormatter.ISO_DATE.format(pastDate);
+        LocalDate futureDate = today.plusDays(10);
+        String fmtFutureDate = DateTimeFormatter.ISO_DATE.format(futureDate);
+
+        //2. Three items, two of which are available and discoverable...
+        Item item1 = ItemBuilder.createItem(context, col1)
+                .withTitle("Public item 1")
+                .withIssueDate(fmtPastDate)
+                .withAuthor("Smith, Donald").withAuthor("Doe, John")
+                .withSubject("ExtraEntry")
+                .build();
+
+        Item item2 = ItemBuilder.createItem(context, col2)
+                .withTitle("Public item 2")
+                .withIssueDate(fmtPastDate)
+                .withAuthor("Smith, Maria").withAuthor("Doe, Jane")
+                .withSubject("TestingForMore").withSubject("ExtraEntry")
+                .build();
+
+        // ... and one will be available in a few days.
+        Item item3 = ItemBuilder.createItem(context, col2)
+                .withTitle("Public item 3")
+                .withIssueDate(fmtFutureDate)
+                .withAuthor("Smith, Maria").withAuthor("Doe, Jane")
+                .withSubject("AnotherTest").withSubject("TestingForMore")
+                .withSubject("ExtraEntry")
+                .build();
+
+        TestKit kit = new TestKit();
+        kit.collections.add(col1);
+        kit.collections.add(col2);
+        kit.items.add(item1);
+        kit.items.add(item2);
+        kit.items.add(item3);
+        return kit;
+    }
+
+    /**
+     * Data structure to help trace back the created collections and items to perform the tests.
+     * In a future version (Java 17 or later), this class could be turned into a record.
+     */
+    private static class TestKit {
+
+        public final List<Collection> collections = new ArrayList<>();
+        public final List<Item> items = new ArrayList<>();
+
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CorrectionTypeRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CorrectionTypeRestRepositoryIT.java
new file mode 100644
index 0000000000..6e720fd63f
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CorrectionTypeRestRepositoryIT.java
@@ -0,0 +1,308 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.UUID;
+
+import org.dspace.app.rest.repository.CorrectionTypeRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.service.ItemService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+/**
+ * Test suite for {@link CorrectionTypeRestRepository}
+ *
+ * @author Mykhaylo Boychuk (mykhaylo.boychuk at 4science.com)
+ */
+public class CorrectionTypeRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ItemService itemService;
+    @Autowired
+    private AuthorizeService authorizeService;
+
+    @Test
+    public void findAllAdminTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes"))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(2)))
+                             .andExpect(jsonPath("$._embedded.correctiontypes", containsInAnyOrder(
+                                 allOf(
+                                   hasJsonPath("$.id", equalTo("request-withdrawn")),
+                                   hasJsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")),
+                                   hasJsonPath("$.type", equalTo("correctiontype"))
+                                 ),
+                                 allOf(
+                                   hasJsonPath("$.id", equalTo("request-reinstate")),
+                                   hasJsonPath("$.topic", equalTo("REQUEST/REINSTATE")),
+                                   hasJsonPath("$.type", equalTo("correctiontype"))
+                                 )
+                              )));
+    }
+
+    @Test
+    public void findAllEPersonTest() throws Exception {
+        String ePersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(ePersonToken).perform(get("/api/config/correctiontypes"))
+                               .andExpect(status().isOk())
+                               .andExpect(jsonPath("$.page.totalElements", greaterThanOrEqualTo(2)))
+                               .andExpect(jsonPath("$._embedded.correctiontypes", containsInAnyOrder(
+                                    allOf(
+                                       hasJsonPath("$.id", equalTo("request-withdrawn")),
+                                       hasJsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")),
+                                       hasJsonPath("$.type", equalTo("correctiontype"))
+                                    ),
+                                 allOf(
+                                   hasJsonPath("$.id", equalTo("request-reinstate")),
+                                   hasJsonPath("$.topic", equalTo("REQUEST/REINSTATE")),
+                                   hasJsonPath("$.type", equalTo("correctiontype"))
+                                   )
+                                 )));
+    }
+
+    @Test
+    public void findAllUnauthorizedTest() throws Exception {
+        getClient().perform(get("/api/config/correctiontypes"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneAdminTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/request-withdrawn"))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.id", equalTo("request-withdrawn")))
+                             .andExpect(jsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")))
+                             .andExpect(jsonPath("$.type", equalTo("correctiontype")));
+    }
+
+    @Test
+    public void findOneEPersonTest() throws Exception {
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken).perform(get("/api/config/correctiontypes/request-withdrawn"))
+                               .andExpect(status().isOk())
+                               .andExpect(jsonPath("$.id", equalTo("request-withdrawn")))
+                               .andExpect(jsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")))
+                               .andExpect(jsonPath("$.type", equalTo("correctiontype")));
+    }
+
+    @Test
+    public void findOneUnauthorizedTest() throws Exception {
+        getClient().perform(get("/api/config/correctiontypes/request-withdrawn"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneNotFoundTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/test"))
+                             .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findByItemWithoutUUIDParameterTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByItem"))
+                             .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void findByItemNotFoundTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByItem")
+                             .param("uuid", UUID.randomUUID().toString()))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void findByItemUnAuthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity).build();
+        Item privateItem = ItemBuilder.createItem(context, collection).build();
+        authorizeService.removeAllPolicies(context, privateItem);
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/config/correctiontypes/search/findByItem")
+                   .param("uuid", privateItem.getID().toString()))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findByNotArchivedItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        item.setArchived(false);
+        itemService.update(context, item);
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByItem")
+                             .param("uuid", item.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findByWithdrawnItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .build();
+        Item item = ItemBuilder.createItem(context, collection)
+                               .withdrawn()
+                               .build();
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/config/correctiontypes/search/findByItem")
+                             .param("uuid", item.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.totalElements", is(1)))
+                             .andExpect(jsonPath("$._embedded.correctiontypes", containsInAnyOrder(allOf(
+                                 hasJsonPath("$.id", equalTo("request-reinstate")),
+                                 hasJsonPath("$.topic", equalTo("REQUEST/REINSTATE"))
+                              ))));
+    }
+
+    @Test
+    public void findByNotDiscoverableItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        item.setDiscoverable(false);
+        itemService.update(context, item);
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByItem")
+                             .param("uuid", item.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.totalElements", is(1)))
+                             .andExpect(jsonPath("$._embedded.correctiontypes", containsInAnyOrder(
+                                 allOf(
+                                   hasJsonPath("$.id", equalTo("request-withdrawn")),
+                                   hasJsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")),
+                                   hasJsonPath("$.type", equalTo("correctiontype"))
+                                   )
+                              )));
+    }
+
+    @Test
+    public void findByPersonalArchiveItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity).build();
+        Item itemOne = ItemBuilder.createItem(context, collection)
+                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByItem")
+                             .param("uuid", itemOne.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.totalElements", is(1)))
+                             .andExpect(jsonPath("$._embedded.correctiontypes", containsInAnyOrder(
+                                 allOf(
+                                   hasJsonPath("$.id", equalTo("request-withdrawn")),
+                                   hasJsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")),
+                                   hasJsonPath("$.type", equalTo("correctiontype"))
+                                   )
+                              )));
+
+    }
+
+    @Test
+    public void findByItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).build();
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByItem")
+                             .param("uuid", item.getID().toString()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.page.totalElements", is(1)))
+                             .andExpect(jsonPath("$._embedded.correctiontypes", containsInAnyOrder(
+                                 allOf(
+                                   hasJsonPath("$.id", equalTo("request-withdrawn")),
+                                   hasJsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")),
+                                   hasJsonPath("$.type", equalTo("correctiontype"))
+                                   )
+                              )));
+    }
+
+    @Test
+    public void findByTopicWithoutTopicParameterTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByTopic"))
+                             .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void findByWrongTopicTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByTopic")
+                             .param("topic", "wrongValue"))
+                             .andExpect(status().isNoContent());
+    }
+
+    @Test
+    public void findByTopicAdminTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/config/correctiontypes/search/findByTopic")
+                             .param("topic", "REQUEST/WITHDRAWN"))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.id", equalTo("request-withdrawn")))
+                             .andExpect(jsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")))
+                             .andExpect(jsonPath("$.type", equalTo("correctiontype")));
+    }
+
+    @Test
+    public void findByTopicEPersonTest() throws Exception {
+        String ePersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(ePersonToken).perform(get("/api/config/correctiontypes/search/findByTopic")
+                               .param("topic", "REQUEST/WITHDRAWN"))
+                               .andExpect(status().isOk())
+                               .andExpect(jsonPath("$.id", equalTo("request-withdrawn")))
+                               .andExpect(jsonPath("$.topic", equalTo("REQUEST/WITHDRAWN")))
+                               .andExpect(jsonPath("$.type", equalTo("correctiontype")));
+    }
+
+    @Test
+    public void findByTopicUnauthorizedTest() throws Exception {
+        getClient().perform(get("/api/config/correctiontypes/search/findByTopic")
+                   .param("topic", "REQUEST/WITHDRAWN"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java
index 31c22692f0..37bd3a90ee 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CrossRefImportMetadataSourceServiceIT.java
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -162,7 +162,7 @@ public class CrossRefImportMetadataSourceServiceIT extends AbstractLiveImportInt
         MetadatumDTO title = createMetadatumDTO("dc", "title", null,
                 "State of Awareness of Freshers’ Groups Chortkiv State"
                 + " Medical College of Prevention of Iodine Deficiency Diseases");
-        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "L.V. Senyuk");
+        MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "Senyuk, L.V.");
         MetadatumDTO type = createMetadatumDTO("dc", "type", null, "journal-article");
         MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2016-05-19");
         MetadatumDTO ispartof = createMetadatumDTO("dc", "relation", "ispartof",
@@ -191,7 +191,7 @@ public class CrossRefImportMetadataSourceServiceIT extends AbstractLiveImportInt
         List<MetadatumDTO> metadatums2  = new ArrayList<MetadatumDTO>();
         MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
                 "Ischemic Heart Disease and Role of Nurse of Cardiology Department");
-        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "K. І. Kozak");
+        MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "Kozak, K. І.");
         MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "journal-article");
         MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2016-05-19");
         MetadatumDTO ispartof2 = createMetadatumDTO("dc", "relation", "ispartof",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/CsrfRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CsrfRestControllerIT.java
new file mode 100644
index 0000000000..1bfdc8feaf
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/CsrfRestControllerIT.java
@@ -0,0 +1,60 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertNotEquals;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.cookie;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.security.DSpaceCsrfTokenRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.test.web.servlet.MockMvc;
+
+/**
+ * Integration test for the /api/security/csrf endpoint
+ * <P>
+ * NOTE: This test will autoconfigure the MockMvc (@AutoConfigureMockMvc) in order to avoid using
+ * AbstractControllerIntegrationTest.getClient() because that method may use this /api/security/csrf endpoint to
+ * obtain a CSRF token.
+ **/
+@AutoConfigureMockMvc
+public class CsrfRestControllerIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Test
+    public void getCsrf() throws Exception {
+        // NOTE: We avoid using getClient() here because that method may also call this "/api/security/csrf" endpoint.
+        String headerToken = mockMvc.perform(get("/api/security/csrf"))
+                                    .andExpect(status().isNoContent())
+                                    // Expect this endpoint to send back the proper HTTP Header & Cookie
+                                    // as set by DSpaceCsrfTokenRepository
+                                    .andExpect(cookie().exists(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME))
+                                    .andExpect(header().exists(DSpaceCsrfTokenRepository.DSPACE_CSRF_HEADER_NAME))
+                                    .andReturn().getResponse()
+                                    .getHeader(DSpaceCsrfTokenRepository.DSPACE_CSRF_HEADER_NAME);
+
+        // Call the endpoint again, and verify we get a new token again. Endpoint should ALWAYS change the CSRF token
+        String headerToken2 = mockMvc.perform(get("/api/security/csrf"))
+                                    .andExpect(status().isNoContent())
+                                    // Expect this endpoint to send back the proper HTTP Header & Cookie
+                                    // as set by DSpaceCsrfTokenRepository
+                                    .andExpect(cookie().exists(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME))
+                                    .andExpect(header().exists(DSpaceCsrfTokenRepository.DSPACE_CSRF_HEADER_NAME))
+                                    .andReturn().getResponse()
+                                    .getHeader(DSpaceCsrfTokenRepository.DSPACE_CSRF_HEADER_NAME);
+
+        assertNotEquals("CSRF Tokens should not be the same in separate requests", headerToken, headerToken2);
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java
index c1481f0573..35b4810d92 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DataCiteImportMetadataSourceServiceIT.java
@@ -15,8 +15,8 @@ import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
index c51c6f4940..72e0021bde 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryRestControllerIT.java
@@ -26,13 +26,18 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.time.Period;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.matchers.JsonPathMatchers;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
 import org.dspace.app.rest.matcher.AppliedFilterMatcher;
 import org.dspace.app.rest.matcher.FacetEntryMatcher;
 import org.dspace.app.rest.matcher.FacetValueMatcher;
@@ -51,6 +56,8 @@ import org.dspace.builder.CommunityBuilder;
 import org.dspace.builder.EPersonBuilder;
 import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.LDNMessageBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
 import org.dspace.builder.PoolTaskBuilder;
 import org.dspace.builder.SupervisionOrderBuilder;
 import org.dspace.builder.WorkflowItemBuilder;
@@ -913,8 +920,8 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
                         is(PageMatcher.pageEntry(0, 20))))
                 //The date values need to be as specified below
                 .andExpect(jsonPath("$._embedded.values", containsInAnyOrder(
-                        //We'll always get atleast two intervals with the items specified above, so we ask to match
-                        // twice atleast
+                        //We'll always get at least two intervals with the items specified above, so we ask to match
+                        // twice at least
                         FacetValueMatcher.entryDateIssued(),
                         FacetValueMatcher.entryDateIssued()
                 )))
@@ -2471,7 +2478,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
                 .withAuthor("test2, test2").withAuthor("Maybe, Maybe")
                 .withSubject("AnotherTest").withSubject("TestingForMore")
                 .withSubject("ExtraEntry")
-                .withEmbargoPeriod("12 months")
+                .withEmbargoPeriod(Period.ofMonths(12))
                 .build();
 
         //Turn on the authorization again
@@ -2777,7 +2784,9 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
     /**
      * This test verifies that
      * {@link org.dspace.discovery.indexobject.InprogressSubmissionIndexFactoryImpl#storeInprogressItemFields}
-     * indexes the owning collection of workspace items
+     * indexes the owning collection of workspace items.
+     *
+     * @throws java.lang.Exception passed through.
      */
     @Test
     public void discoverSearchObjectsTestForWorkspaceItemInCollectionScope() throws Exception {
@@ -2828,7 +2837,8 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
     /**
      * This test verifies that
      * {@link org.dspace.discovery.indexobject.InprogressSubmissionIndexFactoryImpl#storeInprogressItemFields}
-     * indexes the owning collection of workflow items
+     * indexes the owning collection of workflow items.
+     * @throws java.lang.Exception passed through.
      */
     @Test
     public void discoverSearchObjectsTestForWorkflowItemInCollectionScope() throws Exception {
@@ -6703,7 +6713,7 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
         SupervisionOrderBuilder.createSupervisionOrder(context, wfItem1Admin.getItem(), groupA).build();
         SupervisionOrderBuilder.createSupervisionOrder(context, wfItem1Admin.getItem(), groupB).build();
 
-        // 6. a pool taks in the second step of the workflow
+        // 6. a pool task in the second step of the workflow
         ClaimedTask cTask2 = ClaimedTaskBuilder.createClaimedTask(context, col2, admin).withTitle("Pool Step2 Item")
                                                .withIssueDate("2010-11-04")
                                                .build();
@@ -6870,4 +6880,131 @@ public class DiscoveryRestControllerIT extends AbstractControllerIntegrationTest
             .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")));
     }
 
+    @Test
+    public void discoverSearchObjectsNOTIFYIncomingConfigurationTest() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("community")
+                                              .build();
+        Collection collection = CollectionBuilder.createCollection(context, community)
+                                                 .withName("collection")
+                                                 .build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+                               .withTitle("item title")
+                               .build();
+
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .build();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+        Notification notification = mapper.readValue(message, Notification.class);
+        LDNMessageBuilder.createNotifyServiceBuilder(context, notification).build();
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+            .perform(get("/api/discover/search/objects").param("configuration", "NOTIFY.incoming"))
+            //** THEN **
+            //The status has to be 200 OK
+            .andExpect(status().isOk())
+            //The type has to be 'discover'
+            .andExpect(jsonPath("$.type", is("discover")))
+            //There needs to be a page object that shows the total pages and total elements as well as the
+            // size and the current page (number)
+            .andExpect(jsonPath("$._embedded.searchResult.page", is(
+                PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 1)
+            )))
+            .andExpect(jsonPath("$._embedded.facets", Matchers.containsInAnyOrder(
+                FacetEntryMatcher.relatedItemFacet(false),
+                FacetEntryMatcher.originFacet(false),
+                FacetEntryMatcher.targetFacet(false),
+                FacetEntryMatcher.queueStatusFacet(false),
+                FacetEntryMatcher.activityStreamTypeFacet(false),
+                FacetEntryMatcher.coarNotifyTypeFacet(false),
+                FacetEntryMatcher.notificationTypeFacet(false)
+            )))
+            //There always needs to be a self link
+            .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")));
+    }
+
+    @Test
+    public void discoverSearchObjectsNOTIFYOutgoingConfigurationTest() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+
+        context.turnOffAuthorisationSystem();
+
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("community")
+                                              .build();
+        Collection collection = CollectionBuilder.createCollection(context, community)
+                                                 .withName("collection")
+                                                 .build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+                               .withTitle("item title")
+                               .build();
+
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://generic-service.com/system/inbox/")
+                                .build();
+
+        InputStream announceReviewStream = getClass().getResourceAsStream("ldn_announce_review.json");
+        String announceReview = IOUtils.toString(announceReviewStream, Charset.defaultCharset());
+        announceReviewStream.close();
+
+
+        String message = announceReview.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+        Notification notification = mapper.readValue(message, Notification.class);
+        LDNMessageBuilder.createNotifyServiceBuilder(context, notification).build();
+
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+            .perform(get("/api/discover/search/objects").param("configuration", "NOTIFY.outgoing"))
+            //** THEN **
+            //The status has to be 200 OK
+            .andExpect(status().isOk())
+            //The type has to be 'discover'
+            .andExpect(jsonPath("$.type", is("discover")))
+            //There needs to be a page object that shows the total pages and total elements as well as the
+            // size and the current page (number)
+            .andExpect(jsonPath("$._embedded.searchResult.page", is(
+                PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 1)
+            )))
+            .andExpect(jsonPath("$._embedded.facets", Matchers.containsInAnyOrder(
+                FacetEntryMatcher.relatedItemFacet(false),
+                FacetEntryMatcher.originFacet(false),
+                FacetEntryMatcher.targetFacet(false),
+                FacetEntryMatcher.queueStatusFacet(false),
+                FacetEntryMatcher.activityStreamTypeFacet(false),
+                FacetEntryMatcher.coarNotifyTypeFacet(false),
+                FacetEntryMatcher.notificationTypeFacet(false)
+            )))
+            //There always needs to be a self link
+            .andExpect(jsonPath("$._links.self.href", containsString("/api/discover/search/objects")));
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java
index 083b27d0e5..7b9cad70e9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DiscoveryVersioningIT.java
@@ -1057,8 +1057,8 @@ public class DiscoveryVersioningIT extends AbstractControllerIntegrationTest {
     }
 
     @Test
-    public void test_discoveryXml_openAIREFundingAgency_expectLatestVersionsOnly() throws Exception {
-        final String configuration = "openAIREFundingAgency";
+    public void test_discoveryXml_openaireFundingAgency_expectLatestVersionsOnly() throws Exception {
+        final String configuration = "openaireFundingAgency";
 
 
         Collection collection = createCollection("OrgUnit");
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/DuplicateDetectionRestIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DuplicateDetectionRestIT.java
new file mode 100644
index 0000000000..067fd65d57
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/DuplicateDetectionRestIT.java
@@ -0,0 +1,407 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jakarta.ws.rs.core.MediaType;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.patch.ReplaceOperation;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.authorize.service.AuthorizeService;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.WorkflowItemBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.WorkspaceItem;
+import org.dspace.content.service.CollectionService;
+import org.dspace.content.service.ItemService;
+import org.dspace.content.service.WorkspaceItemService;
+import org.dspace.core.I18nUtil;
+import org.dspace.discovery.IndexingService;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.service.EPersonService;
+import org.dspace.handle.service.HandleService;
+import org.dspace.identifier.service.IdentifierService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.xmlworkflow.service.XmlWorkflowService;
+import org.dspace.xmlworkflow.storedcomponents.XmlWorkflowItem;
+import org.dspace.xmlworkflow.storedcomponents.service.XmlWorkflowItemService;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Test item link and section data REST endpoints for duplicate detection.
+ * @see DuplicateDetectionTest (dspace-api) for lower level integration tests.
+ *
+ * @author Kim Shepherd
+ */
+public class DuplicateDetectionRestIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    ConfigurationService configurationService;
+    @Autowired
+    ItemService itemService;
+    @Autowired
+    IndexingService indexingService;
+    @Autowired
+    CollectionService collectionService;
+    @Autowired
+    HandleService handleService;
+    @Autowired
+    WorkspaceItemService workspaceItemService;
+    @Autowired
+    XmlWorkflowItemService workflowItemService;
+    @Autowired
+    IdentifierService identifierService;
+    @Autowired
+    AuthorizeService authorizeService;
+    @Autowired
+    XmlWorkflowService workflowService;
+    @Autowired
+    EPersonService ePersonService;
+
+    private Collection col;
+    private Collection simpleCol;
+    private final String item1IssueDate = "2011-10-17";
+    private final String item1Subject = "ExtraEntry 1";
+    private final String item1Title = "Public item I";
+    private final String item1Author = "Smith, Donald";
+    private final String item2Subject = "ExtraEntry 2";
+    private final String item2IssueDate = "2012-10-17";
+    private EPerson anotherEPerson;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // Temporarily enable duplicate detection and set comparison value distance to 1
+        configurationService.setProperty("duplicate.enable", true);
+        configurationService.setProperty("duplicate.comparison.distance", 1);
+        configurationService.setProperty("duplicate.comparison.normalise.lowercase", true);
+        configurationService.setProperty("duplicate.comparison.normalise.whitespace", true);
+        configurationService.setProperty("duplicate.comparison.solr.field", "deduplication_keyword");
+        configurationService.setProperty("duplicate.comparison.metadata.field", new String[]{"dc.title"});
+        configurationService.setProperty("duplicate.preview.metadata.field",
+                new String[]{"dc.date.issued", "dc.subject"});
+
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+
+        col = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Test Collection")
+                .withWorkflowGroup(1, admin)
+                .build();
+        simpleCol = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Test Collection without Workflow")
+                .build();
+        eperson.setFirstName(context, "first");
+        eperson.setLastName(context, "last");
+
+        anotherEPerson = EPersonBuilder.createEPerson(context)
+                .withEmail("test-another-user@email.com")
+                .withNameInMetadata("first", "last")
+                .withCanLogin(true)
+                .withLanguage(I18nUtil.getDefaultLocale().getLanguage())
+                .withPassword(password)
+                .build();
+
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void searchDuplicatesBySearchMethodTest() throws Exception {
+        String token = getAuthToken(admin.getEmail(), password);
+
+        context.turnOffAuthorisationSystem();
+
+        // Ingest three example items with slightly different titles
+        // item2 is 1 edit distance from item1 and item3
+        // item1 and item3 are 2 edit distance from each other
+        WorkspaceItem workspaceItem1 = WorkspaceItemBuilder.createWorkspaceItem(context, simpleCol)
+                .withTitle(item1Title)
+                .withSubject(item1Subject)
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubmitter(eperson)
+                .build();
+        WorkspaceItem workspaceItem2 = WorkspaceItemBuilder.createWorkspaceItem(context, simpleCol)
+                .withTitle("Public item II")
+                .withIssueDate(item2IssueDate)
+                .withAuthor("Smith, Donald X.")
+                .withSubject(item2Subject)
+                .withSubmitter(eperson)
+                .build();
+        WorkspaceItem workspaceItem3 = WorkspaceItemBuilder.createWorkspaceItem(context, simpleCol)
+                .withTitle(item1Title)
+                .withTitle("Public item III")
+                .withIssueDate("2013-10-17")
+                .withAuthor("Smith, Donald Y.")
+                .withSubject("ExtraEntry 3")
+                .withSubmitter(eperson)
+                .build();
+
+        XmlWorkflowItem wfi1 = workflowService.start(context, workspaceItem1);
+        XmlWorkflowItem wfi2 = workflowService.start(context, workspaceItem2);
+        Item item1 = wfi1.getItem();
+        Item item2 = wfi2.getItem();
+
+        context.restoreAuthSystemState();
+
+        getClient(token).perform(get("/api/submission/duplicates/search/findByItem?uuid=" + item1.getID()))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                // Valid duplicates array
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources", Matchers.hasSize(1)))
+                // UUID of only array member matches item2 ID
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources[0].uuid")
+                        .value(item2.getID().toString()))
+                // First item has subject and issue date metadata populated as expected
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources[0]" +
+                        ".metadata['dc.subject'][0].value")
+                        .value(item2Subject))
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources[0]" +
+                        ".metadata['dc.date.issued'][0].value")
+                        .value(item2IssueDate))
+                // Does NOT have other metadata e.g. author, title
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources[0]" +
+                        ".metadata['dc.contributor.author']").doesNotExist())
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources[0]" +
+                        ".metadata['dc.title']").doesNotExist());
+    }
+
+    /**
+     * Duplicates should be accessible via section data. Data should update as comparison value (title) is changed.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void submissionSectionDataTest() throws Exception {
+        // Test publication
+        context.turnOffAuthorisationSystem();
+
+        Collection workspaceCollection =
+                CollectionBuilder.createCollection(context, parentCommunity, "123456789/test-duplicate-detection")
+                        .withName("Test Collection Workspace").build();
+
+        // Ingest three example items with slightly different titles
+        // item2 is 1 edit distance from item1 and item3
+        // item1 and item3 are 2 edit distance from each other
+        Item item1 = ItemBuilder.createItem(context, col)
+                .withTitle("Submission section test I") // Public item I
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubject(item1Subject)
+                .build();
+        Item item2 = ItemBuilder.createItem(context, col)
+                .withTitle("Submission section test II")
+                .withIssueDate(item2IssueDate)
+                .withAuthor("Smith, Donald X.")
+                .withSubject(item2Subject)
+                .build();
+        Item item3 = ItemBuilder.createItem(context, col)
+                .withTitle("Submission section test III")
+                .withIssueDate("2013-10-17")
+                .withAuthor("Smith, Donald Y.")
+                .withSubject("ExtraEntry 3")
+                .build();
+        // Create a new workspace item with a similar title to Item 1 (1 edit distance). Reuse other items
+        // metadata for the rest, as it is not relevant.
+        WorkspaceItem workspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, workspaceCollection)
+                .withTitle("Submission section test 1")
+                .withSubject(item2Subject)
+                .withIssueDate(item2IssueDate)
+                .withAuthor(item1Author)
+                .withSubmitter(eperson)
+                .build();
+        String submitterToken = getAuthToken(eperson.getEmail(), password);
+        context.restoreAuthSystemState();
+
+        getClient(submitterToken).perform(get("/api/submission/workspaceitems/" + workspaceItem.getID()))
+                .andExpect(status().isOk())
+                // The duplicates section is present
+                .andExpect(jsonPath("$.sections.duplicates").exists())
+                // There is a potentialDuplicates array in the section data of size 1
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates", Matchers.hasSize(1)))
+                // The UUID of the first duplicate matches item 1 (which is 1 distance from this new title)
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates[0].uuid")
+                        .value(item1.getID().toString()))
+                // Metadata for subject and issue date is populated as expected
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates[0]" +
+                        ".metadata['dc.subject'][0].value")
+                        .value(item1Subject))
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates[0]" +
+                        ".metadata['dc.date.issued'][0].value")
+                        .value(item1IssueDate))
+                // Metadata for other metadata fields has not been copied across, as expected
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates[0]" +
+                        ".metadata['dc.contributor.author']").doesNotExist())
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates[0]" +
+                        ".metadata['dc.title']").doesNotExist());
+
+        List<Operation> updateOperations = new ArrayList<Operation>();
+        Map<String, String> value = new HashMap<String, String>();
+        value.put("value", "Submission section test II");
+        updateOperations.add(new ReplaceOperation("/sections/traditionalpageone/dc.title/0", value));
+        String patchBody = getPatchContent(updateOperations);
+        getClient(submitterToken).perform(patch("/api/submission/workspaceitems/" + workspaceItem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist());
+
+        // Now there should be 3 results
+        getClient(submitterToken).perform(get("/api/submission/workspaceitems/" + workspaceItem.getID()))
+                .andExpect(status().isOk())
+                // The duplicates section is present
+                .andExpect(jsonPath("$.sections.duplicates").exists())
+                // There is a potentialDuplicates array in the section data (even if empty)
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates", Matchers.hasSize(3)));
+
+        // Now, change the title to something completely different
+        updateOperations = new ArrayList<>();
+        value.put("value", "Research article");
+        updateOperations.add(new ReplaceOperation("/sections/traditionalpageone/dc.title/0", value));
+        patchBody = getPatchContent(updateOperations);
+        getClient(submitterToken).perform(patch("/api/submission/workspaceitems/" + workspaceItem.getID())
+                        .content(patchBody)
+                        .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.errors").doesNotExist());
+
+        // Now there should be NO results
+        getClient(submitterToken).perform(get("/api/submission/workspaceitems/" + workspaceItem.getID()))
+                .andExpect(status().isOk())
+                // The duplicates section is present
+                .andExpect(jsonPath("$.sections.duplicates").exists())
+                // There is a potentialDuplicates array in the section data (even if empty)
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates", Matchers.hasSize(0)));
+    }
+
+    /**
+     * If there is a potential duplicate that is also in submission (workspace item), it will
+     * ONLY be shown if the current user is the submitter / item owner.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void submissionSectionWorkspaceItemVisibilityTest() throws Exception {
+        // Test publication
+        context.turnOffAuthorisationSystem();
+        // Create a new collection with handle that maps to the test-duplicate-detection submission config
+        col = CollectionBuilder.createCollection(context, parentCommunity, "123456789/test-duplicate-detection")
+                .withName("Test Collection with Duplicate Detection")
+                .withWorkflowGroup(1, admin)
+                .build();
+        // Create a new workspace item with a similar title to Item 1 (1 edit distance). Reuse other items
+        // metadata for the rest, as it is not relevant.
+        WorkspaceItem workspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, col)
+                .withTitle("Unique title")
+                .withSubject(item1Subject)
+                .withIssueDate(item1IssueDate)
+                .withAuthor(item1Author)
+                .withSubmitter(eperson)
+                .build();
+        WorkspaceItem workspaceItem2 = WorkspaceItemBuilder.createWorkspaceItem(context, col)
+                .withTitle("Unique title")
+                .withSubject(item2Subject)
+                .withIssueDate(item2IssueDate)
+                .withAuthor(item1Author)
+                .withSubmitter(eperson)
+                .build();
+        WorkspaceItem workspaceItem3 = WorkspaceItemBuilder.createWorkspaceItem(context, col)
+                .withTitle("Unique title")
+                .withSubject("asdf")
+                .withIssueDate("2000-01-01")
+                .withAuthor("asdfasf")
+                .withSubmitter(admin)
+                .build();
+        String submitterToken = getAuthToken(eperson.getEmail(), password);
+
+        context.restoreAuthSystemState();
+
+        // Even though there are 3 items with the same title, this 'eperson' user should only see 1 duplicate
+        // as workspaceItem3 is owned by a different submitter, and self-references are skipped
+        getClient(submitterToken).perform(get("/api/submission/workspaceitems/" + workspaceItem.getID()))
+                .andExpect(status().isOk())
+                // The duplicates section is present
+                .andExpect(jsonPath("$.sections.duplicates").exists())
+                // There is a potentialDuplicates array in the section data of size 1
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates", Matchers.hasSize(1)))
+                // The UUID of the first duplicate matches item 1 (which is 1 distance from this new title)
+                .andExpect(jsonPath("$.sections.duplicates.potentialDuplicates[0].uuid")
+                        .value(workspaceItem2.getItem().getID().toString()));
+    }
+
+    /**
+     * If there is a potential duplicate that is also in workflow, it will
+     * ONLY be shown if the current user is in a workflow group for step 1, 2, or 3, or is an admin, or otherwise
+     * has READ permission
+     *
+     * @throws Exception
+     */
+    @Test
+    public void submissionSectionWorkflowItemVisibilityTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        // Create a new collection with handle that maps to the test-duplicate-detection submission config
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection workflowCol = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Test Collection with Duplicate Detection")
+                .withWorkflowGroup("reviewer", admin)
+                .build();
+
+        XmlWorkflowItem workflowItem1 = WorkflowItemBuilder.createWorkflowItem(context, workflowCol)
+                .withTitle("Unique title")
+                .withSubmitter(anotherEPerson)
+                .build();
+        XmlWorkflowItem workflowItem2 = WorkflowItemBuilder.createWorkflowItem(context, workflowCol)
+                .withTitle("Unique title")
+                .withSubmitter(eperson)
+                .build();
+        context.restoreAuthSystemState();
+
+        context.setCurrentUser(admin);
+        String reviewerToken = getAuthToken(admin.getEmail(), password);
+
+        // The reviewer should be able to see the workflow item as a potential duplicate of the test item
+        getClient(reviewerToken).perform(get("/api/submission/duplicates/search/findByItem?uuid="
+                        + workflowItem1.getItem().getID()))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                // Valid duplicates array
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources", Matchers.hasSize(1)))
+                // UUID of only array member matches the new workflow item ID
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources[0].uuid")
+                        .value(workflowItem2.getItem().getID().toString()));
+
+        // Another random user will NOT see this
+        getClient(getAuthToken(anotherEPerson.getEmail(), password))
+                .perform(get("/api/submission/duplicates/search/findByItem?uuid="
+                        + workflowItem1.getItem().getID()))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                // Valid duplicates array
+                .andExpect(jsonPath("$._embedded.potentialDuplicateResources").doesNotExist());
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
index 6c20dcff4a..beeef03aec 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EPersonRestRepositoryIT.java
@@ -45,9 +45,9 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.exception.EPersonNameNotProvidedException;
 import org.dspace.app.rest.exception.RESTEmptyWorkflowGroupException;
@@ -72,7 +72,6 @@ import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.WorkflowItemBuilder;
 import org.dspace.content.Collection;
 import org.dspace.content.Community;
-import org.dspace.content.Item;
 import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
@@ -248,7 +247,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String authToken = getAuthToken(admin.getEmail(), password);
-        getClient(authToken).perform(get("/api/eperson/eperson"))
+        getClient(authToken).perform(get("/api/eperson/epersons"))
                    .andExpect(status().isOk())
                    .andExpect(content().contentType(contentType))
                    .andExpect(jsonPath("$._embedded.epersons", Matchers.containsInAnyOrder(
@@ -265,10 +264,17 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
         ;
     }
 
+    @Test
+    public void singularEndpointShouldNotExist() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/eperson/eperson"))
+            .andExpect(status().isNotFound());
+    }
+
     @Test
     public void findAllUnauthorizedTest() throws Exception {
         // Access endpoint without being authenticated
-        getClient().perform(get("/api/eperson/eperson"))
+        getClient().perform(get("/api/eperson/epersons"))
                    .andExpect(status().isUnauthorized());
     }
 
@@ -276,7 +282,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void findAllForbiddenTest() throws Exception {
         String authToken = getAuthToken(eperson.getEmail(), password);
         // Access endpoint logged in as an unprivileged user
-        getClient(authToken).perform(get("/api/eperson/eperson"))
+        getClient(authToken).perform(get("/api/eperson/epersons"))
                             .andExpect(status().isForbidden());
     }
 
@@ -2113,7 +2119,7 @@ public class EPersonRestRepositoryIT extends AbstractControllerIntegrationTest {
             .build();
 
         this.ePersonService
-            .addMetadata(context, ePerson, "eperson", "firstname", null, Item.ANY, List.of(first, second, third));
+            .addMetadata(context, ePerson, "eperson", "firstname", null, null, List.of(first, second, third));
 
         context.restoreAuthSystemState();
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java
index 740a2c0dc3..2de61bb43d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/EntityTypeRestRepositoryIT.java
@@ -416,6 +416,8 @@ public class EntityTypeRestRepositoryIT extends AbstractEntityIntegrationTest {
                     .setSupportedEntityTypes(Arrays.asList("Publication"));
             ((AbstractExternalDataProvider) externalDataService.getExternalDataProvider("pubmed"))
                     .setSupportedEntityTypes(Arrays.asList("Publication"));
+            ((AbstractExternalDataProvider) externalDataService.getExternalDataProvider("suggestion"))
+                    .setSupportedEntityTypes(Arrays.asList("Publication"));
 
             // these are similar to the previous checks but now we have restricted the mock and pubmed providers
             // to support only publication, this mean that there are no providers suitable for funding
@@ -439,6 +441,8 @@ public class EntityTypeRestRepositoryIT extends AbstractEntityIntegrationTest {
                     .setSupportedEntityTypes(null);
             ((AbstractExternalDataProvider) externalDataService.getExternalDataProvider("pubmed"))
                     .setSupportedEntityTypes(null);
+            ((AbstractExternalDataProvider) externalDataService.getExternalDataProvider("suggestion"))
+                    .setSupportedEntityTypes(null);
         }
 
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java
index 65492cbbe8..55cc99567f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ExternalSourcesRestControllerIT.java
@@ -41,6 +41,7 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
                             .andExpect(jsonPath("$._embedded.externalsources", Matchers.hasItems(
                                 ExternalSourceMatcher.matchExternalSource("mock", "mock", false),
                                 ExternalSourceMatcher.matchExternalSource("orcid", "orcid", false),
+                                ExternalSourceMatcher.matchExternalSource("suggestion", "suggestion", false),
                                 ExternalSourceMatcher.matchExternalSource("scopus", "scopus", false),
                                 ExternalSourceMatcher.matchExternalSource(
                                     "sherpaJournalIssn", "sherpaJournalIssn", false),
@@ -51,9 +52,9 @@ public class ExternalSourcesRestControllerIT extends AbstractControllerIntegrati
                                 ExternalSourceMatcher.matchExternalSource(
                                         "pubmed", "pubmed", false),
                                 ExternalSourceMatcher.matchExternalSource(
-                                        "openAIREFunding", "openAIREFunding", false)
+                                        "openaireFunding", "openaireFunding", false)
                             )))
-                            .andExpect(jsonPath("$.page.totalElements", Matchers.is(10)));
+                            .andExpect(jsonPath("$.page.totalElements", Matchers.is(11)));
     }
 
     @Test
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/GroupRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/GroupRestRepositoryIT.java
index 2999b89d93..ff8aea493a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/GroupRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/GroupRestRepositoryIT.java
@@ -33,9 +33,9 @@ import java.util.List;
 import java.util.Locale;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.dspace.app.rest.exception.GroupNameNotProvidedException;
 import org.dspace.app.rest.matcher.EPersonMatcher;
 import org.dspace.app.rest.matcher.GroupMatcher;
@@ -59,15 +59,11 @@ import org.dspace.content.Collection;
 import org.dspace.content.Community;
 import org.dspace.content.Item;
 import org.dspace.content.MetadataSchemaEnum;
-import org.dspace.content.factory.ContentServiceFactory;
-import org.dspace.content.service.CollectionService;
-import org.dspace.content.service.CommunityService;
 import org.dspace.core.Constants;
 import org.dspace.core.I18nUtil;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.Group;
 import org.dspace.eperson.factory.EPersonServiceFactory;
-import org.dspace.eperson.service.EPersonService;
 import org.dspace.eperson.service.GroupService;
 import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
@@ -85,9 +81,6 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     ResourcePolicyService resourcePolicyService;
     @Autowired
     private ConfigurationService configurationService;
-    @Autowired
-    private CollectionService collectionService;
-
     @Autowired
     private AuthorizeService authorizeService;
 
@@ -761,259 +754,136 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Test
     public void addChildGroupCommunityAdminTest() throws Exception {
 
-        CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
         GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
 
-        Community community = null;
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup1 = null;
-        Group childGroup2 = null;
+        Community community = CommunityBuilder.createCommunity(context).build();
+        Group parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
+                .addMember(eperson)
+                .build();
+        Group childGroup1 = GroupBuilder.createGroup(context).build();
+        Group childGroup2 = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
+                        )
+        ).andExpect(status().isNoContent());
 
-            community = communityService.create(null, context);
-            parentGroup = communityService.createAdministrators(context, community);
-            childGroup1 = groupService.create(context);
-            childGroup2 = groupService.create(context);
+        parentGroup = context.reloadEntity(parentGroup);
+        childGroup1 = context.reloadEntity(childGroup1);
+        childGroup2 = context.reloadEntity(childGroup2);
 
-            groupService.addMember(context, parentGroup, eperson);
-            groupService.update(context, parentGroup);
+        assertTrue(
+                groupService.isMember(parentGroup, childGroup1)
+        );
 
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup1 = context.reloadEntity(childGroup1);
-            childGroup2 = context.reloadEntity(childGroup2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(eperson.getEmail(), password);
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
-                            )
-            ).andExpect(status().isNoContent());
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup1 = context.reloadEntity(childGroup1);
-            childGroup2 = context.reloadEntity(childGroup2);
-
-            assertTrue(
-                    groupService.isMember(parentGroup, childGroup1)
-            );
-
-            assertTrue(
-                    groupService.isMember(parentGroup, childGroup2)
-            );
-
-        } finally {
-            if (community != null) {
-                CommunityBuilder.deleteCommunity(community.getID());
-            }
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup1 != null) {
-                GroupBuilder.deleteGroup(childGroup1.getID());
-            }
-            if (childGroup2 != null) {
-                GroupBuilder.deleteGroup(childGroup2.getID());
-            }
-        }
+        assertTrue(
+                groupService.isMember(parentGroup, childGroup2)
+        );
     }
 
     @Test
     public void addChildGroupForbiddenTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup1 = null;
-        Group childGroup2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup1 = GroupBuilder.createGroup(context).build();
+        Group childGroup2 = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            childGroup1 = groupService.create(context);
-            childGroup2 = groupService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup1 = context.reloadEntity(childGroup1);
-            childGroup2 = context.reloadEntity(childGroup2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(eperson.getEmail(), password);
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
-                            )
-            ).andExpect(status().isForbidden());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup1 != null) {
-                GroupBuilder.deleteGroup(childGroup1.getID());
-            }
-            if (childGroup2 != null) {
-                GroupBuilder.deleteGroup(childGroup2.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
+                        )
+        ).andExpect(status().isForbidden());
     }
 
     @Test
     public void addChildGroupUnauthorizedTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup1 = null;
-        Group childGroup2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup1 = GroupBuilder.createGroup(context).build();
+        Group childGroup2 = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.commit();
 
-            parentGroup = groupService.create(context);
-            childGroup1 = groupService.create(context);
-            childGroup2 = groupService.create(context);
+        parentGroup = context.reloadEntity(parentGroup);
+        childGroup1 = context.reloadEntity(childGroup1);
+        childGroup2 = context.reloadEntity(childGroup2);
 
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup1 = context.reloadEntity(childGroup1);
-            childGroup2 = context.reloadEntity(childGroup2);
-
-            context.restoreAuthSystemState();
-            getClient().perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
-                            )
-            ).andExpect(status().isUnauthorized());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup1 != null) {
-                GroupBuilder.deleteGroup(childGroup1.getID());
-            }
-            if (childGroup2 != null) {
-                GroupBuilder.deleteGroup(childGroup2.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        getClient().perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
+                        )
+        ).andExpect(status().isUnauthorized());
     }
 
     @Test
     public void addChildGroupNotFoundTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup1 = null;
-        Group childGroup2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup1 = GroupBuilder.createGroup(context).build();
+        Group childGroup2 = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            childGroup1 = groupService.create(context);
-            childGroup2 = groupService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup1 = context.reloadEntity(childGroup1);
-            childGroup2 = context.reloadEntity(childGroup2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + UUID.randomUUID() + "/subgroups")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
-                            )
-            ).andExpect(status().isNotFound());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup1 != null) {
-                GroupBuilder.deleteGroup(childGroup1.getID());
-            }
-            if (childGroup2 != null) {
-                GroupBuilder.deleteGroup(childGroup2.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + UUID.randomUUID() + "/subgroups")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
+                        )
+        ).andExpect(status().isNotFound());
     }
 
     @Test
     public void addChildGroupUnprocessableTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup1 = null;
-        Group childGroup2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup1 = GroupBuilder.createGroup(context)
+                .withParent(parentGroup)
+                .build();
+        Group childGroup2 = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
 
-            parentGroup = groupService.create(context);
-            childGroup1 = groupService.create(context);
-            childGroup2 = groupService.create(context);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/123456789\n"
+                                + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
+                        )
+        ).andExpect(status().isUnprocessableEntity());
 
-            groupService.addMember(context, childGroup1, parentGroup);
-            groupService.update(context, childGroup1);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup1 = context.reloadEntity(childGroup1);
-            childGroup2 = context.reloadEntity(childGroup2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/123456789\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
-                            )
-            ).andExpect(status().isUnprocessableEntity());
-
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
-                            )
-            ).andExpect(status().isUnprocessableEntity());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup1 != null) {
-                GroupBuilder.deleteGroup(childGroup1.getID());
-            }
-            if (childGroup2 != null) {
-                GroupBuilder.deleteGroup(childGroup2.getID());
-            }
-        }
+        // TODO - confirm with reviewers that this is a mistake - it actually should be No Content
+        //        (see AddMember test) but was incorrectly expecting 422?
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/subgroups")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + childGroup1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + childGroup2.getID()
+                        )
+        ).andExpect(status().isNoContent());
     }
 
     @Test
@@ -1081,252 +951,118 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Test
     public void addMemberCommunityAdminTest() throws Exception {
 
-        CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
         GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
 
-        Community community = null;
-        Group parentGroup = null;
-        EPerson member1 = null;
-        EPerson member2 = null;
+        context.turnOffAuthorisationSystem();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).build();
+        Group parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
+                .addMember(eperson)
+                .build();
+        EPerson member1 = EPersonBuilder.createEPerson(context).build();
+        EPerson member2 = EPersonBuilder.createEPerson(context).build();
 
-            community = communityService.create(null, context);
-            parentGroup = communityService.createAdministrators(context, community);
-            member1 = ePersonService.create(context);
-            member2 = ePersonService.create(context);
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + member2.getID()
+                        )
+        ).andExpect(status().isNoContent());
 
-            groupService.addMember(context, parentGroup, eperson);
-            groupService.update(context, parentGroup);
+        parentGroup = context.reloadEntity(parentGroup);
+        member1 = context.reloadEntity(member1);
+        member2 = context.reloadEntity(member2);
 
-            context.commit();
+        assertTrue(
+                groupService.isMember(context, member1, parentGroup)
+        );
 
-            parentGroup = context.reloadEntity(parentGroup);
-            member1 = context.reloadEntity(member1);
-            member2 = context.reloadEntity(member2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(eperson.getEmail(), password);
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + member2.getID()
-                            )
-            ).andExpect(status().isNoContent());
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member1 = context.reloadEntity(member1);
-            member2 = context.reloadEntity(member2);
-
-            assertTrue(
-                    groupService.isMember(context, member1, parentGroup)
-            );
-
-            assertTrue(
-                    groupService.isMember(context, member2, parentGroup)
-            );
-
-        } finally {
-            if (community != null) {
-                CommunityBuilder.deleteCommunity(community.getID());
-            }
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member1 != null) {
-                EPersonBuilder.deleteEPerson(member1.getID());
-            }
-            if (member2 != null) {
-                EPersonBuilder.deleteEPerson(member2.getID());
-            }
-        }
+        assertTrue(
+                groupService.isMember(context, member2, parentGroup)
+        );
     }
 
     @Test
     public void addMemberForbiddenTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member1 = null;
-        EPerson member2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        EPerson member1 = EPersonBuilder.createEPerson(context).build();
+        EPerson member2 = EPersonBuilder.createEPerson(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            member1 = ePersonService.create(context);
-            member2 = ePersonService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member1 = context.reloadEntity(member1);
-            member2 = context.reloadEntity(member2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(eperson.getEmail(), password);
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + member2.getID()
-                            )
-            ).andExpect(status().isForbidden());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member1 != null) {
-                EPersonBuilder.deleteEPerson(member1.getID());
-            }
-            if (member2 != null) {
-                EPersonBuilder.deleteEPerson(member2.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + member2.getID()
+                        )
+        ).andExpect(status().isForbidden());
     }
 
     @Test
     public void addMemberUnauthorizedTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member1 = null;
-        EPerson member2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        EPerson member1 = EPersonBuilder.createEPerson(context).build();
+        EPerson member2 = EPersonBuilder.createEPerson(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            member1 = ePersonService.create(context);
-            member2 = ePersonService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member1 = context.reloadEntity(member1);
-            member2 = context.reloadEntity(member2);
-
-            context.restoreAuthSystemState();
-            getClient().perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + member2.getID()
-                            )
-            ).andExpect(status().isUnauthorized());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member1 != null) {
-                EPersonBuilder.deleteEPerson(member1.getID());
-            }
-            if (member2 != null) {
-                EPersonBuilder.deleteEPerson(member2.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        getClient().perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + member2.getID()
+                        )
+        ).andExpect(status().isUnauthorized());
     }
 
     @Test
     public void addMemberNotFoundTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member1 = null;
-        EPerson member2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        EPerson member1 = EPersonBuilder.createEPerson(context).build();
+        EPerson member2 = EPersonBuilder.createEPerson(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            member1 = ePersonService.create(context);
-            member2 = ePersonService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member1 = context.reloadEntity(member1);
-            member2 = context.reloadEntity(member2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + UUID.randomUUID() + "/epersons")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + member2.getID()
-                            )
-            ).andExpect(status().isNotFound());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member1 != null) {
-                EPersonBuilder.deleteEPerson(member1.getID());
-            }
-            if (member2 != null) {
-                EPersonBuilder.deleteEPerson(member2.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + UUID.randomUUID() + "/epersons")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/" + member1.getID() + "/\n"
+                                + REST_SERVER_URL + "eperson/groups/" + member2.getID()
+                        )
+        ).andExpect(status().isNotFound());
     }
 
     @Test
     public void addMemberUnprocessableTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member1 = null;
-        EPerson member2 = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        EPerson member1 = EPersonBuilder.createEPerson(context).build();
+        EPerson member2 = EPersonBuilder.createEPerson(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
 
-            parentGroup = groupService.create(context);
-            member1 = ePersonService.create(context);
-            member2 = ePersonService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member1 = context.reloadEntity(member1);
-            member2 = context.reloadEntity(member2);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-
-            getClient(authToken).perform(
-                    post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
-                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
-                            .content(REST_SERVER_URL + "eperson/groups/123456789\n"
-                                    + REST_SERVER_URL + "eperson/groups/" + member2.getID()
-                            )
-            ).andExpect(status().isUnprocessableEntity());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member1 != null) {
-                EPersonBuilder.deleteEPerson(member1.getID());
-            }
-            if (member2 != null) {
-                EPersonBuilder.deleteEPerson(member2.getID());
-            }
-        }
+        getClient(authToken).perform(
+                post("/api/eperson/groups/" + parentGroup.getID() + "/epersons")
+                        .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                        .content(REST_SERVER_URL + "eperson/groups/123456789\n"
+                                + REST_SERVER_URL + "eperson/groups/" + member2.getID()
+                        )
+        ).andExpect(status().isUnprocessableEntity());
     }
 
     @Test
@@ -1379,28 +1115,17 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Test
     public void removeChildGroupCommunityAdminTest() throws Exception {
 
-        CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
         GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
 
-        Community community = null;
-        Group parentGroup = null;
-        Group childGroup = null;
-
-        try {
             context.turnOffAuthorisationSystem();
 
-            community = communityService.create(null, context);
-            parentGroup = communityService.createAdministrators(context, community);
-            childGroup = groupService.create(context);
-
-            groupService.addMember(context, parentGroup, childGroup);
-            groupService.addMember(context, parentGroup, eperson);
-            groupService.update(context, parentGroup);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup = context.reloadEntity(childGroup);
+            Community community = CommunityBuilder.createCommunity(context).build();
+            Group parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
+                    .addMember(eperson)
+                    .build();
+            Group childGroup = GroupBuilder.createGroup(context)
+                    .withParent(parentGroup)
+                    .build();
 
             context.restoreAuthSystemState();
             String authToken = getAuthToken(eperson.getEmail(), password);
@@ -1414,163 +1139,71 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
             assertFalse(
                     groupService.isMember(parentGroup, childGroup)
             );
-
-        } finally {
-            if (community != null) {
-                CommunityBuilder.deleteCommunity(community.getID());
-            }
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup != null) {
-                GroupBuilder.deleteGroup(childGroup.getID());
-            }
-        }
     }
 
     @Test
     public void removeChildGroupForbiddenTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            childGroup = groupService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup = context.reloadEntity(childGroup);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(eperson.getEmail(), password);
-            getClient(authToken).perform(
-                    delete("/api/eperson/groups/" + parentGroup.getID() + "/subgroups/" + childGroup.getID())
-            ).andExpect(status().isForbidden());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup != null) {
-                GroupBuilder.deleteGroup(childGroup.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(
+                delete("/api/eperson/groups/" + parentGroup.getID() + "/subgroups/" + childGroup.getID())
+        ).andExpect(status().isForbidden());
     }
 
     @Test
     public void removeChildGroupUnauthorizedTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup = GroupBuilder.createGroup(context).build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            childGroup = groupService.create(context);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup = context.reloadEntity(childGroup);
-
-            context.restoreAuthSystemState();
-            getClient().perform(
-                    delete("/api/eperson/groups/" + parentGroup.getID() + "/subgroups/" + childGroup.getID())
-            ).andExpect(status().isUnauthorized());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup != null) {
-                GroupBuilder.deleteGroup(childGroup.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        getClient().perform(
+                delete("/api/eperson/groups/" + parentGroup.getID() + "/subgroups/" + childGroup.getID())
+        ).andExpect(status().isUnauthorized());
     }
 
     @Test
     public void removeChildGroupNotFoundTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup = GroupBuilder.createGroup(context)
+                .withParent(parentGroup)
+                .build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
 
-            parentGroup = groupService.create(context);
-            childGroup = groupService.create(context);
-
-            groupService.addMember(context, childGroup, parentGroup);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup = context.reloadEntity(childGroup);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-
-            getClient(authToken).perform(
-                    delete("/api/eperson/groups/" + UUID.randomUUID() + "/subgroups/" + childGroup.getID())
-            ).andExpect(status().isNotFound());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup != null) {
-                GroupBuilder.deleteGroup(childGroup.getID());
-            }
-        }
+        getClient(authToken).perform(
+                delete("/api/eperson/groups/" + UUID.randomUUID() + "/subgroups/" + childGroup.getID())
+        ).andExpect(status().isNotFound());
     }
 
     @Test
     public void removeChildGroupUnprocessableTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        Group childGroup = null;
+        Group parentGroup = GroupBuilder.createGroup(context).build();
+        Group childGroup = GroupBuilder.createGroup(context)
+                .withParent(parentGroup)
+                .build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
 
-            parentGroup = groupService.create(context);
-            childGroup = groupService.create(context);
-
-            groupService.addMember(context, childGroup, parentGroup);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            childGroup = context.reloadEntity(childGroup);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-
-            getClient(authToken).perform(
-                    delete("/api/eperson/groups/" + parentGroup.getID() + "/subgroups/" + UUID.randomUUID())
-            ).andExpect(status().isUnprocessableEntity());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (childGroup != null) {
-                GroupBuilder.deleteGroup(childGroup.getID());
-            }
-        }
+        getClient(authToken).perform(
+                delete("/api/eperson/groups/" + parentGroup.getID() + "/subgroups/" + UUID.randomUUID())
+        ).andExpect(status().isUnprocessableEntity());
     }
 
     @Test
@@ -1614,32 +1247,19 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     @Test
     public void removeMemberCommunityAdminTest() throws Exception {
 
-        CommunityService communityService = ContentServiceFactory.getInstance().getCommunityService();
         GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
 
-        Community community = null;
-        Group parentGroup = null;
-        EPerson member = null;
-
-        try {
             context.turnOffAuthorisationSystem();
 
-            community = communityService.create(null, context);
-            parentGroup = communityService.createAdministrators(context, community);
-            member = ePersonService.create(context);
-
-            groupService.addMember(context, parentGroup, member);
-            groupService.addMember(context, parentGroup, eperson);
-            groupService.update(context, parentGroup);
+            Community community = CommunityBuilder.createCommunity(context).build();
+            EPerson member = EPersonBuilder.createEPerson(context).build();
+            Group parentGroup = GroupBuilder.createCommunityAdminGroup(context, community)
+                    .addMember(member)
+                    .addMember(eperson)
+                    .build();
 
             assertTrue(groupService.isMember(context, member, parentGroup));
 
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member = context.reloadEntity(member);
-
             context.restoreAuthSystemState();
             String authToken = getAuthToken(eperson.getEmail(), password);
             getClient(authToken).perform(
@@ -1652,151 +1272,68 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
             assertFalse(
                     groupService.isMember(context, member, parentGroup)
             );
-
-        } finally {
-            if (community != null) {
-                CommunityBuilder.deleteCommunity(community.getID());
-            }
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member != null) {
-                EPersonBuilder.deleteEPerson(member.getID());
-            }
-        }
     }
 
     @Test
     public void removeMemberForbiddenTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member = null;
+        EPerson member = EPersonBuilder.createEPerson(context).build();
+        Group parentGroup = GroupBuilder.createGroup(context)
+                .addMember(member)
+                .build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            member = ePersonService.create(context);
-            groupService.addMember(context, parentGroup, member);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member = context.reloadEntity(member);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(eperson.getEmail(), password);
-            getClient(authToken).perform(
-                    delete("/api/eperson/groups/" + parentGroup.getID() + "/epersons/" + member.getID())
-            ).andExpect(status().isForbidden());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member != null) {
-                EPersonBuilder.deleteEPerson(member.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(
+                delete("/api/eperson/groups/" + parentGroup.getID() + "/epersons/" + member.getID())
+        ).andExpect(status().isForbidden());
     }
 
     @Test
     public void removeMemberUnauthorizedTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member = null;
+        EPerson member = EPersonBuilder.createEPerson(context).build();
+        Group parentGroup = GroupBuilder.createGroup(context)
+                .addMember(member)
+                .build();
 
-        try {
-            context.turnOffAuthorisationSystem();
-
-            parentGroup = groupService.create(context);
-            member = ePersonService.create(context);
-            groupService.addMember(context, parentGroup, member);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member = context.reloadEntity(member);
-
-            context.restoreAuthSystemState();
-            getClient().perform(
-                    delete("/api/eperson/groups/" + parentGroup.getID() + "/epersons/" + member.getID())
-            ).andExpect(status().isUnauthorized());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member != null) {
-                EPersonBuilder.deleteEPerson(member.getID());
-            }
-        }
+        context.restoreAuthSystemState();
+        getClient().perform(
+                delete("/api/eperson/groups/" + parentGroup.getID() + "/epersons/" + member.getID())
+        ).andExpect(status().isUnauthorized());
     }
 
     @Test
     public void removeMemberNotFoundTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
+        context.turnOffAuthorisationSystem();
 
-        Group parentGroup = null;
-        EPerson member = null;
+        EPerson member = EPersonBuilder.createEPerson(context).build();
+        Group parentGroup = GroupBuilder.createGroup(context)
+                .addMember(member)
+                .build();
 
-        try {
-            context.turnOffAuthorisationSystem();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
 
-            parentGroup = groupService.create(context);
-            member = ePersonService.create(context);
-            groupService.addMember(context, parentGroup, member);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member = context.reloadEntity(member);
-
-            context.restoreAuthSystemState();
-            String authToken = getAuthToken(admin.getEmail(), password);
-
-            getClient(authToken).perform(
-                    delete("/api/eperson/groups/" + UUID.randomUUID() + "/epersons/" + member.getID())
-            ).andExpect(status().isNotFound());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member != null) {
-                EPersonBuilder.deleteEPerson(member.getID());
-            }
-        }
+        getClient(authToken).perform(
+                delete("/api/eperson/groups/" + UUID.randomUUID() + "/epersons/" + member.getID())
+        ).andExpect(status().isNotFound());
     }
 
     @Test
     public void removeMemberUnprocessableTest() throws Exception {
 
-        GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
-        EPersonService ePersonService = EPersonServiceFactory.getInstance().getEPersonService();
-
-        Group parentGroup = null;
-        EPerson member = null;
-
-        try {
             context.turnOffAuthorisationSystem();
 
-            parentGroup = groupService.create(context);
-            member = ePersonService.create(context);
-            groupService.addMember(context, parentGroup, member);
-
-            context.commit();
-
-            parentGroup = context.reloadEntity(parentGroup);
-            member = context.reloadEntity(member);
+            EPerson member = EPersonBuilder.createEPerson(context).build();
+            Group parentGroup = GroupBuilder.createGroup(context)
+                    .addMember(member)
+                    .build();
 
             context.restoreAuthSystemState();
             String authToken = getAuthToken(admin.getEmail(), password);
@@ -1804,15 +1341,6 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
             getClient(authToken).perform(
                     delete("/api/eperson/groups/" + parentGroup.getID() + "/epersons/" + UUID.randomUUID())
             ).andExpect(status().isUnprocessableEntity());
-
-        } finally {
-            if (parentGroup != null) {
-                GroupBuilder.deleteGroup(parentGroup.getID());
-            }
-            if (member != null) {
-                EPersonBuilder.deleteEPerson(member.getID());
-            }
-        }
     }
 
     @Test
@@ -2586,7 +2114,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         String itemGroupString = "ITEM";
         int defaultItemRead = Constants.DEFAULT_ITEM_READ;
-        Group itemReadGroup = collectionService.createDefaultReadGroup(context, col1, itemGroupString, defaultItemRead);
+        Group itemReadGroup = GroupBuilder.createCollectionDefaultReadGroup(context,
+                col1, itemGroupString, defaultItemRead).build();
 
         context.restoreAuthSystemState();
 
@@ -2670,8 +2199,9 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
         String bitstreamGroupString = "BITSTREAM";
         int defaultBitstreamRead = Constants.DEFAULT_BITSTREAM_READ;
 
-        Group bitstreamReadGroup = collectionService.createDefaultReadGroup(context, col1, bitstreamGroupString,
-                                                                                            defaultBitstreamRead);
+        Group bitstreamReadGroup = GroupBuilder.createCollectionDefaultReadGroup(context, col1, bitstreamGroupString,
+                                                                                            defaultBitstreamRead)
+                .build();
 
         context.restoreAuthSystemState();
 
@@ -2792,7 +2322,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminRemoveMembersFromCollectionAdminGroupSuccess() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         context.restoreAuthSystemState();
@@ -2827,7 +2358,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminAddChildGroupToCollectionAdminGroupSuccess() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
@@ -2853,7 +2385,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminRemoveChildGroupFromCollectionAdminGroupSuccess() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
@@ -2889,7 +2422,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminAddMembersToCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false);
@@ -2923,7 +2457,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminRemoveMembersFromCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         EPerson ePerson = EPersonBuilder.createEPerson(context).withEmail("testToAdd@test.com").build();
         context.restoreAuthSystemState();
@@ -2961,7 +2496,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminAddChildGroupToCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         configurationService.setProperty("core.authorization.community-admin.collection.admin-group", false);
@@ -2990,7 +2526,8 @@ public class GroupRestRepositoryIT extends AbstractControllerIntegrationTest {
     public void collectionAdminRemoveChildGroupFromCollectionAdminGroupPropertySetToFalse() throws Exception {
 
         context.turnOffAuthorisationSystem();
-        Group adminGroup = collectionService.createAdministrators(context, collection);
+        Group adminGroup = GroupBuilder.createCollectionAdminGroup(context, collection)
+                .build();
         authorizeService.addPolicy(context, collection, Constants.ADMIN, eperson);
         Group group = GroupBuilder.createGroup(context).withName("testGroup").build();
         context.restoreAuthSystemState();
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemFilterRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemFilterRestRepositoryIT.java
new file mode 100644
index 0000000000..d6ae2e1aa0
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemFilterRestRepositoryIT.java
@@ -0,0 +1,88 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.repository.ItemFilterRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.junit.Test;
+
+/**
+ * Integration test for {@link ItemFilterRestRepository}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class ItemFilterRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Test
+    public void findOneUnauthorizedTest() throws Exception {
+        getClient().perform(get("/api/config/itemfilters/test"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneForbiddenTest() throws Exception {
+        getClient(getAuthToken(eperson.getEmail(), password))
+            .perform(get("/api/config/itemfilters/test"))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findOneNotFoundTest() throws Exception {
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(get("/api/config/itemfilters/test"))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(get("/api/config/itemfilters/always_true_filter"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is("always_true_filter")))
+            .andExpect(jsonPath("$._links.self.href",
+                containsString("/api/config/itemfilters/always_true_filter")));
+    }
+
+    @Test
+    public void findAllUnauthorizedTest() throws Exception {
+        getClient().perform(get("/api/config/itemfilters"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findAllForbiddenTest() throws Exception {
+        getClient(getAuthToken(eperson.getEmail(), password))
+            .perform(get("/api/config/itemfilters"))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findAllPaginatedSortedTest() throws Exception {
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(get("/api/config/itemfilters")
+                .param("size", "30"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.page.totalElements", is(5)))
+            .andExpect(jsonPath("$.page.totalPages", is(1)))
+            .andExpect(jsonPath("$.page.size", is(30)))
+            .andExpect(jsonPath("$._embedded.itemfilters", contains(
+                hasJsonPath("$.id", is("always_true_filter")),
+                hasJsonPath("$.id", is("demo_filter")),
+                hasJsonPath("$.id", is("doi-filter")),
+                hasJsonPath("$.id", is("in-outfit-collection_condition")),
+                hasJsonPath("$.id", is("type_filter")))));
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestControllerIT.java
index 7d2d1d901e..443f3f07eb 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemOwningCollectionUpdateRestControllerIT.java
@@ -55,7 +55,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
         context.restoreAuthSystemState();
         //When we call this owningCollection/move endpoint
         getClient().perform(
-                put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+                put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content(
                                 "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -91,7 +91,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
 
         //When we call this owningCollection/move endpoint
         getClient(token)
-                .perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+                .perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content(
                                 "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -145,7 +145,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
         String token = getAuthToken(itemMoveEperson.getEmail(), "test");
 
         getClient(token)
-                .perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+                .perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content(
                                 "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -191,7 +191,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
         context.restoreAuthSystemState();
         String token = getAuthToken(itemMoveEperson.getEmail(), "test");
 
-        getClient(token).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+        getClient(token).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                 .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                 .content(
                         "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -232,7 +232,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
         context.restoreAuthSystemState();
         String token = getAuthToken(itemMoveEperson.getEmail(), "test");
 
-        getClient(token).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+        getClient(token).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                 .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                 .content(
                         "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -273,7 +273,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
         context.restoreAuthSystemState();
         String token = getAuthToken(itemMoveEperson.getEmail(), "test");
 
-        getClient(token).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+        getClient(token).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                 .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                 .content(
                         "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -310,7 +310,7 @@ public class ItemOwningCollectionUpdateRestControllerIT extends AbstractControll
 
         String tokenEPerson = getAuthToken(eperson.getEmail(), password);
 
-        getClient(tokenEPerson).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection/")
+        getClient(tokenEPerson).perform(put("/api/core/items/" + publicItem1.getID() + "/owningCollection")
                                .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                                .content("https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()))
                                .andExpect(status().isForbidden());
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
index 714ad0b419..f105322a63 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ItemRestRepositoryIT.java
@@ -37,6 +37,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.time.Period;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -44,9 +45,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.CharEncoding;
 import org.dspace.app.rest.matcher.BitstreamMatcher;
@@ -314,7 +315,6 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                    .andExpect(jsonPath("$.page.totalPages", is(2)))
                    .andExpect(jsonPath("$.page.number", is(0)))
                    .andExpect(jsonPath("$.page.totalElements", is(3)));
-        ;
 
         getClient(token).perform(get("/api/core/items")
                    .param("size", "2")
@@ -597,7 +597,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         // is used in the provenance note.
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -652,7 +652,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                                .build();
 
         context.restoreAuthSystemState();
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -701,7 +701,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         // try to use an unauthorized user
         String token = getAuthToken(eperson.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -761,7 +761,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", null);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -823,7 +823,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         // is used in the provenance note.
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", false);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -883,7 +883,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String tokenAdmin = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", false);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -933,7 +933,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(eperson.getEmail(), password);
         String tokenAdmin = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", false);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -978,7 +978,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1032,7 +1032,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1077,7 +1077,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(eperson.getEmail(), password);
         String tokenAdmin = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1120,7 +1120,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", false);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1166,7 +1166,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         // String value should work.
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", "false");
         ops.add(replaceOperation);
@@ -1213,7 +1213,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", false);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1258,7 +1258,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(eperson.getEmail(), password);
         String tokenAdmin = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", false);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1312,7 +1312,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
         String token = getAuthToken(admin.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/discoverable", null);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -1382,7 +1382,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         getClient().perform(get("/api/core/items/" + publicItem.getID()))
                    .andExpect(status().isOk());
 
-        // Check publicItem bitstream creation (shuold be stored in bundle)
+        // Check publicItem bitstream creation (should be stored in bundle)
         getClient().perform(get("/api/core/items/" + publicItem.getID() + "/bundles"))
                    .andExpect(status().isOk())
                    .andExpect(content().contentType(contentType))
@@ -1453,7 +1453,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         getClient().perform(get("/api/core/items/" + publicItem.getID()))
             .andExpect(status().isOk());
 
-        // Check publicItem bitstream creation (shuold be stored in bundle)
+        // Check publicItem bitstream creation (should be stored in bundle)
         getClient().perform(get("/api/core/items/" + publicItem.getID() + "/bundles"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(contentType))
@@ -1639,7 +1639,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                                          .withIssueDate("2017-12-18")
                                          .withAuthor("Smith, Donald").withAuthor("Doe, John")
                                          .withSubject("ExtraEntry")
-                                         .withEmbargoPeriod("6 months")
+                                         .withEmbargoPeriod(Period.ofMonths(6))
                                          .build();
 
         //3. a public item
@@ -1730,7 +1730,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                 .withIssueDate("2015-10-21")
                 .withAuthor("Smith, Donald")
                 .withSubject("ExtraEntry")
-                .withEmbargoPeriod("1 week")
+                .withEmbargoPeriod(Period.ofWeeks(1))
                 .build();
 
         context.restoreAuthSystemState();
@@ -1779,7 +1779,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                 .withTitle("embargoed item 1")
                 .withIssueDate("2017-11-18")
                 .withAuthor("Smith, Donald")
-                .withEmbargoPeriod("-2 week")
+                .withEmbargoPeriod(Period.ofWeeks(-2))
                 .build();
 
         context.restoreAuthSystemState();
@@ -1831,7 +1831,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                 )));
 
 
-        //Admin users are allowed to acceess undiscoverable items
+        //Admin users are allowed to access undiscoverable items
         String token1 = getAuthToken(admin.getEmail(), password);
         getClient(token1).perform(get("/api/core/items/" + unDiscoverableYetAccessibleItem1.getID()))
                 .andExpect(status().isOk())
@@ -2070,7 +2070,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         UUID idRef = null;
-        AtomicReference<UUID> idRefNoEmbeds = new AtomicReference<UUID>();
+        AtomicReference<UUID> idRefNoEmbeds = new AtomicReference<>();
         try {
         ObjectMapper mapper = new ObjectMapper();
         ItemRest itemRest = new ItemRest();
@@ -3927,7 +3927,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         createOrcidQueue(context, firstProfile, publication).build();
         createOrcidQueue(context, secondProfile, publication).build();
 
-        List<OrcidHistory> historyRecords = new ArrayList<OrcidHistory>();
+        List<OrcidHistory> historyRecords = new ArrayList<>();
         historyRecords.add(createOrcidHistory(context, firstProfile, publication).build());
         historyRecords.add(createOrcidHistory(context, firstProfile, publication).withPutCode("12345").build());
         historyRecords.add(createOrcidHistory(context, secondProfile, publication).build());
@@ -4014,7 +4014,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         createOrcidQueue(context, firstProfile, funding).build();
         createOrcidQueue(context, secondProfile, funding).build();
 
-        List<OrcidHistory> historyRecords = new ArrayList<OrcidHistory>();
+        List<OrcidHistory> historyRecords = new ArrayList<>();
         historyRecords.add(createOrcidHistory(context, firstProfile, funding).build());
         historyRecords.add(createOrcidHistory(context, firstProfile, funding).withPutCode("12345").build());
         historyRecords.add(createOrcidHistory(context, secondProfile, funding).build());
@@ -4113,7 +4113,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         String tokenAdmin = getAuthToken(admin.getEmail(), password);
         String tokenEperson = getAuthToken(eperson.getEmail(), password);
 
-        List<Operation> ops = new ArrayList<Operation>();
+        List<Operation> ops = new ArrayList<>();
         ReplaceOperation replaceOperation = new ReplaceOperation("/withdrawn", true);
         ops.add(replaceOperation);
         String patchBody = getPatchContent(ops);
@@ -4163,9 +4163,9 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                              .param("projection", "full"))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", CollectionMatcher.matchCollectionEntryFullProjection(
-                                        col1.getName(), col1.getID(), col1.getHandle())));;
+                                        col1.getName(), col1.getID(), col1.getHandle())));
 
-        // try to spoof information as a logged in eperson using embedding, verify that no embedds are included
+        // try to spoof information as a logged in eperson using embedding, verify that no embeds are included
         getClient(tokenEperson).perform(get("/api/core/items/" + item.getID())
                  .param("projection", "full"))
                  .andExpect(status().isOk())
@@ -4198,7 +4198,7 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
         getClient(tokenEperson).perform(get("/api/core/items/" + item.getID() + "/owningCollection"))
                                .andExpect(status().isForbidden());
 
-        // try to spoof information as anonymous user using embedding, verify that no embedds are included
+        // try to spoof information as anonymous user using embedding, verify that no embeds are included
         getClient().perform(get("/api/core/items/" + item.getID())
                    .param("projection", "full"))
                    .andExpect(status().isOk())
@@ -4696,4 +4696,124 @@ public class ItemRestRepositoryIT extends AbstractControllerIntegrationTest {
                    .andExpect(jsonPath("$.status", notNullValue()));
     }
 
+    @Test
+    public void findSubmitterByAdminTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and two collections.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+        EPerson submitter = EPersonBuilder.createEPerson(context)
+                .withEmail("testone@mail.com")
+                .withPassword(password)
+                .withCanLogin(true)
+                .build();
+
+        context.setCurrentUser(submitter);
+
+        //2. Three public items that are readable by Anonymous with different subjects
+        Item publicItem = ItemBuilder.createItem(context, col1)
+                .withTitle("Public item 1")
+                .withIssueDate("2017-10-17")
+                .withAuthor("Smith, Donald")
+                .withSubject("ExtraEntry")
+                .build();
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get("/api/core/items/" + publicItem.getID())
+                        .param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", ItemMatcher.matchFullEmbeds()));
+
+        getClient(token).perform(get("/api/core/items/" + publicItem.getID() + "/submitter"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.id", is(submitter.getID().toString())))
+                .andExpect(jsonPath("$.email", is(submitter.getEmail())));
+    }
+
+    @Test
+    public void findSubmitterWithoutReadAccessTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+
+        EPerson submitter = EPersonBuilder.createEPerson(context)
+                .withEmail("testone@mail.com")
+                .withPassword(password)
+                .withCanLogin(true)
+                .build();
+
+        context.setCurrentUser(submitter);
+
+        Item publicItem = ItemBuilder.createItem(context, col1)
+                .withTitle("Public item 1")
+                .withIssueDate("2017-10-17")
+                .withAuthor("Smith, Donald")
+                .withSubject("ExtraEntry")
+                .build();
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(eperson.getEmail(), password);
+
+        getClient(token).perform(get("/api/core/items/" + publicItem.getID())
+                        .param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", ItemMatcher.matchFullEmbeds()));
+
+//      find submitter by user has no read access
+        getClient(token).perform(get("/api/core/items/" + publicItem.getID() + "/submitter"))
+                .andExpect(status().isNoContent());
+    }
+
+    @Test
+    public void findSubmitterByAnonymousTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+
+        EPerson submitter = EPersonBuilder.createEPerson(context)
+                .withEmail("testone@mail.com")
+                .withPassword(password)
+                .withCanLogin(true)
+                .build();
+
+        context.setCurrentUser(submitter);
+
+        Item publicItem = ItemBuilder.createItem(context, col1)
+                .withTitle("Public item 1")
+                .withIssueDate("2017-10-17")
+                .withAuthor("Smith, Donald")
+                .withSubject("ExtraEntry")
+                .build();
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/core/items/" + publicItem.getID())
+                        .param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", ItemMatcher.matchFullEmbeds()));
+
+        getClient().perform(get("/api/core/items/" + publicItem.getID() + "/submitter"))
+                .andExpect(status().isNoContent());
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNInboxControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNInboxControllerIT.java
new file mode 100644
index 0000000000..78410af2e6
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNInboxControllerIT.java
@@ -0,0 +1,414 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.content.QAEvent.COAR_NOTIFY_SOURCE;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+import java.sql.SQLException;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.matcher.QASourceMatcher;
+import org.dspace.matcher.QATopicMatcher;
+import org.dspace.qaevent.QANotifyPatterns;
+import org.dspace.qaevent.service.QAEventService;
+import org.dspace.services.ConfigurationService;
+import org.dspace.utils.DSpace;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.web.servlet.request.RequestPostProcessor;
+
+
+/**
+ * LDN Controller test class. Simulate receiving external LDN messages
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+
+public class LDNInboxControllerIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    private QAEventService qaEventService = new DSpace().getSingletonService(QAEventService.class);
+
+    @Test
+    public void ldnInboxAnnounceEndorsementTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .withLowerIp("127.0.0.1")
+                                .withUpperIp("127.0.0.3")
+                                .build();
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        LDNMessageEntity ldnMessage = ldnMessageService.find(context, notification.getId());
+        checkStoredLDNMessage(notification, ldnMessage, object);
+    }
+
+    @Test
+    public void ldnInboxAnnounceReviewTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        InputStream announceReviewStream = getClass().getResourceAsStream("ldn_announce_review.json");
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .withStatus(true)
+                                .withLowerIp("127.0.0.1")
+                                .withUpperIp("127.0.0.3")
+                                .build();
+        String announceReview = IOUtils.toString(announceReviewStream, Charset.defaultCharset());
+        announceReviewStream.close();
+        String message = announceReview.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        ldnMessageService.extractAndProcessMessageFromQueue(context);
+
+        assertThat(qaEventService.findAllSources(context, 0, 20),
+            hasItem(QASourceMatcher.with(COAR_NOTIFY_SOURCE, 1L)));
+
+        assertThat(qaEventService.findAllTopicsBySource(context, COAR_NOTIFY_SOURCE, 0, 20, "topic", true), hasItem(
+            QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW, 1L)));
+
+    }
+
+    @Test
+    public void ldnInboxEndorsementActionBadRequestTest() throws Exception {
+        // id is not an uri
+        InputStream offerEndorsementStream = getClass().getResourceAsStream("ldn_offer_endorsement_badrequest.json");
+        String message = IOUtils.toString(offerEndorsementStream, Charset.defaultCharset());
+        offerEndorsementStream.close();
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void ldnInboxOfferReviewAndACKTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .withStatus(true)
+                                .withLowerIp("127.0.0.1")
+                                .withUpperIp("127.0.0.3")
+                                .build();
+        InputStream offerReviewStream = getClass().getResourceAsStream("ldn_offer_review.json");
+        String announceReview = IOUtils.toString(offerReviewStream, Charset.defaultCharset());
+        offerReviewStream.close();
+        String message = announceReview.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        int processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 1);
+        processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 0);
+
+        InputStream ackReviewStream = getClass().getResourceAsStream("ldn_ack_review_reject.json");
+        String ackReview = IOUtils.toString(ackReviewStream, Charset.defaultCharset());
+        offerReviewStream.close();
+        String ackMessage = ackReview.replaceAll("<<object_handle>>", object);
+        ackMessage = ackMessage.replaceAll("<<ldn_offer_review_uuid>>",
+            "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed307a509de");
+        ObjectMapper ackMapper = new ObjectMapper();
+        Notification ackNotification = mapper.readValue(ackMessage, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(ackMessage))
+            .andExpect(status().isAccepted());
+
+        int ackProcessed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(ackProcessed, 1);
+        ackProcessed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(ackProcessed, 0);
+
+
+    }
+
+    @Test
+    public void ldnInboxAnnounceReleaseTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        InputStream announceRelationshipStream = getClass().getResourceAsStream("ldn_announce_release.json");
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .withStatus(true)
+                                .withLowerIp("127.0.0.1")
+                                .withUpperIp("127.0.0.3")
+                                .build();
+        String announceRelationship = IOUtils.toString(announceRelationshipStream, Charset.defaultCharset());
+        announceRelationshipStream.close();
+        String message = announceRelationship.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        ldnMessageService.extractAndProcessMessageFromQueue(context);
+
+        assertThat(qaEventService.findAllSources(context, 0, 20),
+            hasItem(QASourceMatcher.with(COAR_NOTIFY_SOURCE, 1L)));
+
+        assertThat(qaEventService.findAllTopicsBySource(context, COAR_NOTIFY_SOURCE, 0, 20, "topic", true), hasItem(
+            QATopicMatcher.with(QANotifyPatterns.TOPIC_ENRICH_MORE_LINK, 1L)));
+
+    }
+
+    private void checkStoredLDNMessage(Notification notification, LDNMessageEntity ldnMessage, String object)
+        throws Exception {
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification storedMessage = mapper.readValue(ldnMessage.getMessage(), Notification.class);
+
+        assertNotNull(ldnMessage);
+        assertNotNull(ldnMessage.getObject());
+        assertEquals(ldnMessage.getObject()
+                               .getMetadata()
+                               .stream()
+                               .filter(metadataValue ->
+                                   metadataValue.getMetadataField().toString('.').equals("dc.identifier.uri"))
+                               .map(metadataValue -> metadataValue.getValue())
+                               .findFirst().get(), object);
+
+        assertEquals(notification.getId(), storedMessage.getId());
+        assertEquals(notification.getOrigin().getInbox(), storedMessage.getOrigin().getInbox());
+        assertEquals(notification.getTarget().getInbox(), storedMessage.getTarget().getInbox());
+        assertEquals(notification.getObject().getId(), storedMessage.getObject().getId());
+        assertEquals(notification.getType(), storedMessage.getType());
+    }
+
+    @Test
+    public void ldnInboxAnnounceEndorsementInvalidIpTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .withLowerIp("127.0.0.1")
+                                .withUpperIp("127.0.0.1")
+                                .build();
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox").with(remoteHost("mydocker.url", "172.23.0.1"))
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isBadRequest());
+
+        int processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 0);
+        LDNMessageEntity ldnMessage = ldnMessageService.find(context, notification.getId());
+        assertNull(ldnMessage);
+    }
+
+    @Test
+    public void ldnInboxAnnounceEndorsementInvalidInboxTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .withLowerIp("127.0.0.2")
+                                .withUpperIp("127.0.0.5")
+                                .build();
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_origin_inbox_unregistered.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+            .contentType("application/ld+json")
+            .content(message))
+            .andExpect(status().isBadRequest());
+
+        int processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 0);
+
+    }
+
+    @Test
+    public void ldnInboxOutOfRangeIPwithDisabledCheckTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        configurationService.setProperty("ldn.notify.inbox.block-untrusted-ip", false);
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .withLowerIp("127.0.0.1")
+                                .withUpperIp("127.0.0.1")
+                                .build();
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox").with(remoteHost("mydocker.url", "172.23.0.1"))
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        LDNMessageEntity ldnMessage = ldnMessageService.find(context, notification.getId());
+        checkStoredLDNMessage(notification, ldnMessage, object);
+        assertEquals(ldnMessage.getQueueStatus(), LDNMessageEntity.QUEUE_STATUS_UNTRUSTED_IP);
+    }
+
+    private static RequestPostProcessor remoteHost(final String remoteHost, final String remoteAddr) {
+        return request -> {
+            request.setRemoteHost(remoteHost);
+            request.setRemoteAddr(remoteAddr);
+            return request;
+        };
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<LDNMessageEntity> ldnMessageEntities = ldnMessageService.findAll(context);
+        if (CollectionUtils.isNotEmpty(ldnMessageEntities)) {
+            ldnMessageEntities.forEach(ldnMessage -> {
+                try {
+                    ldnMessageService.delete(context, ldnMessage);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        super.destroy();
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNMessageRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNMessageRestControllerIT.java
new file mode 100644
index 0000000000..95cdd3c28f
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNMessageRestControllerIT.java
@@ -0,0 +1,150 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.sql.SQLException;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.services.ConfigurationService;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration Tests against {@link LDNMessageRestController}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageRestControllerIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Test
+    public void findByItemUnAuthorizedTest() throws Exception {
+        getClient()
+                .perform(post("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4/enqueueretry"))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findByItemIsForbiddenTest() throws Exception {
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+            .perform(post("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4/enqueueretry"))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findByItemNotFoundTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(post("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4/enqueueretry"))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findByItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("community")
+                                              .build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+                               .withTitle("item title")
+                               .build();
+
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(post("/api/ldn/messages/" + notification.getId() + "/enqueueretry"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(notification.getId())))
+            .andExpect(jsonPath("$.notificationId", is(notification.getId())))
+            .andExpect(jsonPath("$.queueStatus", is(7)))
+            .andExpect(jsonPath("$.queueStatusLabel", is("QUEUE_STATUS_QUEUED_FOR_RETRY")))
+            .andExpect(jsonPath("$.context", is(item.getID().toString())))
+            .andExpect(jsonPath("$.object", is(item.getID().toString())))
+            .andExpect(jsonPath("$.target", nullValue()))
+            .andExpect(jsonPath("$.origin", is(notifyService.getID())))
+            .andExpect(jsonPath("$.inReplyTo", nullValue()))
+            .andExpect(jsonPath("$.activityStreamType", is("Announce")))
+            .andExpect(jsonPath("$.coarNotifyType", is("coar-notify:EndorsementAction")))
+            .andExpect(jsonPath("$.queueAttempts", is(0)))
+            .andExpect(jsonPath("$.notificationType", is("Incoming")));
+
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<LDNMessageEntity> ldnMessageEntities = ldnMessageService.findAll(context);
+        if (CollectionUtils.isNotEmpty(ldnMessageEntities)) {
+            ldnMessageEntities.forEach(ldnMessage -> {
+                try {
+                    ldnMessageService.delete(context, ldnMessage);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        super.destroy();
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNMessageRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNMessageRestRepositoryIT.java
new file mode 100644
index 0000000000..5dba09c0f8
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LDNMessageRestRepositoryIT.java
@@ -0,0 +1,255 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.nullValue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.sql.SQLException;
+import java.util.List;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.io.IOUtils;
+import org.dspace.app.ldn.LDNMessageEntity;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.model.LDNMessageEntityRest;
+import org.dspace.app.rest.repository.LDNMessageRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.services.ConfigurationService;
+import org.junit.After;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration Tests against {@link LDNMessageRestRepository}
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class LDNMessageRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Test
+    public void findOneUnAuthorizedTest() throws Exception {
+        getClient()
+            .perform(get("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4"))
+            .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneIsForbiddenTest() throws Exception {
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4"))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findOneIsNotFoundTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4"))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("community")
+                                              .build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+                               .withTitle("item title")
+                               .build();
+
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/messages/" + notification.getId()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(notification.getId())))
+            .andExpect(jsonPath("$.notificationId", is(notification.getId())))
+            .andExpect(jsonPath("$.queueStatus", is(1)))
+            .andExpect(jsonPath("$.queueStatusLabel", is("QUEUE_STATUS_QUEUED")))
+            .andExpect(jsonPath("$.context", is(item.getID().toString())))
+            .andExpect(jsonPath("$.object", is(item.getID().toString())))
+            .andExpect(jsonPath("$.target", nullValue()))
+            .andExpect(jsonPath("$.origin", is(notifyService.getID())))
+            .andExpect(jsonPath("$.inReplyTo", nullValue()))
+            .andExpect(jsonPath("$.activityStreamType", is("Announce")))
+            .andExpect(jsonPath("$.coarNotifyType", is("coar-notify:EndorsementAction")))
+            .andExpect(jsonPath("$.queueAttempts", is(0)))
+            .andExpect(jsonPath("$.notificationType", is("Incoming")));
+    }
+
+    @Test
+    public void findAllUnAuthorizedTest() throws Exception {
+        getClient().perform(get("/api/ldn/messages"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findAllIsForbiddenTest() throws Exception {
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/ldn/messages"))
+                            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context)
+                                              .withName("community")
+                                              .build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+
+        Item item = ItemBuilder.createItem(context, collection)
+                               .withTitle("item title")
+                               .build();
+
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+
+        NotifyServiceEntity notifyService =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("https://overlay-journal.com/inbox/")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        InputStream announceEndorsementStream = getClass().getResourceAsStream("ldn_announce_endorsement.json");
+        String announceEndorsement = IOUtils.toString(announceEndorsementStream, Charset.defaultCharset());
+        announceEndorsementStream.close();
+        String message = announceEndorsement.replaceAll("<<object>>", object);
+        message = message.replaceAll("<<object_handle>>", object);
+
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/messages/"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.messages[0].id", is(notification.getId())))
+            .andExpect(jsonPath("$._embedded.messages[0].notificationId", is(notification.getId())))
+            .andExpect(jsonPath("$._embedded.messages[0].queueStatus", is(1)))
+            .andExpect(jsonPath("$._embedded.messages[0].queueStatusLabel", is("QUEUE_STATUS_QUEUED")))
+            .andExpect(jsonPath("$._embedded.messages[0].context", is(item.getID().toString())))
+            .andExpect(jsonPath("$._embedded.messages[0].object", is(item.getID().toString())))
+            .andExpect(jsonPath("$._embedded.messages[0].target", nullValue()))
+            .andExpect(jsonPath("$._embedded.messages[0].origin", is(notifyService.getID())))
+            .andExpect(jsonPath("$._embedded.messages[0].inReplyTo", nullValue()))
+            .andExpect(jsonPath("$._embedded.messages[0].activityStreamType", is("Announce")))
+            .andExpect(jsonPath("$._embedded.messages[0].coarNotifyType", is("coar-notify:EndorsementAction")))
+            .andExpect(jsonPath("$._embedded.messages[0].queueAttempts", is(0)))
+            .andExpect(jsonPath("$._embedded.messages[0].notificationType", is("Incoming")));
+    }
+
+    @Test
+    public void createLDNMessageTest() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        LDNMessageEntityRest data = new LDNMessageEntityRest();
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken)
+            .perform(post("/api/ldn/messages")
+                .content(mapper.writeValueAsBytes(data))
+                .contentType(contentType))
+            .andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void deleteLDNMessageTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(delete("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4"))
+            .andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void patchLDNMessageTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/messages/urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4")
+                .content(getPatchContent(List.of()))
+                .contentType(APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isMethodNotAllowed());
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<LDNMessageEntity> ldnMessageEntities = ldnMessageService.findAll(context);
+        if (CollectionUtils.isNotEmpty(ldnMessageEntities)) {
+            ldnMessageEntities.forEach(ldnMessage -> {
+                try {
+                    ldnMessageService.delete(context, ldnMessage);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        super.destroy();
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LoginAsEPersonIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LoginAsEPersonIT.java
index 60d0e1a2a5..1f9b2909b7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/LoginAsEPersonIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/LoginAsEPersonIT.java
@@ -214,7 +214,7 @@ public class LoginAsEPersonIT extends AbstractControllerIntegrationTest {
     /**
      * Test claiming of a pool task with the LoginOnBehalfOf header. Thus checking that an admin can impersonate
      * an eperson to claim a pooltask and checking later on that the owner of this claimedTask is indeed
-     * the reviwer
+     * the reviewer
      *
      * @throws Exception
      */
@@ -334,7 +334,7 @@ public class LoginAsEPersonIT extends AbstractControllerIntegrationTest {
         getClient().perform(get("/api/core/items/" + publicItem.getID()))
                    .andExpect(status().isOk());
 
-        // Check publicItem bitstream creation (shuold be stored in bundle)
+        // Check publicItem bitstream creation (should be stored in bundle)
         getClient().perform(get("/api/core/items/" + publicItem.getID() + "/bundles"))
                    .andExpect(status().isOk())
                    .andExpect(content().contentType(contentType))
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MappedCollectionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MappedCollectionRestRepositoryIT.java
index f38f5ced75..a32886da20 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/MappedCollectionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/MappedCollectionRestRepositoryIT.java
@@ -108,7 +108,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
         String adminToken = getAuthToken(admin.getEmail(), password);
 
         getClient(adminToken).perform(
-                post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+                post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content(
                                 "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID() + "\n"
@@ -164,7 +164,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                     .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                     .content(
                             "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID() + "\n" +
@@ -229,7 +229,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                     .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                     .content(
                             "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID() + "\n" +
@@ -283,7 +283,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                     .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                     .content(
                             "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID() + "\n" +
@@ -335,7 +335,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+            .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                     .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                     .content(
                             "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID() + "\n" +
@@ -443,7 +443,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-                .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+                .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content("https://localhost:8080/spring-rest/api/core/collections/" + col1.getID())
                 )
@@ -503,7 +503,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-                .perform(post("/api/core/items/" + templateItem.getID() + "/mappedCollections/")
+                .perform(post("/api/core/items/" + templateItem.getID() + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content("https://localhost:8080/spring-rest/api/core/collections/" + col2.getID())
                 )
@@ -563,14 +563,14 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken)
-                .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+                .perform(post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content("https://localhost:8080/spring-rest/api/core/collections/" + "badCollectionID")
                 )
                 .andExpect(status().isUnprocessableEntity());
 
         getClient(adminToken)
-                .perform(post("/api/core/items/" + "badItemID" + "/mappedCollections/")
+                .perform(post("/api/core/items/" + "badItemID" + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content("https://localhost:8080/spring-rest/api/core/collections/" + col1.getID())
                 )
@@ -646,7 +646,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 //        itemService.update(context, publicItem1);
 
         getClient().perform(
-                post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+                post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content(
                                 "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -686,7 +686,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
         String adminToken = getAuthToken(admin.getEmail(), password);
 
         getClient(adminToken).perform(
-                post("/api/core/items/" + publicItem1.getID() + "/mappedCollections/")
+                post("/api/core/items/" + publicItem1.getID() + "/mappedCollections")
                         .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                         .content(
                                 "https://localhost:8080/spring-rest/api/core/collections/" + col2.getID()
@@ -735,7 +735,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         // Map the item to the sink collection
         getClient(adminToken).perform(
-            post("/api/core/items/" + item.getID() + "/mappedCollections/")
+            post("/api/core/items/" + item.getID() + "/mappedCollections")
                 .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                 .content(
                     "https://localhost:8080/spring-rest/api/core/collections/" + sink.getID() + "\n"
@@ -782,7 +782,7 @@ public class MappedCollectionRestRepositoryIT extends AbstractControllerIntegrat
 
         //3. The item mapped to the sink collection
         getClient(adminToken).perform(
-            post("/api/core/items/" + item.getID() + "/mappedCollections/")
+            post("/api/core/items/" + item.getID() + "/mappedCollections")
                 .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
                 .content(
                     "https://localhost:8080/spring-rest/api/core/collections/" + sink.getID() + "\n"
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyRequestStatusRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyRequestStatusRestControllerIT.java
new file mode 100644
index 0000000000..700e1eab95
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyRequestStatusRestControllerIT.java
@@ -0,0 +1,203 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.junit.Assert.assertEquals;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.io.IOUtils;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.model.Notification;
+import org.dspace.app.ldn.service.LDNMessageService;
+import org.dspace.app.rest.model.NotifyRequestStatusRest;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.services.ConfigurationService;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Rest Controller for NotifyRequestStatus targeting items IT
+ * class {@link NotifyRequestStatusRestController}
+ *
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science dot it)
+ */
+public class NotifyRequestStatusRestControllerIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private LDNMessageService ldnMessageService;
+
+    @Test
+    public void oneStatusReviewedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withStatus(true)
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .build();
+        //SEND OFFER REVIEW
+        InputStream offerReviewStream = getClass().getResourceAsStream("ldn_offer_review.json");
+        String announceReview = IOUtils.toString(offerReviewStream, Charset.defaultCharset());
+        offerReviewStream.close();
+        String message = announceReview.replaceAll("<<object_handle>>", object);
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        int processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 1);
+        processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 0);
+
+        //CHECK THE SERVICE ON ITS notifystatus ARRAY
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/" + NotifyRequestStatusRest.CATEGORY + "/"
+                + NotifyRequestStatusRest.NAME + "/" + item.getID())
+                .contentType("application/ld+json"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyStatus").isArray())
+            .andExpect(jsonPath("$.notifyStatus").isNotEmpty())
+            .andExpect(jsonPath("$.notifyStatus[0].status").value("REQUESTED"))
+            .andExpect(jsonPath("$.notifyStatus[0].serviceUrl").value("https://review-service.com/inbox/about/"))
+            ;
+    }
+
+    @Test
+    public void oneStatusAnnounceEndorsementTestDisabledService() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity = NotifyServiceBuilder
+                                .createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withStatus(false) // service is disabled
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .build();
+        //SEND OFFER REVIEW
+        InputStream offerReviewStream = getClass().getResourceAsStream("ldn_offer_review3.json");
+        String announceReview = IOUtils.toString(offerReviewStream, Charset.defaultCharset());
+        offerReviewStream.close();
+        String message = announceReview.replaceAll("<<object_handle>>", object);
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        int processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 0);
+        processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 0);
+
+    }
+
+    @Test
+    public void oneStatusRejectedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Community community = CommunityBuilder.createCommunity(context).withName("community").build();
+        Collection collection = CollectionBuilder.createCollection(context, community).build();
+        Item item = ItemBuilder.createItem(context, collection).build();
+        String object = configurationService.getProperty("dspace.ui.url") + "/handle/" + item.getHandle();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withStatus(true)
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .build();
+        //SEND OFFER REVIEW
+        InputStream offerReviewStream = getClass().getResourceAsStream("ldn_offer_review2.json");
+        String announceReview = IOUtils.toString(offerReviewStream, Charset.defaultCharset());
+        offerReviewStream.close();
+        String message = announceReview.replaceAll("<<object_handle>>", object);
+        ObjectMapper mapper = new ObjectMapper();
+        Notification notification = mapper.readValue(message, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(message))
+            .andExpect(status().isAccepted());
+
+        int processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(processed, 1);
+        processed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+
+        assertEquals(processed, 0);
+        //SEND ACK REVIEW REJECTED
+        InputStream ackReviewStream = getClass().getResourceAsStream("ldn_ack_review_reject.json");
+        String ackReview = IOUtils.toString(ackReviewStream, Charset.defaultCharset());
+        ackReviewStream.close();
+        String ackMessage = ackReview.replaceAll("<<object_handle>>", object);
+        ackMessage = ackMessage.replaceAll(
+            "<<ldn_offer_review_uuid>>", "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed307a509df");
+
+        ObjectMapper ackMapper = new ObjectMapper();
+        Notification ackNotification = ackMapper.readValue(ackMessage, Notification.class);
+        getClient()
+            .perform(post("/ldn/inbox")
+                .contentType("application/ld+json")
+                .content(ackMessage))
+            .andExpect(status().isAccepted());
+
+        int ackProcessed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(ackProcessed, 1);
+        ackProcessed = ldnMessageService.extractAndProcessMessageFromQueue(context);
+        assertEquals(ackProcessed, 0);
+
+        //CHECK THE SERVICE ON ITS notifystatus ARRAY
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/" + NotifyRequestStatusRest.CATEGORY + "/"
+                + NotifyRequestStatusRest.NAME + "/" + item.getID())
+                .contentType("application/ld+json"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyStatus").isArray())
+            .andExpect(jsonPath("$.notifyStatus").isNotEmpty())
+            .andExpect(jsonPath("$.notifyStatus[0].status").value("REJECTED"))
+            .andExpect(jsonPath("$.notifyStatus[0].serviceUrl").value("https://review-service.com/inbox/about/"))
+            .andExpect(jsonPath("$.notifyStatus[0].offerType").value("Review"))
+            ;
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyServiceRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyServiceRestRepositoryIT.java
new file mode 100644
index 0000000000..15b1ffc7cc
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/NotifyServiceRestRepositoryIT.java
@@ -0,0 +1,2444 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.dspace.app.rest.matcher.NotifyServiceMatcher.matchNotifyService;
+import static org.dspace.app.rest.matcher.NotifyServiceMatcher.matchNotifyServicePattern;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.closeTo;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.RandomUtils;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.ldn.service.NotifyService;
+import org.dspace.app.rest.model.NotifyServiceInboundPatternRest;
+import org.dspace.app.rest.model.NotifyServiceRest;
+import org.dspace.app.rest.model.patch.AddOperation;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.patch.RemoveOperation;
+import org.dspace.app.rest.model.patch.ReplaceOperation;
+import org.dspace.app.rest.repository.NotifyServiceRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.builder.NotifyServiceInboundPatternBuilder;
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Integration test class for {@link NotifyServiceRestRepository}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private NotifyService notifyService;
+
+    @Test
+    public void findAllUnAuthorizedTest() throws Exception {
+        getClient().perform(get("/api/ldn/ldnservices"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntityOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withDescription("service description one")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceEntityTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withDescription("service description two")
+                                .withUrl("https://service2.ldn.org/about")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceEntityThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withDescription("service description three")
+                                .withUrl("https://service3.ldn.org/about")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$._embedded.ldnservices", containsInAnyOrder(
+                matchNotifyService(notifyServiceEntityOne.getID(), "service name one", "service description one",
+                    "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                matchNotifyService(notifyServiceEntityTwo.getID(), "service name two", "service description two",
+                    "https://service2.ldn.org/about", "https://service2.ldn.org/inbox"),
+                matchNotifyService(notifyServiceEntityThree.getID(), "service name three", "service description three",
+                    "https://service3.ldn.org/about", "https://service3.ldn.org/inbox")
+            )));
+    }
+
+    @Test
+    public void findOneUnAuthorizedTest() throws Exception {
+        getClient().perform(get("/api/ldn/ldnservices/1"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneNotFoundTest() throws Exception {
+
+        getClient(getAuthToken(eperson.getEmail(), password))
+            .perform(get("/api/ldn/ldnservices/" + RandomUtils.nextInt()))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices/" + notifyServiceEntity.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$",
+                matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                    "https://service.ldn.org/about", "https://service.ldn.org/inbox")));
+    }
+
+    @Test
+    public void createForbiddenTest() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        NotifyServiceRest notifyServiceRest = new NotifyServiceRest();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(post("/api/ldn/ldnservices")
+                                .content(mapper.writeValueAsBytes(notifyServiceRest))
+                                .contentType(contentType))
+                            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void createTestScoreFail() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+
+        NotifyServiceInboundPatternRest inboundPatternRestOne = new NotifyServiceInboundPatternRest();
+        inboundPatternRestOne.setPattern("patternA");
+        inboundPatternRestOne.setConstraint("itemFilterA");
+        inboundPatternRestOne.setAutomatic(true);
+
+        NotifyServiceInboundPatternRest inboundPatternRestTwo = new NotifyServiceInboundPatternRest();
+        inboundPatternRestTwo.setPattern("patternB");
+        inboundPatternRestTwo.setAutomatic(false);
+
+        NotifyServiceRest notifyServiceRest = new NotifyServiceRest();
+        notifyServiceRest.setName("service name");
+        notifyServiceRest.setDescription("service description");
+        notifyServiceRest.setUrl("service url");
+        notifyServiceRest.setLdnUrl("service ldn url");
+        notifyServiceRest.setScore(BigDecimal.TEN);
+        notifyServiceRest.setNotifyServiceInboundPatterns(List.of(inboundPatternRestOne, inboundPatternRestTwo));
+        notifyServiceRest.setEnabled(false);
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(post("/api/ldn/ldnservices")
+            .content(mapper.writeValueAsBytes(notifyServiceRest))
+            .contentType(contentType))
+        .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void createTest() throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+
+        NotifyServiceInboundPatternRest inboundPatternRestOne = new NotifyServiceInboundPatternRest();
+        inboundPatternRestOne.setPattern("patternA");
+        inboundPatternRestOne.setConstraint("itemFilterA");
+        inboundPatternRestOne.setAutomatic(true);
+
+        NotifyServiceInboundPatternRest inboundPatternRestTwo = new NotifyServiceInboundPatternRest();
+        inboundPatternRestTwo.setPattern("patternB");
+        inboundPatternRestTwo.setAutomatic(false);
+
+        NotifyServiceRest notifyServiceRest = new NotifyServiceRest();
+        notifyServiceRest.setName("service name");
+        notifyServiceRest.setDescription("service description");
+        notifyServiceRest.setUrl("https://service.ldn.org/about");
+        notifyServiceRest.setLdnUrl("https://service.ldn.org/inbox");
+        notifyServiceRest.setNotifyServiceInboundPatterns(List.of(inboundPatternRestOne, inboundPatternRestTwo));
+        notifyServiceRest.setEnabled(false);
+        notifyServiceRest.setLowerIp("192.168.0.1");
+        notifyServiceRest.setUpperIp("192.168.0.5");
+
+        AtomicReference<Integer> idRef = new AtomicReference<Integer>();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(post("/api/ldn/ldnservices")
+                                .content(mapper.writeValueAsBytes(notifyServiceRest))
+                                .contentType(contentType))
+                            .andExpect(status().isCreated())
+                            .andExpect(jsonPath("$", matchNotifyService("service name", "service description",
+                                "https://service.ldn.org/about", "https://service.ldn.org/inbox", false,
+                                "192.168.0.1", "192.168.0.5")))
+                            .andDo(result ->
+                                idRef.set((read(result.getResponse().getContentAsString(), "$.id"))));
+
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices/" + idRef.get()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$", allOf(
+                matchNotifyService(idRef.get(), "service name", "service description",
+                    "https://service.ldn.org/about", "https://service.ldn.org/inbox", false,
+                    "192.168.0.1", "192.168.0.5"),
+                hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                    matchNotifyServicePattern("patternA", "itemFilterA", true),
+                    matchNotifyServicePattern("patternB", null, false)
+                )))
+            ));
+
+        // Delete the created service
+        NotifyServiceBuilder.deleteNotifyService(idRef.get());
+    }
+
+    @Test
+    public void notifyServicePatchOperationForbiddenTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation operation = new AddOperation("/description", "add service description");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void notifyServiceDescriptionAddOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation operation = new AddOperation("/description", "add service description");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceDescriptionAddOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .isEnabled(false)
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation operation = new AddOperation("/description", "add service description");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "add service description", "https://service.ldn.org/about", "https://service.ldn.org/inbox", false))
+            );
+    }
+
+    @Test
+    public void notifyServiceDescriptionReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/description", "service description replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceDescriptionReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/description", "service description replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description replaced", "https://service.ldn.org/about",
+                "https://service.ldn.org/inbox", false))
+            );
+    }
+
+    @Test
+    public void notifyServiceDescriptionRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .isEnabled(false)
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation operation = new RemoveOperation("/description");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                null, "https://service.ldn.org/about", "https://service.ldn.org/inbox", false))
+            );
+    }
+
+    @Test
+    public void notifyServiceUrlAddOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation operation = new AddOperation("/url", "add service url");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceUrlAddOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation operation = new AddOperation("/url", "add service url");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "add service url", "https://service.ldn.org/inbox", false))
+            );
+    }
+
+    @Test
+    public void notifyServiceUrlReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/url", "service url replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceUrlReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .isEnabled(true)
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/url", "service url replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "service url replaced", "https://service.ldn.org/inbox", true))
+            );
+    }
+
+    @Test
+    public void notifyServiceUrlRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation operation = new RemoveOperation("/url");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", null, "https://service.ldn.org/inbox"))
+            );
+    }
+
+    // TODO: Test is currently ignored as the code in this test is IDENTICAL to the code in
+    // "notifyServiceNameReplaceOperationTest". It's unclear WHY this should throw a 400 exception?
+    @Test
+    @Ignore
+    public void notifyServiceNameReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/name", "service name replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceNameReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/name", "service name replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name replaced",
+                "service description", "https://service.ldn.org/about", "https://service.ldn.org/inbox"))
+            );
+    }
+
+    @Test
+    public void notifyServiceLdnUrlReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withUrl("https://service.ldn.org/about")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/ldnurl", "service ldn url replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceLdnUrlReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/ldnurl", "service ldn url replaced");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "https://service.ldn.org/about", "service ldn url replaced"))
+            );
+    }
+
+    @Test
+    public void notifyServiceNameRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation operation = new RemoveOperation("/name");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    @Ignore
+    /*
+     * frabacche senseless because it's a mandatory+unique
+     * entity field and also table column!
+     */
+    public void notifyServiceLdnUrlRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation operation = new RemoveOperation("/ldnurl");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void findByLdnUrlUnAuthorizedTest() throws Exception {
+        getClient().perform(get("/api/ldn/ldnservices/search/byLdnUrl")
+                       .param("ldnUrl", "test"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findByLdnUrlBadRequestTest() throws Exception {
+        getClient(getAuthToken(eperson.getEmail(), password))
+            .perform(get("/api/ldn/ldnservices/search/byLdnUrl"))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void findByLdnUrlTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntityOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withDescription("service description one")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+      NotifyServiceEntity notifyServiceEntityTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withDescription("service description two")
+                                .withUrl("https://service2.ldn.org/about")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+      NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                          .withDescription("service description three")
+                          .withUrl("https://service3.ldn.org/about")
+                          .withLdnUrl("https://service3.ldn.org/inbox")
+                          .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices/search/byLdnUrl")
+                .param("ldnUrl", notifyServiceEntityOne.getLdnUrl()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntityOne.getID(),
+                "service name one", "service description one",
+                "https://service.ldn.org/about", "https://service.ldn.org/inbox")));
+    }
+
+    @Test
+    public void deleteUnAuthorizedTest() throws Exception {
+        getClient().perform(delete("/api/ldn/ldnservices/" + RandomUtils.nextInt()))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void deleteForbiddenTest() throws Exception {
+        getClient(getAuthToken(eperson.getEmail(), password))
+            .perform(delete("/api/ldn/ldnservices/" + RandomUtils.nextInt()))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void deleteNotFoundTest() throws Exception {
+        getClient(getAuthToken(admin.getEmail(), password))
+            .perform(delete("/api/ldn/ldnservices/" + RandomUtils.nextInt()))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void deleteTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("service ldnUrl")
+                                .build();
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(delete("/api/ldn/ldnservices/" + notifyServiceEntity.getID()))
+            .andExpect(status().isNoContent());
+
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices/" + notifyServiceEntity.getID()))
+            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsAddOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsAddOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        // patch add operation but pattern is already existed
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        RemoveOperation inboundRemoveOperation = new RemoveOperation("notifyServiceInboundPatterns[0]");
+        ops.clear();
+        ops.add(inboundRemoveOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(1)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", hasItem(
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsRemoveOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperation = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        ops.add(inboundAddOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(1)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false)
+                    ))
+                )));
+
+        // index out of the range
+        RemoveOperation inboundRemoveOperation = new RemoveOperation("notifyServiceInboundPatterns[1]");
+        ops.clear();
+        ops.add(inboundRemoveOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternConstraintAddOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":null,\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", null, false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        AddOperation inboundAddOperation = new AddOperation("notifyServiceInboundPatterns[0]/constraint",
+            "itemFilterA");
+        ops.clear();
+        ops.add(inboundAddOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternConstraintAddOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        AddOperation inboundAddOperation = new AddOperation("notifyServiceInboundPatterns[0]/constraint",
+            "itemFilterA");
+        ops.clear();
+        ops.add(inboundAddOperation);
+        patchBody = getPatchContent(ops);
+
+        // constraint at index 0 already has value
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternConstraintReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[0]/constraint",
+            "itemFilterC");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterC", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternConstraintReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":null,\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", null, false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[0]/constraint",
+            "itemFilterA");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        // constraint at index 0 is null
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+
+    @Test
+    public void NotifyServiceInboundPatternConstraintRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        RemoveOperation inboundRemoveOperation = new RemoveOperation("notifyServiceInboundPatterns[1]/constraint");
+        ops.clear();
+        ops.add(inboundRemoveOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", null, true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternConstraintRemoveOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperation = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        ops.add(inboundAddOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(1)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false)
+                    ))
+                )));
+
+        // index out of the range
+        RemoveOperation inboundRemoveOperation = new RemoveOperation("notifyServiceInboundPatterns[1]/constraint");
+        ops.clear();
+        ops.add(inboundRemoveOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternPatternAddOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":null,\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern(null, "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        AddOperation inboundAddOperation = new AddOperation("notifyServiceInboundPatterns[0]/pattern",
+            "patternA");
+        ops.clear();
+        ops.add(inboundAddOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternPatternAddOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        AddOperation inboundAddOperation = new AddOperation("notifyServiceInboundPatterns[0]/pattern",
+            "patternA");
+        ops.clear();
+        ops.add(inboundAddOperation);
+        patchBody = getPatchContent(ops);
+
+        // pattern at index 0 already has value
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternPatternReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[0]/pattern",
+            "patternC");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternC", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternPatternReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":null,\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern(null, "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[0]/pattern",
+            "patternA");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        // pattern at index 0 is null
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternAutomaticReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[0]/automatic",
+            "true");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", true),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternAutomaticReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[0]/automatic",
+            "test");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        // patch not boolean value
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns",
+            "[{\"pattern\":\"patternC\",\"constraint\":\"itemFilterC\",\"automatic\":\"true\"}," +
+                "{\"pattern\":\"patternD\",\"constraint\":\"itemFilterD\",\"automatic\":\"true\"}]");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternC", "itemFilterC", true),
+                        matchNotifyServicePattern("patternD", "itemFilterD", true)
+                    ))
+                )));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsReplaceWithEmptyArrayOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        // empty array will only remove all old patterns
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns", "[]");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", empty()));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        // value must be an array not object
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternsRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", containsInAnyOrder(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        RemoveOperation inboundRemoveOperation = new RemoveOperation("notifyServiceInboundPatterns");
+        ops.clear();
+        ops.add(inboundRemoveOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", empty()));
+    }
+
+    @Test
+    public void NotifyServiceInboundPatternReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation inboundAddOperationOne = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternA\",\"constraint\":\"itemFilterA\",\"automatic\":\"false\"}");
+
+        AddOperation inboundAddOperationTwo = new AddOperation("notifyServiceInboundPatterns/-",
+            "{\"pattern\":\"patternB\",\"constraint\":\"itemFilterB\",\"automatic\":\"true\"}");
+
+        ops.add(inboundAddOperationOne);
+        ops.add(inboundAddOperationTwo);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternB", "itemFilterB", true)
+                    ))
+                )));
+
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("notifyServiceInboundPatterns[1]",
+            "{\"pattern\":\"patternC\",\"constraint\":\"itemFilterC\",\"automatic\":\"false\"}");
+        ops.clear();
+        ops.add(inboundReplaceOperation);
+        patchBody = getPatchContent(ops);
+
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", hasSize(2)))
+            .andExpect(jsonPath("$",
+                allOf(
+                    matchNotifyService(notifyServiceEntity.getID(), "service name", "service description",
+                        "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                    hasJsonPath("$.notifyServiceInboundPatterns", contains(
+                        matchNotifyServicePattern("patternA", "itemFilterA", false),
+                        matchNotifyServicePattern("patternC", "itemFilterC", false)
+                    ))
+                )));
+    }
+
+    @Test
+    public void findManualServicesByInboundPatternUnAuthorizedTest() throws Exception {
+        getClient().perform(get("/api/ldn/ldnservices/search/byInboundPattern")
+                       .param("pattern", "pattern"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findManualServicesByInboundPatternBadRequestTest() throws Exception {
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices/search/byInboundPattern"))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void findManualServicesByInboundPatternTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntityOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withDescription("service description one")
+                                .withUrl("https://service.ldn.org/about")
+                                .withStatus(true)
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceEntityTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withDescription("service description two")
+                                .withUrl("https://service2.ldn.org/about")
+                                .withStatus(true)
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceEntityThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withDescription("service description")
+                                .withUrl("https://service3.ldn.org/about")
+                                .withStatus(true)
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceEntityOne)
+                                          .withPattern("review")
+                                          .withConstraint("itemFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceEntityOne)
+                                          .withPattern("review")
+                                          .withConstraint("itemFilterB")
+                                          .isAutomatic(true)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceEntityTwo)
+                                          .withPattern("review")
+                                          .withConstraint("itemFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceEntityTwo)
+                                          .withPattern("review")
+                                          .withConstraint("itemFilterB")
+                                          .isAutomatic(true)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceEntityThree)
+                                          .withPattern("review")
+                                          .withConstraint("itemFilterB")
+                                          .isAutomatic(true)
+                                          .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/ldn/ldnservices/search/byInboundPattern")
+                .param("pattern", "review"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.page.totalElements", is(2)))
+            .andExpect(jsonPath("$._embedded.ldnservices", containsInAnyOrder(
+                matchNotifyService(notifyServiceEntityOne.getID(), "service name one", "service description one",
+                "https://service.ldn.org/about", "https://service.ldn.org/inbox"),
+                matchNotifyService(notifyServiceEntityTwo.getID(), "service name two", "service description two",
+                    "https://service2.ldn.org/about", "https://service2.ldn.org/inbox")
+                )));
+    }
+
+    @Test
+    public void NotifyServiceStatusReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .isEnabled(true)
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("/enabled", "false");
+        ops.add(inboundReplaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.notifyServiceInboundPatterns", empty()))
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "https://service.ldn.org/about", "https://service.ldn.org/inbox", false)));
+    }
+
+    @Test
+    public void NotifyServiceScoreReplaceOperationTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withScore(BigDecimal.ZERO)
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("/score", "0.522");
+        ops.add(inboundReplaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "https://service.ldn.org/about", "https://service.ldn.org/inbox", false)))
+            .andExpect(jsonPath("$.score", notNullValue()))
+            .andExpect(jsonPath("$.score", closeTo(0.522d, 0.001d)));
+    }
+
+    @Test
+    public void NotifyServiceScoreReplaceOperationTestUnprocessableTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("service ldn url")
+                                .withScore(BigDecimal.ZERO)
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation inboundReplaceOperation = new ReplaceOperation("/score", "10");
+        ops.add(inboundReplaceOperation);
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+
+    @Test
+    public void notifyServiceScoreAddOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("service url")
+                                .withLdnUrl("service ldn url")
+                                .isEnabled(false)
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        AddOperation operation = new AddOperation("/score", "1");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "service url", "service ldn url", false)))
+            .andExpect(jsonPath("$.score", notNullValue()))
+            .andExpect(jsonPath("$.score", closeTo(1d, 0.001d)))
+        ;
+    }
+
+    @Override
+    @After
+    public void destroy() throws Exception {
+        List<NotifyServiceEntity> notifyServiceEntities = notifyService.findAll(context);
+        if (CollectionUtils.isNotEmpty(notifyServiceEntities)) {
+            notifyServiceEntities.forEach(notifyServiceEntity -> {
+                try {
+                    notifyService.delete(context, notifyServiceEntity);
+                } catch (SQLException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+
+        super.destroy();
+    }
+
+    @Test
+    public void notifyServiceLowerIpReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withUrl("https://service.ldn.org/about")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/lowerIp", "192.168.0.1");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceLowerIpReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .withLowerIp("192.168.0.1")
+                                .withUpperIp("192.168.0.5")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/lowerIp", "192.168.0.2");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "https://service.ldn.org/about", "https://service.ldn.org/inbox",
+                false, "192.168.0.2", "192.168.0.5"))
+            );
+    }
+
+    @Test
+    public void notifyServiceLowerIpRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .withLowerIp("192.168.0.1")
+                                .withUpperIp("192.168.0.5")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation operation = new RemoveOperation("/lowerIp");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void notifyServiceUpperIpReplaceOperationBadRequestTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withUrl("https://service.ldn.org/about")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/lowerIp", "192.168.0.8");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void notifyServiceUpperIpReplaceOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .withLowerIp("192.168.0.1")
+                                .withUpperIp("192.168.0.5")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        ReplaceOperation operation = new ReplaceOperation("/upperIp", "192.168.0.8");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", matchNotifyService(notifyServiceEntity.getID(), "service name",
+                "service description", "https://service.ldn.org/about", "https://service.ldn.org/inbox",
+                false, "192.168.0.1", "192.168.0.8"))
+            );
+    }
+
+    @Test
+    public void notifyServiceUpperIpRemoveOperationTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://service.ldn.org/about")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .withLowerIp("192.168.0.1")
+                                .withUpperIp("192.168.0.5")
+                                .build();
+        context.restoreAuthSystemState();
+
+        List<Operation> ops = new ArrayList<Operation>();
+        RemoveOperation operation = new RemoveOperation("/upperIp");
+        ops.add(operation);
+
+        String patchBody = getPatchContent(ops);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(patch("/api/ldn/ldnservices/" + notifyServiceEntity.getID())
+                .content(patchBody)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isUnprocessableEntity());
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OidcAuthenticationRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OidcAuthenticationRestControllerIT.java
index aa1ecd5ebf..b3a805fda5 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OidcAuthenticationRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OidcAuthenticationRestControllerIT.java
@@ -25,10 +25,10 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.text.ParseException;
 import java.util.Map;
-import javax.servlet.http.Cookie;
 
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.servlet.http.Cookie;
 import org.dspace.app.rest.model.AuthnRest;
 import org.dspace.app.rest.security.jwt.EPersonClaimProvider;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OpenAIREFundingExternalSourcesIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OpenaireFundingExternalSourcesIT.java
similarity index 83%
rename from dspace-server-webapp/src/test/java/org/dspace/app/rest/OpenAIREFundingExternalSourcesIT.java
rename to dspace-server-webapp/src/test/java/org/dspace/app/rest/OpenaireFundingExternalSourcesIT.java
index b8f886b2e4..8c76c7adea 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OpenAIREFundingExternalSourcesIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OpenaireFundingExternalSourcesIT.java
@@ -19,7 +19,7 @@ import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.hamcrest.Matchers;
 import org.junit.Test;
 
-public class OpenAIREFundingExternalSourcesIT extends AbstractControllerIntegrationTest {
+public class OpenaireFundingExternalSourcesIT extends AbstractControllerIntegrationTest {
 
     /**
      * Test openaire funding external source
@@ -27,10 +27,10 @@ public class OpenAIREFundingExternalSourcesIT extends AbstractControllerIntegrat
      * @throws Exception
      */
     @Test
-    public void findOneOpenAIREFundingExternalSourceTest() throws Exception {
+    public void findOneOpenaireFundingExternalSourceTest() throws Exception {
         getClient().perform(get("/api/integration/externalsources")).andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.externalsources", Matchers.hasItem(
-                        ExternalSourceMatcher.matchExternalSource("openAIREFunding", "openAIREFunding", false))));
+                        ExternalSourceMatcher.matchExternalSource("openaireFunding", "openaireFunding", false))));
     }
 
     /**
@@ -39,9 +39,9 @@ public class OpenAIREFundingExternalSourcesIT extends AbstractControllerIntegrat
      * @throws Exception
      */
     @Test
-    public void findOneOpenAIREFundingExternalSourceEntriesEmptyWithQueryTest() throws Exception {
+    public void findOneOpenaireFundingExternalSourceEntriesEmptyWithQueryTest() throws Exception {
 
-        getClient().perform(get("/api/integration/externalsources/openAIREFunding/entries").param("query", "empty"))
+        getClient().perform(get("/api/integration/externalsources/openaireFunding/entries").param("query", "empty"))
                 .andExpect(status().isOk()).andExpect(jsonPath("$.page.number", is(0)));
     }
 
@@ -52,11 +52,11 @@ public class OpenAIREFundingExternalSourcesIT extends AbstractControllerIntegrat
      * @throws Exception
      */
     @Test
-    public void findOneOpenAIREFundingExternalSourceEntriesWithQueryMultipleKeywordsTest() throws Exception {
+    public void findOneOpenaireFundingExternalSourceEntriesWithQueryMultipleKeywordsTest() throws Exception {
 
         getClient()
                 .perform(
-                        get("/api/integration/externalsources/openAIREFunding/entries").param("query", "empty+results"))
+                        get("/api/integration/externalsources/openaireFunding/entries").param("query", "empty+results"))
                 .andExpect(status().isOk()).andExpect(jsonPath("$.page.number", is(0)));
     }
 
@@ -66,14 +66,14 @@ public class OpenAIREFundingExternalSourcesIT extends AbstractControllerIntegrat
      * @throws Exception
      */
     @Test
-    public void findOneOpenAIREFundingExternalSourceEntriesWithQueryTest() throws Exception {
-        getClient().perform(get("/api/integration/externalsources/openAIREFunding/entries").param("query", "mushroom"))
+    public void findOneOpenaireFundingExternalSourceEntriesWithQueryTest() throws Exception {
+        getClient().perform(get("/api/integration/externalsources/openaireFunding/entries").param("query", "mushroom"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$._embedded.externalSourceEntries",
                         Matchers.hasItem(ExternalSourceEntryMatcher.matchExternalSourceEntry(
                                 "aW5mbzpldS1yZXBvL2dyYW50QWdyZWVtZW50L05XTy8rLzIzMDAxNDc3MjgvTkw=",
                                 "Master switches of initiation of mushroom formation",
-                                "Master switches of initiation of mushroom formation", "openAIREFunding"))));
+                                "Master switches of initiation of mushroom formation", "openaireFunding"))));
 
     }
 
@@ -83,19 +83,19 @@ public class OpenAIREFundingExternalSourcesIT extends AbstractControllerIntegrat
      * @throws Exception
      */
     @Test
-    public void findOneOpenAIREFundingExternalSourceEntryValueTest() throws Exception {
+    public void findOneOpenaireFundingExternalSourceEntryValueTest() throws Exception {
 
         // "info:eu-repo/grantAgreement/mock/mock/mock/mock" base64 encoded
         String projectID = "aW5mbzpldS1yZXBvL2dyYW50QWdyZWVtZW50L0ZDVC81ODc2LVBQQ0RUSS8xMTAwNjIvUFQ=";
         String projectName = "Portuguese Wild Mushrooms: Chemical characterization and functional study"
                 + " of antiproliferative and proapoptotic properties in cancer cell lines";
 
-        getClient().perform(get("/api/integration/externalsources/openAIREFunding/entryValues/" + projectID))
+        getClient().perform(get("/api/integration/externalsources/openaireFunding/entryValues/" + projectID))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$",
                         Matchers.allOf(hasJsonPath("$.id", is(projectID)), hasJsonPath("$.display", is(projectName)),
                                 hasJsonPath("$.value", is(projectName)),
-                                hasJsonPath("$.externalSource", is("openAIREFunding")),
+                                hasJsonPath("$.externalSource", is("openaireFunding")),
                                 hasJsonPath("$.type", is("externalSourceEntry")))));
 
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
index 4b441b1bc8..25ad884cfd 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/OrcidLoginFilterIT.java
@@ -29,11 +29,11 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.util.UUID;
-import javax.servlet.http.Cookie;
 
 import com.jayway.jsonpath.JsonPath;
 import com.nimbusds.jose.JOSEException;
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.servlet.http.Cookie;
 import org.dspace.app.rest.model.AuthnRest;
 import org.dspace.app.rest.security.OrcidLoginFilter;
 import org.dspace.app.rest.security.jwt.EPersonClaimProvider;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/PatchMetadataIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/PatchMetadataIT.java
index 58781cf589..9b9db41a7c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/PatchMetadataIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/PatchMetadataIT.java
@@ -89,8 +89,8 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
     @Autowired
     private ConfigurationService configurationService;
 
-    private Collection collection;
-    private Collection collection2;
+    private Collection personCollection;
+    private Collection publicationCollection;
     private WorkspaceItem publicationWorkspaceItem;
     private Item publicationItem;
     private Item personItem1;
@@ -116,12 +116,12 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
         Community community = CommunityBuilder.createCommunity(context)
                 .withName("Parent community")
                 .build();
-        collection = CollectionBuilder.createCollection(context, community)
-                .withName("Collection")
-                .withEntityType("Person")
-                .build();
-        collection2 = CollectionBuilder.createCollection(context, community)
-                .withName("Collection")
+        personCollection = CollectionBuilder.createCollection(context, community)
+                                            .withName("Person Collection")
+                                            .withEntityType("Person")
+                                            .build();
+        publicationCollection = CollectionBuilder.createCollection(context, community)
+                .withName("Publication Collection")
                 .withEntityType("Publication")
                 .build();
 
@@ -160,17 +160,17 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         context.turnOffAuthorisationSystem();
 
-        personItem1 = ItemBuilder.createItem(context, collection)
+        personItem1 = ItemBuilder.createItem(context, personCollection)
                 .withTitle("Person 1")
                 .withPersonIdentifierFirstName("Sarah")
                 .withPersonIdentifierLastName("Dahlen")
                 .build();
-        personItem2 = ItemBuilder.createItem(context, collection)
+        personItem2 = ItemBuilder.createItem(context, personCollection)
                 .withTitle("Person 2")
                 .withPersonIdentifierFirstName("Oliver")
                 .withPersonIdentifierLastName("Linton")
                 .build();
-        publicationWorkspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, collection2)
+        publicationWorkspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, publicationCollection)
                                                        .withTitle("Publication 1")
                                                        .withEntityType("Publication")
                                                        .build();
@@ -255,13 +255,13 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         context.turnOffAuthorisationSystem();
 
-        publicationItem = ItemBuilder.createItem(context, collection)
+        publicationItem = ItemBuilder.createItem(context, publicationCollection)
                                      .withTitle("Publication 1")
                                      .build();
 
         for (String author : authorsOriginalOrder) {
             itemService.addMetadata(
-                context, publicationItem, "dc", "contributor", "author", Item.ANY, author
+                context, publicationItem, "dc", "contributor", "author", null, author
             );
         }
 
@@ -306,7 +306,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         context.turnOffAuthorisationSystem();
 
-        publicationWorkspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+        publicationWorkspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, publicationCollection)
                                                        .withTitle("Publication 1")
                                                        .withEntityType("Publication")
                                                        .build();
@@ -1229,7 +1229,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         getClient(token).perform(patch("/api/submission/workspaceitems/" + publicationWorkspaceItem.getID())
                                          .content(patchBody)
-                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                         .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                         .andExpect(status().isOk());
 
         String authorField = "dc.contributor.author";
@@ -1296,7 +1296,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         getClient(token).perform(patch("/api/submission/workspaceitems/" + publicationWorkspaceItem.getID())
                                          .content(patchBody)
-                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                         .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                         .andExpect(status().isUnprocessableEntity());
 
     }
@@ -1456,7 +1456,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         getClient(token).perform(patch("/api/core/items/" + publicationItem.getID())
                                      .content(patchBody)
-                                     .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                     .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                         .andExpect(status().isOk());
 
         String authorField = "dc.contributor.author";
@@ -1517,7 +1517,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
             .perform(
                 patch("/api/submission/workspaceitems/" + publicationWorkspaceItem.getID())
                 .content(patchBody)
-                .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON)
+                .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON)
             )
             .andExpect(status().isOk());
 
@@ -1561,7 +1561,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         getClient(token).perform(patch("/api/submission/workspaceitems/" + publicationWorkspaceItem.getID())
                                          .content(patchBody)
-                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                         .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                         .andExpect(status().isOk());
 
         String authorField = "dc.contributor.author";
@@ -1595,7 +1595,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         getClient(token).perform(patch("/api/submission/workspaceitems/" + publicationWorkspaceItem.getID())
                                          .content(patchBody)
-                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                         .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                         .andExpect(status().isOk());
 
         String authorField = "dc.contributor.author";
@@ -1638,7 +1638,7 @@ public class PatchMetadataIT extends AbstractEntityIntegrationTest {
 
         getClient(token).perform(patch("/api/submission/workspaceitems/" + publicationWorkspaceItem.getID())
                                          .content(patchBody)
-                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                         .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                         .andExpect(status().isOk());
 
         final String authorField = "dc.contributor.author";
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ProcessRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ProcessRestRepositoryIT.java
index 670d8e2f35..6f71011933 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ProcessRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ProcessRestRepositoryIT.java
@@ -18,6 +18,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.io.InputStream;
 import java.sql.SQLException;
+import java.text.SimpleDateFormat;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
@@ -689,6 +690,78 @@ public class ProcessRestRepositoryIT extends AbstractControllerIntegrationTest {
                             PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 3))));
     }
 
+    @Test
+    public void searchProcessTestByUserSortedOnCreationTimeAsc() throws Exception {
+        SimpleDateFormat date = new SimpleDateFormat("dd/MM/yyyy");
+        Process newProcess1 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
+                                            // not realistic to have creationTime after startTime,
+                                            // but proves startTime is ignored on sort
+                                            .withCreationTime(date.parse("01/01/2000"))
+                                            .withStartAndEndTime("01/01/1990", "01/01/1995").build();
+        Process newProcess2 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
+                                            .withCreationTime(date.parse("01/01/2005"))
+                                            .withStartAndEndTime(null, null).build();
+        Process newProcess3 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
+                                            .withCreationTime(date.parse("01/01/2010"))
+                                            .withStartAndEndTime("01/01/2015", "01/01/2020").build();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get("/api/system/processes/search/byProperty")
+                                     .param("userId", eperson.getID().toString())
+                                     .param("sort", "creationTime,asc"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$._embedded.processes", contains(
+                            ProcessMatcher.matchProcess(newProcess1.getName(),
+                                                        String.valueOf(eperson.getID().toString()),
+                                                        newProcess1.getID(), parameters, ProcessStatus.SCHEDULED),
+                            ProcessMatcher.matchProcess(newProcess2.getName(),
+                                                        String.valueOf(eperson.getID().toString()),
+                                                        newProcess2.getID(), parameters, ProcessStatus.SCHEDULED),
+                            ProcessMatcher.matchProcess(newProcess3.getName(),
+                                                        String.valueOf(eperson.getID().toString()),
+                                                        newProcess3.getID(), parameters, ProcessStatus.SCHEDULED)
+                        )))
+                        .andExpect(jsonPath("$.page", is(
+                            PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 3))));
+    }
+
+    @Test
+    public void searchProcessTestByUserSortedOnCreationTimeDesc() throws Exception {
+        SimpleDateFormat date = new SimpleDateFormat("dd/MM/yyyy");
+        Process newProcess1 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
+                                            // not realistic to have creationTime after startTime,
+                                            // but proves startTime is ignored on sort
+                                            .withCreationTime(date.parse("01/01/2000"))
+                                            .withStartAndEndTime("01/01/1990", "01/01/1995").build();
+        Process newProcess2 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
+                                            .withCreationTime(date.parse("01/01/2005"))
+                                            .withStartAndEndTime(null, null).build();
+        Process newProcess3 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
+                                            .withCreationTime(date.parse("01/01/2010"))
+                                            .withStartAndEndTime("01/01/2015", "01/01/2020").build();
+
+        String token = getAuthToken(admin.getEmail(), password);
+
+        getClient(token).perform(get("/api/system/processes/search/byProperty")
+                                     .param("userId", eperson.getID().toString())
+                                     .param("sort", "creationTime,desc"))
+                        .andExpect(status().isOk())
+                        .andExpect(jsonPath("$._embedded.processes", contains(
+                            ProcessMatcher.matchProcess(newProcess3.getName(),
+                                                        String.valueOf(eperson.getID().toString()),
+                                                        newProcess3.getID(), parameters, ProcessStatus.SCHEDULED),
+                            ProcessMatcher.matchProcess(newProcess2.getName(),
+                                                        String.valueOf(eperson.getID().toString()),
+                                                        newProcess2.getID(), parameters, ProcessStatus.SCHEDULED),
+                            ProcessMatcher.matchProcess(newProcess1.getName(),
+                                                        String.valueOf(eperson.getID().toString()),
+                                                        newProcess1.getID(), parameters, ProcessStatus.SCHEDULED)
+                        )))
+                        .andExpect(jsonPath("$.page", is(
+                            PageMatcher.pageEntryWithTotalPagesAndElements(0, 20, 1, 3))));
+    }
+
     @Test
     public void searchProcessTestByUserSortedOnEndTimeAsc() throws Exception {
         Process newProcess1 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
@@ -797,7 +870,7 @@ public class ProcessRestRepositoryIT extends AbstractControllerIntegrationTest {
     }
 
     @Test
-    public void searchProcessTestByUserSortedOnNonExistingIsSortedAsDefault() throws Exception {
+    public void searchProcessTestByUserSortedOnNonExistingBadRequest() throws Exception {
         Process newProcess1 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
                                             .withStartAndEndTime("10/01/1990", "20/01/1990").build();
         Process newProcess2 = ProcessBuilder.createProcess(context, eperson, "mock-script", parameters)
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/QAEventRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QAEventRestRepositoryIT.java
new file mode 100644
index 0000000000..e5bdff5330
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QAEventRestRepositoryIT.java
@@ -0,0 +1,1498 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.JsonPath.read;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasNoJsonPath;
+import static org.dspace.content.QAEvent.COAR_NOTIFY_SOURCE;
+import static org.dspace.content.QAEvent.DSPACE_USERS_SOURCE;
+import static org.dspace.content.QAEvent.OPENAIRE_SOURCE;
+import static org.dspace.correctiontype.WithdrawnCorrectionType.WITHDRAWAL_REINSTATE_GROUP;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicReference;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
+import org.dspace.app.ldn.NotifyServiceEntity;
+import org.dspace.app.rest.matcher.ItemMatcher;
+import org.dspace.app.rest.matcher.MetadataMatcher;
+import org.dspace.app.rest.matcher.QAEventMatcher;
+import org.dspace.app.rest.model.patch.Operation;
+import org.dspace.app.rest.model.patch.ReplaceOperation;
+import org.dspace.app.rest.repository.QAEventRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.EntityTypeBuilder;
+import org.dspace.builder.GroupBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.builder.QAEventBuilder;
+import org.dspace.builder.RelationshipTypeBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.EntityType;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.content.QAEventProcessed;
+import org.dspace.content.service.ItemService;
+import org.dspace.eperson.EPerson;
+import org.dspace.eperson.Group;
+import org.dspace.qaevent.QANotifyPatterns;
+import org.dspace.qaevent.action.ASimpleMetadataAction;
+import org.dspace.qaevent.dao.QAEventsDAO;
+import org.dspace.qaevent.service.dto.CorrectionTypeMessageDTO;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link QAEventRestRepository}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEventRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private QAEventsDAO qaEventsDao;
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private ItemService itemService;
+
+    @Autowired
+    private ASimpleMetadataAction AddReviewMetadataAction;
+
+    @Autowired
+    private ASimpleMetadataAction AddEndorsedMetadataAction;
+
+    @Test
+    public void findAllNotImplementedTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/qualityassuranceevents"))
+                             .andExpect(status()
+                             .isMethodNotAllowed());
+
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken).perform(get("/api/integration/qualityassuranceevents"))
+                               .andExpect(status()
+                               .isMethodNotAllowed());
+
+        getClient().perform(get("/api/integration/qualityassuranceevents"))
+                   .andExpect(status()
+                   .isMethodNotAllowed());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEvent event2 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}").build();
+        EPerson anotherSubmitter = EPersonBuilder.createEPerson(context).withEmail("another-submitter@example.com")
+                .withPassword(password).build();
+        context.setCurrentUser(anotherSubmitter);
+        QAEvent event3 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withSource(COAR_NOTIFY_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event1.getEventId()))
+            .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(event1)));
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event2.getEventId()))
+            .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(event2)));
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event3.getEventId()))
+            .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(event3)));
+        authToken = getAuthToken(anotherSubmitter.getEmail(), password);
+        // eperson should be see the coar-notify event related to the item that it has submitted
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event3.getEventId()))
+            .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(event3)));
+    }
+
+    @Test
+    public void findOneWithProjectionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                                       .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                                       .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                                       .build();
+        QAEvent event5 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                        .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT)
+                        .withMessage(
+                                "{\"projects[0].acronym\":\"PAThs\","
+                                + "\"projects[0].code\":\"687567\","
+                                + "\"projects[0].funder\":\"EC\","
+                                + "\"projects[0].fundingProgram\":\"H2020\","
+                                + "\"projects[0].jurisdiction\":\"EU\","
+                                + "\"projects[0].openaireId\":\"40|corda__h2020::6e32f5eb912688f2424c68b851483ea4\","
+                                + "\"projects[0].title\":\"Tracking Papyrus and Parchment Paths: "
+                                + "An Archaeological Atlas of Coptic Literature."
+                                + "\\nLiterary Texts in their Geographical Context: Production, Copying, Usage, "
+                                + "Dissemination and Storage\"}")
+                        .build();
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event1.getEventId())
+                            .param("projection", "full"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event1)));
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event5.getEventId())
+                            .param("projection", "full"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event5)));
+    }
+
+    @Test
+    public void findOneUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                                       .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                                       .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                                       .build();
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/integration/qualityassuranceevents/" + event1.getEventId()))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        EPerson anotherSubmitter = EPersonBuilder.createEPerson(context).withEmail("another_submitter@example.com")
+                .build();
+        context.setCurrentUser(anotherSubmitter);
+        QAEvent event2 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withSource(COAR_NOTIFY_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                .withMessage("{\"href\":\"https://doi.org/10.2307/2144300\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event1.getEventId()))
+                .andExpect(status().isForbidden());
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event2.getEventId()))
+                .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findByTopicAndTargetTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        String uuid = UUID.randomUUID().toString();
+        Item item = ItemBuilder.createItem(context, col1).withTitle("Tracking Papyrus and Parchment Paths")
+                .build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, item)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                .build();
+        QAEvent event2 = QAEventBuilder.createTarget(context, item)
+                .withSource(COAR_NOTIFY_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                .withMessage("{\"href\":\"https://doi.org/10.2307/2144301\"}").build();
+        EPerson anotherSubmitter = EPersonBuilder.createEPerson(context).withEmail("another-submitter@example.com")
+                .withPassword(password).build();
+        context.setCurrentUser(anotherSubmitter);
+        // this event is related to a new item not submitted by eperson
+        QAEvent event3 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withSource(COAR_NOTIFY_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                .withMessage("{\"href\":\"https://doi.org/10.2307/2144300\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID:" + uuid.toString()))
+            .andExpect(status().isOk()).andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(0)));
+
+        uuid = item.getID().toString();
+        // check for an existing item but a different topic
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.OPENAIRE_SOURCE + ":not-existing:" + uuid.toString()))
+            .andExpect(status().isOk()).andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(0)));
+        // check for an existing topic but a different source
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.COAR_NOTIFY_SOURCE + ":ENRICH!MISSING!PID"))
+            .andExpect(status().isOk()).andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(0)));
+
+        // check for an existing item and topic
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID:" + uuid.toString()))
+            .andExpect(status().isOk()).andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(1)))
+            .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.contains(QAEventMatcher.matchQAEventEntry(event1))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        // use the coar-notify source that has a custom security
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.COAR_NOTIFY_SOURCE + ":ENRICH!MORE!REVIEW:" + uuid.toString()))
+            .andExpect(status().isOk()).andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(1)))
+            .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.contains(QAEventMatcher.matchQAEventEntry(event2))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        // check for an existing topic
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"))
+            .andExpect(status().isOk()).andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(1)))
+            .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.contains(QAEventMatcher.matchQAEventEntry(event1))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        // use the coar-notify source that has a custom security
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.COAR_NOTIFY_SOURCE + ":ENRICH!MORE!REVIEW"))
+            .andExpect(status().isOk()).andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(2)))
+            .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                    Matchers.containsInAnyOrder(
+                            QAEventMatcher.matchQAEventEntry(event2),
+                            QAEventMatcher.matchQAEventEntry(event3))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(2)));
+        // check results for eperson
+        authToken = getAuthToken(eperson.getEmail(), password);
+        // check for an item that was submitted by eperson but in a qasource restricted to admins
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID:" + uuid.toString()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(0)));
+        // use the coar-notify source that has a custom security, only 1 event is related to the item submitted by
+        // eperson
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.COAR_NOTIFY_SOURCE + ":ENRICH!MORE!REVIEW:" + uuid.toString()))
+            .andExpect(status().isOk()).andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(1)))
+            .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.contains(QAEventMatcher.matchQAEventEntry(event2))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        // check for an existing topic
+        getClient(authToken)
+            .perform(
+                get("/api/integration/qualityassuranceevents/search/findByTopic")
+                    .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(0)));
+
+    }
+
+    @Test
+    public void findByTopicTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic("ENRICH/MISSING/PID")
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEvent event2 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                .withTopic("ENRICH/MISSING/PID")
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                .withTopic("ENRICH/MORE/PID")
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"10.2307/2144302\"}").build();
+        QAEvent event4 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withTopic("ENRICH/MISSING/ABSTRACT")
+                .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/search/findByTopic")
+                        .param("topic", OPENAIRE_SOURCE + ":" + "ENRICH!MISSING!PID"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(2)))
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents",Matchers.containsInAnyOrder(
+                        QAEventMatcher.matchQAEventEntry(event1),
+                        QAEventMatcher.matchQAEventEntry(event2)
+                )))
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(2)));
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/search/findByTopic")
+                        .param("topic", OPENAIRE_SOURCE + ":" + "ENRICH!MISSING!ABSTRACT"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(1)))
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.containsInAnyOrder(
+                        QAEventMatcher.matchQAEventEntry(event4))))
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(1)));
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/search/findByTopic")
+                        .param("topic", "not-existing"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findByTopicPaginatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEvent event2 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEvent event3 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144302\"}").build();
+        QAEvent event4 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"pmc\",\"pids[0].value\":\"2144303\"}").build();
+        QAEvent event5 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"2144304\"}").build();
+        QAEvent event6 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withSource(OPENAIRE_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEvent event7 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                .withSource(OPENAIRE_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEvent event8 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                .withSource(OPENAIRE_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144302\"}").build();
+        QAEvent event9 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withSource(OPENAIRE_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"pmc\",\"pids[0].value\":\"2144303\"}").build();
+        QAEvent event10 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                .withSource(OPENAIRE_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"2144304\"}").build();
+        context.setCurrentUser(admin);
+        // this event will be related to an item submitted by the admin
+        QAEvent event11 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                .withSource(OPENAIRE_SOURCE)
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"2144304\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+                .perform(
+                        get("/api/integration/qualityassuranceevents/search/findByTopic")
+                                .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID")
+                                .param("size", "2"))
+                .andExpect(status().isOk()).andExpect(
+                        jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(2)))
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.containsInAnyOrder(
+                                QAEventMatcher.matchQAEventEntry(event1),
+                                QAEventMatcher.matchQAEventEntry(event2))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=1"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=5"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.prev.href").doesNotExist())
+                .andExpect(jsonPath("$.page.size", is(2)))
+                .andExpect(jsonPath("$.page.totalPages", is(6)))
+                .andExpect(jsonPath("$.page.totalElements", is(11)));
+
+        getClient(authToken)
+                .perform(
+                        get("/api/integration/qualityassuranceevents/search/findByTopic")
+                                .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID")
+                                .param("size", "2").param("page", "1"))
+                .andExpect(status().isOk()).andExpect(
+                        jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(2)))
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.containsInAnyOrder(
+                                QAEventMatcher.matchQAEventEntry(event3),
+                                QAEventMatcher.matchQAEventEntry(event4))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=1"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=2"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=5"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$.page.size", is(2)))
+                .andExpect(jsonPath("$.page.totalPages", is(6)))
+                .andExpect(jsonPath("$.page.totalElements", is(11)));
+
+        getClient(authToken)
+                .perform(
+                        get("/api/integration/qualityassuranceevents/search/findByTopic")
+                                .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID")
+                                .param("size", "2").param("page", "2"))
+                .andExpect(status().isOk()).andExpect(
+                        jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(2)))
+                .andExpect(jsonPath("$._embedded.qualityassuranceevents",
+                        Matchers.hasItem(
+                                QAEventMatcher.matchQAEventEntry(event5))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=2"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=3"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=5"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/qualityassuranceevents/search/findByTopic?"),
+                                Matchers.containsString("topic=" + QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"),
+                                Matchers.containsString("page=1"),
+                                Matchers.containsString("size=2"))))
+                .andExpect(jsonPath("$.page.size", is(2)))
+                .andExpect(jsonPath("$.page.totalPages", is(6)))
+                .andExpect(jsonPath("$.page.totalElements", is(11)));
+
+        // check if the pagination is working properly also when a security filter is in place
+        authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+                .perform(
+                        get("/api/integration/qualityassuranceevents/search/findByTopic")
+                                .param("topic", QAEvent.OPENAIRE_SOURCE + ":ENRICH!MISSING!PID")
+                                .param("size", "2"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", hasNoJsonPath("$._embedded.qualityassuranceevents")))
+                .andExpect(jsonPath("$.page.size", is(2)))
+                .andExpect(jsonPath("$.page.totalPages", is(0)))
+                .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findByTopicUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_PID)
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"10.2307/2144302\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}").build();
+        context.restoreAuthSystemState();
+        getClient().perform(get("/api/integration/qualityassuranceevents/search/findByTopic")
+                   .param("topic", OPENAIRE_SOURCE + ":" + "ENRICH!MISSING!PID"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findByTopicBadRequestTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_PID)
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"10.2307/2144302\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}").build();
+        context.restoreAuthSystemState();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/qualityassuranceevents/search/findByTopic"))
+                .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void recordDecisionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        EntityType publication = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType project = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+
+        RelationshipTypeBuilder.createRelationshipTypeBuilder(context, publication, project,
+                                "isProjectOfPublication", "isPublicationOfProject", 0, null, 0, null)
+                               .withCopyToRight(true)
+                               .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withEntityType("Publication")
+                                           .withName("Collection 1")
+                                           .build();
+        Collection colFunding = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .withName("Collection Fundings")
+                                                 .withEntityType("Project")
+                                                 .build();
+
+        Item funding = ItemBuilder.createItem(context, colFunding)
+                                  .withTitle("Tracking Papyrus and Parchment Paths")
+                                  .build();
+
+        QAEvent eventProjectBound = QAEventBuilder.createTarget(context, col1, "Science and Freedom with project")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT)
+                .withMessage(
+                        "{\"projects[0].acronym\":\"PAThs\","
+                        + "\"projects[0].code\":\"687567\","
+                        + "\"projects[0].funder\":\"EC\","
+                        + "\"projects[0].fundingProgram\":\"H2020\","
+                        + "\"projects[0].jurisdiction\":\"EU\","
+                        + "\"projects[0].openaireId\":\"40|corda__h2020::6e32f5eb912688f2424c68b851483ea4\","
+                        + "\"projects[0].title\":\"Tracking Papyrus and Parchment Paths: "
+                        + "An Archaeological Atlas of Coptic Literature."
+                        + "\\nLiterary Texts in their Geographical Context: Production, Copying, Usage, "
+                        + "Dissemination and Storage\"}")
+                .withRelatedItem(funding.getID().toString())
+                .build();
+        QAEvent eventProjectNoBound = QAEventBuilder
+                .createTarget(context, col1, "Science and Freedom with unrelated project")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT)
+                .withMessage(
+                        "{\"projects[0].acronym\":\"NEW\","
+                        + "\"projects[0].code\":\"123456\","
+                        + "\"projects[0].funder\":\"EC\","
+                        + "\"projects[0].fundingProgram\":\"H2020\","
+                        + "\"projects[0].jurisdiction\":\"EU\","
+                        + "\"projects[0].openaireId\":\"newProjectID\","
+                        + "\"projects[0].title\":\"A new project\"}")
+                .build();
+        QAEvent eventMissingPID1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                .build();
+        QAEvent eventMissingPID2 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}")
+                .build();
+        QAEvent eventMissingUnknownPID = QAEventBuilder.createTarget(context, col1, "Science and Freedom URN PID")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage(
+                        "{\"pids[0].type\":\"urn\",\"pids[0].value\":\"http://thesis2.sba.units.it/store/handle/item/12937\"}")
+                .build();
+        QAEvent eventMorePID = QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_PID)
+                .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"2144302\"}")
+                .build();
+        QAEvent eventAbstract = QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                .withMessage("{\"abstracts[0]\": \"An abstract to add...\"}")
+                .build();
+        QAEvent eventAbstractToDiscard = QAEventBuilder.createTarget(context, col1, "Science and Freedom 7")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                .withMessage("{\"abstracts[0]\": \"Abstract to discard...\"}")
+                .build();
+        context.restoreAuthSystemState();
+
+        // prepare the different patches for our decisions
+        List<Operation> acceptOp = new ArrayList<Operation>();
+        acceptOp.add(new ReplaceOperation("/status", QAEvent.ACCEPTED));
+
+        List<Operation> acceptOpUppercase = new ArrayList<Operation>();
+        acceptOpUppercase.add(new ReplaceOperation("/status", QAEvent.ACCEPTED));
+
+        List<Operation> discardOp = new ArrayList<Operation>();
+        discardOp.add(new ReplaceOperation("/status", QAEvent.DISCARDED));
+
+        List<Operation> rejectOp = new ArrayList<Operation>();
+        rejectOp.add(new ReplaceOperation("/status", QAEvent.REJECTED));
+
+        String patchAccept = getPatchContent(acceptOp);
+        String patchAcceptUppercase = getPatchContent(acceptOpUppercase);
+        String patchDiscard = getPatchContent(discardOp);
+        String patchReject = getPatchContent(rejectOp);
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        // accept pid1, unknownPID, morePID, the two projects and abstract
+        eventMissingPID1.setStatus(QAEvent.ACCEPTED);
+        eventMorePID.setStatus(QAEvent.ACCEPTED);
+        eventMissingUnknownPID.setStatus(QAEvent.ACCEPTED);
+        eventMissingUnknownPID.setStatus(QAEvent.ACCEPTED);
+        eventProjectBound.setStatus(QAEvent.ACCEPTED);
+        eventProjectNoBound.setStatus(QAEvent.ACCEPTED);
+        eventAbstract.setStatus(QAEvent.ACCEPTED);
+
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/" + eventMissingPID1.getEventId())
+                            .content(patchAccept)
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventMissingPID1)));
+
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/" + eventMorePID.getEventId())
+                            .content(patchAcceptUppercase)
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventMorePID)));
+
+        getClient(authToken)
+            .perform(patch("/api/integration/qualityassuranceevents/" + eventMissingUnknownPID.getEventId())
+                .content(patchAccept)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventMissingUnknownPID)));
+
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/" + eventProjectBound.getEventId())
+                            .content(patchAccept)
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventProjectBound)));
+
+        getClient(authToken)
+            .perform(patch("/api/integration/qualityassuranceevents/" + eventProjectNoBound.getEventId())
+                .content(patchAccept)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventProjectNoBound)));
+
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/" + eventAbstract.getEventId())
+                            .content(patchAccept)
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventAbstract)));
+
+        // check if the item has been updated
+        getClient(authToken).perform(get("/api/core/items/" + eventMissingPID1.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$",hasJsonPath("$.metadata['dc.identifier.other'][0].value",
+                                                    is("10.2307/2144300"))));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventMorePID.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", hasJsonPath("$.metadata['dc.identifier.other'][0].value",
+                                                     is("2144302"))));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventMissingUnknownPID.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", hasJsonPath("$.metadata['dc.identifier.other'][0].value",
+                                                     is("http://thesis2.sba.units.it/store/handle/item/12937"))));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventProjectBound.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$",
+                                    hasJsonPath("$.metadata['relation.isProjectOfPublication'][0].value",
+                                             is(funding.getID().toString()))));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventProjectNoBound.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$",
+                                    hasJsonPath("$.metadata['relation.isProjectOfPublication'][0].value",
+                                             is(not(empty())))));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventAbstract.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", hasJsonPath("$.metadata['dc.description.abstract'][0].value",
+                                                              is("An abstract to add..."))));
+
+        // reject pid2
+        eventMissingPID2.setStatus(QAEvent.REJECTED);
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/" + eventMissingPID2.getEventId())
+                            .content(patchReject)
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventMissingPID2)));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventMissingPID2.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", hasNoJsonPath("$.metadata['dc.identifier.other']")));
+
+        // discard abstractToDiscard
+        eventAbstractToDiscard.setStatus(QAEvent.DISCARDED);
+        getClient(authToken)
+            .perform(patch("/api/integration/qualityassuranceevents/" + eventAbstractToDiscard.getEventId())
+                .content(patchDiscard)
+                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(eventAbstractToDiscard)));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventMissingPID2.getTarget())
+                            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", hasNoJsonPath("$.metadata['dc.description.abstract']")));
+
+        // no pending qa events should be longer available
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/" + QAEvent.OPENAIRE_SOURCE))
+                            .andExpect(status().isOk())
+                            .andExpect(content().contentType(contentType))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.totalEvents", is(0)));
+    }
+
+    @Test
+    public void recordDecisionNotifyTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        EntityType publication = EntityTypeBuilder.createEntityTypeBuilder(context, "Publication").build();
+        EntityType project = EntityTypeBuilder.createEntityTypeBuilder(context, "Project").build();
+        RelationshipTypeBuilder.createRelationshipTypeBuilder(context, publication, project, "isProjectOfPublication",
+                "isPublicationOfProject", 0, null, 0,
+                null).withCopyToRight(true).build();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+            .withEntityType("Publication")
+            .withName("Collection 1").build();
+        Collection colFunding = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection Fundings")
+            .withEntityType("Project").build();
+        Item item = ItemBuilder.createItem(context, colFunding).withTitle("Tracking Papyrus and Parchment Paths")
+                .build();
+        NotifyServiceEntity notifyServiceEntity =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name")
+                                .withDescription("service description")
+                                .withUrl("https://review-service.com/inbox/about/")
+                                .withLdnUrl("https://review-service.com/inbox/")
+                                .withScore(BigDecimal.valueOf(0.6d))
+                                .build();
+        String href = "EC";
+        QAEvent eventMoreReview = QAEventBuilder.createTarget(context, col1, "Science and Freedom with project")
+                .withSource(COAR_NOTIFY_SOURCE)
+                .withTopic("ENRICH/MORE/REVIEW")
+                .withMessage(
+                        "{"
+                        + "\"serviceName\":\"" + notifyServiceEntity.getName() + "\","
+                        + "\"serviceId\":\"" + notifyServiceEntity.getID() + "\","
+                        + "\"href\":\"" + href + "\","
+                        + "\"relationship\":\"H2020\""
+                        + "}")
+                .withRelatedItem(item.getID().toString())
+                .build();
+        QAEvent eventMoreEndorsement = QAEventBuilder.createTarget(context, col1, "Science and Freedom with project")
+            .withSource(COAR_NOTIFY_SOURCE)
+            .withTopic("ENRICH/MORE/ENDORSEMENT")
+            .withMessage(
+                    "{"
+                    + "\"serviceName\":\"" + notifyServiceEntity.getName() + "\","
+                    + "\"serviceId\":\"" + notifyServiceEntity.getID() + "\","
+                    + "\"href\":\"" + href + "\","
+                    + "\"relationship\":\"H2020\""
+                    + "}")
+            .withRelatedItem(item.getID().toString())
+            .build();
+        context.restoreAuthSystemState();
+        List<Operation> acceptOp = new ArrayList<Operation>();
+        acceptOp.add(new ReplaceOperation("/status", QAEvent.ACCEPTED));
+        String patchAccept = getPatchContent(acceptOp);
+        String authToken = getAuthToken(admin.getEmail(), password);
+        eventMoreEndorsement.setStatus(QAEvent.ACCEPTED);
+        eventMoreReview.setStatus(QAEvent.ACCEPTED);
+        // MORE REVIEW
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/" + eventMoreReview.getEventId())
+            .content(patchAccept)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventNotifyEntry(eventMoreReview)));
+        getClient(authToken).perform(get("/api/core/items/" + eventMoreReview.getTarget())
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$",
+                hasJsonPath("$.metadata",
+                        MetadataMatcher.matchMetadata(AddReviewMetadataAction.getMetadata(), href))));
+        // MORE ENDORSEMENT
+        getClient(authToken).perform(patch("/api/integration/qualityassuranceevents/"
+            + eventMoreEndorsement.getEventId())
+            .content(patchAccept)
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventNotifyEntry(eventMoreEndorsement)));
+
+        getClient(authToken).perform(get("/api/core/items/" + eventMoreEndorsement.getTarget())
+            .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+        .andExpect(status().isOk())
+        .andExpect(jsonPath("$",
+                hasJsonPath("$.metadata",
+                        MetadataMatcher.matchMetadata(AddEndorsedMetadataAction.getMetadata(), href))));
+
+    }
+
+    @Test
+    public void setRelatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Collection colFunding = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Fundings").build();
+        QAEvent event = QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT)
+                .withMessage(
+                        "{\"projects[0].acronym\":\"PAThs\","
+                        + "\"projects[0].code\":\"687567\","
+                        + "\"projects[0].funder\":\"EC\","
+                        + "\"projects[0].fundingProgram\":\"H2020\","
+                        + "\"projects[0].jurisdiction\":\"EU\","
+                        + "\"projects[0].openaireId\":\"40|corda__h2020::6e32f5eb912688f2424c68b851483ea4\","
+                        + "\"projects[0].title\":\"Tracking Papyrus and Parchment Paths: "
+                        + "An Archaeological Atlas of Coptic Literature."
+                        + "\\nLiterary Texts in their Geographical Context: Production, Copying, Usage, "
+                        + "Dissemination and Storage\"}")
+                .build();
+        Item funding = ItemBuilder.createItem(context, colFunding).withTitle("Tracking Papyrus and Parchment Paths")
+                .build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()).param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+
+        getClient(authToken)
+            .perform(post("/api/integration/qualityassuranceevents/" + event.getEventId() + "/related").param("item",
+                        funding.getID().toString()))
+                .andExpect(status().isCreated())
+                .andExpect(jsonPath("$", ItemMatcher.matchItemProperties(funding)));
+        // update our local event copy to reflect the association with the related item
+        event.setRelated(funding.getID().toString());
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()).param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId() + "/related"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", ItemMatcher.matchItemProperties(funding)));
+    }
+
+    @Test
+    public void unsetRelatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Collection colFunding = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Fundings").build();
+        Item funding = ItemBuilder.createItem(context, colFunding).withTitle("Tracking Papyrus and Parchment Paths")
+                .build();
+        QAEvent event = QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT)
+                .withMessage(
+                        "{\"projects[0].acronym\":\"PAThs\","
+                        + "\"projects[0].code\":\"687567\","
+                        + "\"projects[0].funder\":\"EC\","
+                        + "\"projects[0].fundingProgram\":\"H2020\","
+                        + "\"projects[0].jurisdiction\":\"EU\","
+                        + "\"projects[0].openaireId\":\"40|corda__h2020::6e32f5eb912688f2424c68b851483ea4\","
+                        + "\"projects[0].title\":\"Tracking Papyrus and Parchment Paths: "
+                        + "An Archaeological Atlas of Coptic Literature."
+                        + "\\nLiterary Texts in their Geographical Context: Production, Copying, Usage, "
+                        + "Dissemination and Storage\"}")
+                .withRelatedItem(funding.getID().toString())
+                .build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()).param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+        getClient(authToken)
+            .perform(delete("/api/integration/qualityassuranceevents/" + event.getEventId() + "/related"))
+                .andExpect(status().isNoContent());
+
+        // update our local event copy to reflect the association with the related item
+        event.setRelated(null);
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()).param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId() + "/related"))
+            .andExpect(status().isNoContent());
+    }
+
+    @Test
+    public void setInvalidRelatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Collection colFunding = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Collection Fundings").build();
+        QAEvent event = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        Item funding = ItemBuilder.createItem(context, colFunding).withTitle("Tracking Papyrus and Parchment Paths")
+                .build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()).param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+
+        getClient(authToken)
+            .perform(post("/api/integration/qualityassuranceevents/" + event.getEventId() + "/related").param("item",
+                        funding.getID().toString()))
+                .andExpect(status().isUnprocessableEntity());
+        // check that no related item has been added to our event
+        getClient(authToken)
+            .perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()).param("projection", "full"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+    }
+
+    @Test
+    public void deleteItemWithEventTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+        QAEvent event1 = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                                       .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                                       .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                                       .build();
+        QAEvent event2 = QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                                       .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                                       .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}")
+                                       .build();
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/search/findByTopic")
+                            .param("topic", OPENAIRE_SOURCE + ":" + "ENRICH!MISSING!PID"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(2)))
+                            .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.containsInAnyOrder(
+                                       QAEventMatcher.matchQAEventEntry(event1),
+                                       QAEventMatcher.matchQAEventEntry(event2)
+                                       )))
+                            .andExpect(jsonPath("$.page.size", is(20)))
+                            .andExpect(jsonPath("$.page.totalElements", is(2)));
+
+        getClient(authToken).perform(delete("/api/core/items/" + event1.getTarget()))
+                            .andExpect(status().is(204));
+
+        getClient(authToken).perform(get("/api/core/items/" + event1.getTarget()))
+                            .andExpect(status().is(404));
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/search/findByTopic")
+                            .param("topic", OPENAIRE_SOURCE + ":" + "ENRICH!MISSING!PID"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.hasSize(1)))
+                            .andExpect(jsonPath("$._embedded.qualityassuranceevents", Matchers.containsInAnyOrder(
+                                       QAEventMatcher.matchQAEventEntry(event2)
+                                       )))
+                            .andExpect(jsonPath("$.page.size", is(20)))
+                            .andExpect(jsonPath("$.page.totalElements", is(1)));
+    }
+
+    @Test
+    public void testEventDeletion() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+            .withName("Collection 1")
+            .build();
+
+        QAEvent event = QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+            .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+            .build();
+
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+            .withTopic("ENRICH/MISSING/PID")
+            .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+            .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventEntry(event)));
+
+        List<QAEventProcessed> processedEvents = qaEventsDao.findAll(context);
+        assertThat(processedEvents, empty());
+
+        getClient(authToken).perform(delete("/api/integration/qualityassuranceevents/" + event.getEventId()))
+            .andExpect(status().isNoContent());
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()))
+            .andExpect(status().isNotFound());
+
+        processedEvents = qaEventsDao.findAll(context);
+        assertThat(processedEvents, hasSize(1));
+
+        QAEventProcessed processedEvent = processedEvents.get(0);
+        assertThat(processedEvent.getEventId(), is(event.getEventId()));
+        assertThat(processedEvent.getItem(), notNullValue());
+        assertThat(processedEvent.getItem().getID().toString(), is(event.getTarget()));
+        assertThat(processedEvent.getEventTimestamp(), notNullValue());
+        assertThat(processedEvent.getEperson().getID(), is(admin.getID()));
+    }
+
+    @Test
+    public void createQAEventByCorrectionTypeUnAuthorizedTest() throws Exception {
+        getClient().perform(post("/api/integration/qualityassuranceevents")
+                   .param("correctionType", "request-withdrawn")
+                   .param("target", UUID.randomUUID().toString())
+                   .contentType(contentType))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void createQAEventByCorrectionTypeWithMissingTargetTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(post("/api/integration/qualityassuranceevents")
+                             .param("correctionType", "request-withdrawn")
+                             .contentType(contentType))
+                             .andExpect(status().isUnprocessableEntity());
+    }
+
+    @Test
+    public void createQAEventsAndIgnoreAutomaticallyByScoreAndFilterTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item = ItemBuilder.createItem(context, col1).withTitle("demo").build();
+
+        QAEvent event =
+            QAEventBuilder.createTarget(context, item)
+                          .withSource(COAR_NOTIFY_SOURCE)
+                          .withTrust(0.4)
+                          .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                          .withMessage("{\"abstracts[0]\": \"https://doi.org/10.3214/987654\"}")
+                          .build();
+
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(get("/api/core/items/" + item.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.metadata['datacite.relation.isReviewedBy']").doesNotExist());
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()))
+                            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void createQAEventsAndRejectAutomaticallyByScoreAndFilterTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item = ItemBuilder.createItem(context, col1).withTitle("demo").build();
+
+        QAEvent event =
+            QAEventBuilder.createTarget(context, item)
+                          .withSource(COAR_NOTIFY_SOURCE)
+                          .withTrust(0.3)
+                          .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                          .withMessage("{\"abstracts[0]\": \"https://doi.org/10.3214/987654\"}")
+                          .build();
+
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(get("/api/core/items/" + item.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.metadata['datacite.relation.isReviewedBy']").doesNotExist());
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event.getEventId()))
+                            .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void createQAEventsAndDoNothingScoreNotInRangTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item = ItemBuilder.createItem(context, col1).withTitle("demo").build();
+
+        QAEvent event =
+            QAEventBuilder.createTarget(context, item)
+                          .withSource(COAR_NOTIFY_SOURCE)
+                          .withTrust(0.7)
+                          .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                          .withMessage("{\"abstracts[0]\": \"https://doi.org/10.3214/987654\"}")
+                          .build();
+
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(get("/api/core/items/" + item.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.metadata['datacite.relation.isReviewedBy']").doesNotExist());
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event.getEventId())
+                                .param("projection", "full"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+    }
+
+    @Test
+    public void createQAEventsAndDoNothingFilterNotCompatibleWithItemTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item = ItemBuilder.createItem(context, col1).withTitle("item title").build();
+
+        QAEvent event =
+            QAEventBuilder.createTarget(context, item)
+                          .withSource(COAR_NOTIFY_SOURCE)
+                          .withTrust(0.8)
+                          .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW)
+                          .withMessage("{\"abstracts[0]\": \"https://doi.org/10.3214/987654\"}")
+                          .build();
+
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+
+        getClient(authToken).perform(get("/api/core/items/" + item.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.metadata['datacite.relation.isReviewedBy']").doesNotExist());
+
+        getClient(authToken).perform(get("/api/integration/qualityassuranceevents/" + event.getEventId())
+                                .param("projection", "full"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", QAEventMatcher.matchQAEventFullEntry(event)));
+    }
+
+
+    @Test
+    public void createQAEventByCorrectionTypeWithdrawnRequestTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty(WITHDRAWAL_REINSTATE_GROUP, "Anonymous");
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection for Publications")
+                                          .withEntityType("Publication")
+                                          .build();
+
+        Item publication = ItemBuilder.createItem(context, col)
+                                      .withTitle("Publication archived item")
+                                      .build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(true)))
+                             .andExpect(jsonPath("$.withdrawn", is(false)));
+
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        CorrectionTypeMessageDTO message = new CorrectionTypeMessageDTO("reasone");
+
+        String ePersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(ePersonToken).perform(post("/api/integration/qualityassuranceevents")
+                               .param("correctionType", "request-withdrawn")
+                               .param("target", publication.getID().toString())
+                               .content(new ObjectMapper().writeValueAsBytes(message))
+                               .contentType(contentType))
+                               .andExpect(status().isCreated())
+                               .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+        getClient(adminToken).perform(get("/api/integration/qualityassuranceevents/" + idRef.get()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.id", is(idRef.get())))
+                             .andExpect(jsonPath("$.source", is(DSPACE_USERS_SOURCE)))
+                             .andExpect(jsonPath("$.title", is(publication.getName())))
+                             .andExpect(jsonPath("$.topic", is("REQUEST/WITHDRAWN")))
+                             .andExpect(jsonPath("$.trust", is("1.000")))
+                             .andExpect(jsonPath("$.status", is("PENDING")));
+
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(true)))
+                             .andExpect(jsonPath("$.withdrawn", is(false)));
+
+        List<Operation> acceptOp = new ArrayList<Operation>();
+        acceptOp.add(new ReplaceOperation("/status", QAEvent.ACCEPTED));
+
+        getClient(adminToken).perform(patch("/api/integration/qualityassuranceevents/" + idRef.get())
+                             .content(getPatchContent(acceptOp))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(false)))
+                             .andExpect(jsonPath("$.withdrawn", is(true)));
+    }
+
+    @Test
+    public void createQAEventByCorrectionTypeReinstateRequestTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty(WITHDRAWAL_REINSTATE_GROUP, "Anonymous");
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection for Publications")
+                                          .withEntityType("Publication")
+                                          .build();
+
+        Item publication = ItemBuilder.createItem(context, col)
+                                      .withTitle("Publication archived item")
+                                      .withdrawn()
+                                      .build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String ePersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(false)))
+                             .andExpect(jsonPath("$.withdrawn", is(true)));
+
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        ObjectMapper mapper = new ObjectMapper();
+        CorrectionTypeMessageDTO dto = new CorrectionTypeMessageDTO("provided reason!");
+
+        getClient(ePersonToken).perform(post("/api/integration/qualityassuranceevents")
+                               .param("correctionType", "request-reinstate")
+                               .param("target", publication.getID().toString())
+                               .contentType(contentType)
+                               .content(mapper.writeValueAsBytes(dto)))
+                               .andExpect(status().isCreated())
+                               .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+        getClient(adminToken).perform(get("/api/integration/qualityassuranceevents/" + idRef.get()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.id", is(idRef.get())))
+                             .andExpect(jsonPath("$.source", is(DSPACE_USERS_SOURCE)))
+                             .andExpect(jsonPath("$.title", is(publication.getName())))
+                             .andExpect(jsonPath("$.topic", is("REQUEST/REINSTATE")))
+                             .andExpect(jsonPath("$.trust", is("1.000")))
+                             .andExpect(jsonPath("$.status", is("PENDING")));
+
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(false)))
+                             .andExpect(jsonPath("$.withdrawn", is(true)));
+
+        List<Operation> acceptOp = new ArrayList<Operation>();
+        acceptOp.add(new ReplaceOperation("/status", QAEvent.ACCEPTED));
+
+        getClient(adminToken).perform(patch("/api/integration/qualityassuranceevents/" + idRef.get())
+                             .content(getPatchContent(acceptOp))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(true)))
+                             .andExpect(jsonPath("$.withdrawn", is(false)));
+    }
+
+    @Test
+    public void createQAEventOnlyUserPresentInWithdrawalReinstateGroupTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        EPerson user1 = EPersonBuilder.createEPerson(context)
+                                      .withEmail("eperson-test@mail.com")
+                                      .withPassword(password)
+                                      .build();
+
+        Group withdrawalGroup = GroupBuilder.createGroup(context)
+                                            .withName("WithdrawGroup")
+                                            .addMember(user1)
+                                            .build();
+
+        configurationService.setProperty(WITHDRAWAL_REINSTATE_GROUP, withdrawalGroup.getName());
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col = CollectionBuilder.createCollection(context, parentCommunity)
+                                          .withName("Collection for Publications")
+                                          .withEntityType("Publication")
+                                          .build();
+
+        Item publication = ItemBuilder.createItem(context, col)
+                                      .withTitle("Publication archived item")
+                                      .build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        CorrectionTypeMessageDTO message = new CorrectionTypeMessageDTO("reasone");
+
+        String ePersonToken = getAuthToken(eperson.getEmail(), password);
+        // eperson is not present into the withdraw-reinstate group
+        // and so cannot make the request
+        getClient(ePersonToken).perform(post("/api/integration/qualityassuranceevents")
+                               .param("correctionType", "request-withdrawn")
+                               .param("target", publication.getID().toString())
+                               .content(new ObjectMapper().writeValueAsBytes(message))
+                               .contentType(contentType))
+                               .andExpect(status().isUnprocessableEntity());
+
+        String user1Token = getAuthToken(user1.getEmail(), password);
+        // instead user1 is present into the withdraw-reinstate group
+        getClient(user1Token).perform(post("/api/integration/qualityassuranceevents")
+                             .param("correctionType", "request-withdrawn")
+                             .param("target", publication.getID().toString())
+                             .content(new ObjectMapper().writeValueAsBytes(message))
+                             .contentType(contentType))
+                             .andExpect(status().isCreated())
+                             .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+
+        getClient(adminToken).perform(get("/api/integration/qualityassuranceevents/" + idRef.get()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.id", is(idRef.get())))
+                             .andExpect(jsonPath("$.source", is(DSPACE_USERS_SOURCE)))
+                             .andExpect(jsonPath("$.title", is(publication.getName())))
+                             .andExpect(jsonPath("$.topic", is("REQUEST/WITHDRAWN")))
+                             .andExpect(jsonPath("$.trust", is("1.000")))
+                             .andExpect(jsonPath("$.status", is("PENDING")));
+
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(true)))
+                             .andExpect(jsonPath("$.withdrawn", is(false)));
+
+        List<Operation> acceptOp = new ArrayList<Operation>();
+        acceptOp.add(new ReplaceOperation("/status", QAEvent.ACCEPTED));
+
+        getClient(adminToken).perform(patch("/api/integration/qualityassuranceevents/" + idRef.get())
+                             .content(getPatchContent(acceptOp))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(adminToken).perform(get("/api/core/items/" + publication.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.inArchive", is(false)))
+                             .andExpect(jsonPath("$.withdrawn", is(true)));
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/QASourceRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QASourceRestRepositoryIT.java
new file mode 100644
index 0000000000..71b87d460a
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QASourceRestRepositoryIT.java
@@ -0,0 +1,349 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.matcher.QASourceMatcher.matchQASourceEntry;
+import static org.dspace.qaevent.service.impl.QAEventServiceImpl.QAEVENTS_SOURCES;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.repository.QASourceRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.QAEventBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Community;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.services.ConfigurationService;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link QASourceRestRepository}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class QASourceRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    private Item target;
+
+    @Before
+    public void setup() {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withTitle("Community")
+                                          .build();
+
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .withName("Collection")
+                                                 .build();
+
+        target = ItemBuilder.createItem(context, collection)
+                            .withTitle("Item")
+                            .build();
+
+        context.restoreAuthSystemState();
+
+        configurationService.setProperty(QAEVENTS_SOURCES,
+                new String[] { QAEvent.OPENAIRE_SOURCE,"coar-notify", "test-source","test-source-2" });
+    }
+
+    @Test
+    public void testFindAll() throws Exception {
+        context.turnOffAuthorisationSystem();
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", "Title 1");
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", "Title 2");
+        context.setCurrentUser(eperson);
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", "Title 3");
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", "Title 4");
+
+        createEvent("test-source", "TOPIC/TEST/1", "Title 5");
+        createEvent("test-source", "TOPIC/TEST/1", "Title 6");
+        createEvent("coar-notify", "TOPIC", "Title 7");
+        context.setCurrentUser(eperson);
+        createEvent("coar-notify", "TOPIC", "Title 8");
+        createEvent("coar-notify", "TOPIC", "Title 9");
+        context.setCurrentUser(null);
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancesources", contains(
+                matchQASourceEntry(QAEvent.OPENAIRE_SOURCE, 4),
+                matchQASourceEntry("coar-notify", 3),
+                matchQASourceEntry("test-source", 2),
+                matchQASourceEntry("test-source-2", 0))))
+            .andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(4)));
+
+        // check with our eperson submitter
+        authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancesources", contains(
+                matchQASourceEntry("coar-notify", 3))))
+            .andExpect(jsonPath("$.page.size", is(20)))
+            .andExpect(jsonPath("$.page.totalElements", is(1)));
+    }
+
+    @Test
+    public void testFindAllUnauthorized() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", "Title 1");
+        createEvent("test-source", "TOPIC/TEST/1", "Title 4");
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/integration/qualityassurancesources"))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void testFindOne() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        Community com = CommunityBuilder.createCommunity(context).withName("Test community").build();
+        Collection col = CollectionBuilder.createCollection(context, com).withName("Test collection").build();
+
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", "Title 1");
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", "Title 2");
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", "Title 3");
+
+        createEvent("test-source", "TOPIC/TEST/1", "Title 4");
+        createEvent("test-source", "TOPIC/TEST/1", "Title 5");
+        context.setCurrentUser(admin);
+        Item target1 = ItemBuilder.createItem(context, col).withTitle("Title 7").build();
+        createEvent(QAEvent.COAR_NOTIFY_SOURCE, "TOPIC", target1);
+        context.setCurrentUser(eperson);
+        createEvent(QAEvent.COAR_NOTIFY_SOURCE, "TOPIC", "Title 8");
+        createEvent(QAEvent.COAR_NOTIFY_SOURCE, "TOPIC", "Title 9");
+        context.setCurrentUser(null);
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/openaire"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$", matchQASourceEntry(QAEvent.OPENAIRE_SOURCE, 3)));
+
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/coar-notify"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$", matchQASourceEntry("coar-notify", 3)));
+
+
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/test-source"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$", matchQASourceEntry("test-source", 2)));
+
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/test-source-2"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$", matchQASourceEntry("test-source-2", 0)));
+
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/unknown-test-source"))
+            .andExpect(status().isNotFound());
+
+        authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/openaire"))
+            .andExpect(status().isForbidden());
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/unknown-test-source"))
+            .andExpect(status().isForbidden());
+        // the eperson will see only 2 events in coar-notify as 1 is related to an item was submitted by other
+        getClient(authToken).perform(get("/api/integration/qualityassurancesources/coar-notify"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$", matchQASourceEntry("coar-notify", 2)));
+
+
+    }
+
+    @Test
+    public void testFindOneForbidden() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", "Title 1");
+        createEvent("test-source", "TOPIC/TEST/1", "Title 4");
+
+        context.restoreAuthSystemState();
+
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(get("/api/integration/qualityassurancesources/openaire"))
+            .andExpect(status().isForbidden());
+
+    }
+
+    @Test
+    public void testFindOneUnauthorized() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", "Title 1");
+        createEvent("test-source", "TOPIC/TEST/1", "Title 4");
+
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/integration/qualityassurancesources/openaire"))
+            .andExpect(status().isUnauthorized());
+
+    }
+
+    @Test
+    public void testFindAllByTarget() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        Community com = CommunityBuilder.createCommunity(context).withName("Test community").build();
+        Collection col = CollectionBuilder.createCollection(context, com).withName("Test collection").build();
+        Item target1 = ItemBuilder.createItem(context, col).withTitle("Test item1").build();
+        Item target2 = ItemBuilder.createItem(context, col).withTitle("Test item2").build();
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", target1);
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", target1);
+        createEvent("test-source", "TOPIC/TEST/1", target1);
+        createEvent("test-source", "TOPIC/TEST/1", target2);
+
+        context.setCurrentUser(eperson);
+        Item target3 = ItemBuilder.createItem(context, col).withTitle("Test item3").build();
+        context.setCurrentUser(null);
+        createEvent(QAEvent.COAR_NOTIFY_SOURCE, "TOPIC", target3);
+        createEvent(QAEvent.COAR_NOTIFY_SOURCE, "TOPIC2", target3);
+        createEvent(QAEvent.COAR_NOTIFY_SOURCE, "TOPIC", target2);
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target1.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.qualityassurancesources",
+                        contains(matchQASourceEntry(QAEvent.OPENAIRE_SOURCE + ":" + target1.getID().toString(), 2),
+                                matchQASourceEntry("test-source:" + target1.getID().toString(), 1))))
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(2)));
+
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target2.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.qualityassurancesources",
+                        contains(
+                                matchQASourceEntry(QAEvent.COAR_NOTIFY_SOURCE + ":" + target2.getID().toString(), 1),
+                                matchQASourceEntry("test-source:" + target2.getID().toString(), 1))))
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(2)));
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target3.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.qualityassurancesources",
+                    contains(matchQASourceEntry("coar-notify:" + target3.getID().toString(), 2))))
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(1)));
+
+        // check with our eperson submitter
+        authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target1.getID().toString()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(0)));
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target2.getID().toString()))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(1)));
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target3.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.qualityassurancesources",
+                        contains(matchQASourceEntry("coar-notify:" + target3.getID().toString(), 2))))
+                .andExpect(jsonPath("$.page.size", is(20)))
+                .andExpect(jsonPath("$.page.totalElements", is(1)));
+    }
+
+    @Test
+    public void testFindByTargetBadRequest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        Community com = CommunityBuilder.createCommunity(context).withName("Test community").build();
+        Collection col = CollectionBuilder.createCollection(context, com).withName("Test collection").build();
+        Item target1 = ItemBuilder.createItem(context, col).withTitle("Test item1").build();
+        Item target2 = ItemBuilder.createItem(context, col).withTitle("Test item2").build();
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", target1);
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", target1);
+        createEvent("test-source", "TOPIC/TEST/1", target1);
+        createEvent("test-source", "TOPIC/TEST/1", target2);
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget"))
+                .andExpect(status().isBadRequest());
+    }
+
+
+    @Test
+    public void testFindByTargetUnauthorized() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        Community com = CommunityBuilder.createCommunity(context).withName("Test community").build();
+        Collection col = CollectionBuilder.createCollection(context, com).withName("Test collection").build();
+        Item target1 = ItemBuilder.createItem(context, col).withTitle("Test item1").build();
+        Item target2 = ItemBuilder.createItem(context, col).withTitle("Test item2").build();
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/1", target1);
+        createEvent(QAEvent.OPENAIRE_SOURCE, "TOPIC/OPENAIRE/2", target1);
+        createEvent("test-source", "TOPIC/TEST/1", target1);
+        createEvent("test-source", "TOPIC/TEST/1", target2);
+
+        context.restoreAuthSystemState();
+
+        getClient()
+                .perform(get("/api/integration/qualityassurancesources/search/byTarget").param("target",
+                        target1.getID().toString()))
+                .andExpect(status().isUnauthorized());
+    }
+
+    private QAEvent createEvent(String source, String topic, String title) {
+        return QAEventBuilder.createTarget(context, target)
+            .withSource(source)
+            .withTopic(topic)
+            .withTitle(title)
+            .build();
+    }
+
+    private QAEvent createEvent(String source, String topic, Item item) {
+        return QAEventBuilder.createTarget(context, item)
+            .withSource(source)
+            .withTopic(topic)
+            .withTitle(item.getName())
+            .build();
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/QATopicRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QATopicRestRepositoryIT.java
new file mode 100644
index 0000000000..7534df6c96
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/QATopicRestRepositoryIT.java
@@ -0,0 +1,477 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.content.QAEvent.OPENAIRE_SOURCE;
+import static org.dspace.qaevent.service.impl.QAEventServiceImpl.QAEVENTS_SOURCES;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.UUID;
+
+import org.dspace.app.rest.matcher.QATopicMatcher;
+import org.dspace.app.rest.repository.QATopicRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.QAEventBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.content.QAEvent;
+import org.dspace.qaevent.QANotifyPatterns;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Integration tests for {@link QATopicRestRepository}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QATopicRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Test
+    public void findAllNotImplementedTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/qualityassurancetopics"))
+                             .andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty(QAEVENTS_SOURCES, new String[] { OPENAIRE_SOURCE, "test-source" });
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                      .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                      .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_PID)
+                      .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"10.2307/2144302\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                      .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                      .withMessage("{\"test\": \"Test...\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                      .withSource("test-source")
+                      .withTopic("TOPIC/TEST")
+                      .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}")
+                      .build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(
+                              get("/api/integration/qualityassurancetopics/" + OPENAIRE_SOURCE + ":ENRICH!MISSING!PID"))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$", QATopicMatcher.matchQATopicEntry(
+                                                      QANotifyPatterns.TOPIC_ENRICH_MISSING_PID, 2)));
+
+        getClient(adminToken).perform(get("/api/integration/qualityassurancetopics/"
+                                          + OPENAIRE_SOURCE + ":ENRICH!MISSING!ABSTRACT"))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$", QATopicMatcher.matchQATopicEntry(
+                                                      QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1)));
+
+        getClient(adminToken).perform(get("/api/integration/qualityassurancetopics/test-source:TOPIC!TEST"))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$",QATopicMatcher.matchQATopicEntry("test-source", "TOPIC/TEST", 1)));
+    }
+
+    @Test
+    public void findOneNotFoundTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty("qaevent.sources",
+                new String[] { QAEvent.OPENAIRE_SOURCE });
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        // using a wrong id
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/ENRICH!MISSING!PID"))
+                .andExpect(status().isNotFound());
+        // using a plausible id related to an unknown source
+        getClient(authToken)
+                .perform(get("/api/integration/qualityassurancetopics/unknown-source:ENRICH!MISSING!ABSTRACT"))
+                .andExpect(status().isNotFound());
+        // using a not existing topic
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/openaire:not-existing-topic"))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findOneUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID).build();
+        context.restoreAuthSystemState();
+        getClient().perform(get("/api/integration/qualityassurancetopics/openaire:ENRICH!MISSING!PID"))
+                .andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/qualityassurancetopics/openaire:ENRICH!MISSING!ABSTRACT"))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID).build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/openaire:ENRICH!MISSING!PID"))
+            .andExpect(status().isForbidden());
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/openaire:ENRICH!MISSING!ABSTRACT"))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findBySourceTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty(QAEVENTS_SOURCES, new String[] {
+                                         OPENAIRE_SOURCE, "test-source", "test-source-2" });
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                      .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                      .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_PID)
+                      .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"10.2307/2144302\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+                      .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+                      .withMessage("{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+                      .withTopic("TEST/TOPIC")
+                      .withSource("test-source")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 6")
+                      .withTopic("TEST/TOPIC")
+                      .withSource("test-source")
+                      .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 7")
+                      .withTopic("TEST/TOPIC/2")
+                      .withSource("test-source")
+                      .build();
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                            .param("source", OPENAIRE_SOURCE))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancetopics",
+                Matchers.containsInAnyOrder(
+                    QATopicMatcher.matchQATopicEntry(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID, 2),
+                                QATopicMatcher.matchQATopicEntry(QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT, 1),
+                                QATopicMatcher.matchQATopicEntry(QANotifyPatterns.TOPIC_ENRICH_MORE_PID, 1)
+                                )))
+                            .andExpect(jsonPath("$.page.size", is(20)))
+                            .andExpect(jsonPath("$.page.totalElements", is(3)));
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                            .param("source", "test-source"))
+                            .andExpect(status().isOk())
+                            .andExpect(content().contentType(contentType))
+                            .andExpect(jsonPath("$._embedded.qualityassurancetopics", Matchers.containsInAnyOrder(
+                                       QATopicMatcher.matchQATopicEntry("test-source", "TEST/TOPIC/2", 1),
+                                       QATopicMatcher.matchQATopicEntry("test-source", "TEST/TOPIC", 2)
+                                       )))
+                            .andExpect(jsonPath("$.page.size", is(20)))
+                            .andExpect(jsonPath("$.page.totalElements", is(2)));
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                            .param("source", "test-source-2"))
+                            .andExpect(status().isOk())
+                            .andExpect(content().contentType(contentType))
+                            .andExpect(jsonPath("$._embedded.qualityassurancetopics").doesNotExist())
+                            .andExpect(jsonPath("$.page.size", is(20)))
+                            .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findBySourcePaginationTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty("qaevent.sources",
+                new String[] { QAEvent.OPENAIRE_SOURCE, "test-source", "test-source-2" });
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        //create collection
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+            .withSource(QAEvent.OPENAIRE_SOURCE)
+            .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 2")
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+            .withSource(QAEvent.OPENAIRE_SOURCE)
+            .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 3")
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MORE_PID)
+            .withSource(QAEvent.OPENAIRE_SOURCE)
+            .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"10.2307/2144302\"}").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 4")
+            .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+            .withSource(QAEvent.OPENAIRE_SOURCE)
+            .withMessage(
+                "{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}")
+            .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 5")
+            .withTopic("TEST/TOPIC")
+            .withSource("test-source")
+            .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 6")
+            .withTopic("TEST/TOPIC")
+            .withSource("test-source")
+            .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom 7")
+            .withTopic("TEST/TOPIC/2")
+            .withSource("test-source")
+            .build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                    .param("source", QAEvent.OPENAIRE_SOURCE)
+                    .param("size", "2"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.qualityassurancetopics", Matchers.hasSize(2)))
+                .andExpect(jsonPath("$.page.size", is(2))).andExpect(jsonPath("$.page.totalElements", is(3)));
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                    .param("source", QAEvent.OPENAIRE_SOURCE)
+                    .param("size", "2")
+                    .param("page", "1"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancetopics", Matchers.hasSize(1)))
+            .andExpect(jsonPath("$.page.size", is(2))).andExpect(jsonPath("$.page.totalElements", is(3)));
+       //test unsupported
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                .param("source", "test-source")
+                .param("size", "2"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded").doesNotExist())
+            .andExpect(jsonPath("$.page.size", is(2))).andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findBySourceUnauthorizedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                         .withName("Parent Community")
+                                         .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+                      .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+                      .build();
+        context.restoreAuthSystemState();
+
+        getClient().perform(get("/api/integration/qualityassurancetopics/search/bySource")
+                   .param("source", OPENAIRE_SOURCE))
+                   .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findBySourceForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        QAEventBuilder.createTarget(context, col1, "Science and Freedom")
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID).build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/bySource")
+            .param("source", QAEvent.OPENAIRE_SOURCE))
+            .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findByTargetTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        configurationService.setProperty("qaevent.sources",
+            new String[] { QAEvent.OPENAIRE_SOURCE, "test-source", "test-source-2" });
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item1 = ItemBuilder.createItem(context, col1).withTitle("Science and Freedom").build();
+        Item item2 = ItemBuilder.createItem(context, col1).withTitle("Science and Freedom 2").build();
+        QAEventBuilder.createTarget(context, item1)
+            .withSource(QAEvent.OPENAIRE_SOURCE)
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+            .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144300\"}").build();
+        QAEventBuilder.createTarget(context, item1)
+            .withSource(QAEvent.OPENAIRE_SOURCE)
+            .withTopic(org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT)
+            .withMessage(
+                "{\"abstracts[0]\": \"Descrizione delle caratteristiche...\"}")
+            .build();
+        QAEventBuilder.createTarget(context, item1)
+            .withTopic("TEST/TOPIC")
+            .withSource("test-source")
+            .build();
+        QAEventBuilder.createTarget(context, item1)
+            .withTopic("TEST/TOPIC/2")
+            .withSource("test-source")
+            .build();
+        QAEventBuilder.createTarget(context, item2)
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+            .withMessage("{\"pids[0].type\":\"doi\",\"pids[0].value\":\"10.2307/2144301\"}").build();
+        QAEventBuilder.createTarget(context, item2)
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID)
+            .withMessage("{\"pids[0].type\":\"pmid\",\"pids[0].value\":\"2144301\"}").build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(admin.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+                .param("target", item1.getID().toString())
+                .param("source", QAEvent.OPENAIRE_SOURCE))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancetopics",
+                        Matchers.containsInAnyOrder(
+                                QATopicMatcher.matchQATopicEntry(QAEvent.OPENAIRE_SOURCE,
+                                    QANotifyPatterns.TOPIC_ENRICH_MISSING_PID,
+                                        item1.getID().toString(), 1),
+                                QATopicMatcher.matchQATopicEntry(QAEvent.OPENAIRE_SOURCE,
+                                    QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT,
+                                    item1.getID().toString(), 1))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(2)));
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+                .param("target", item2.getID().toString())
+                .param("source", QAEvent.OPENAIRE_SOURCE))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancetopics",
+                    Matchers.containsInAnyOrder(
+                            QATopicMatcher.matchQATopicEntry(QAEvent.OPENAIRE_SOURCE,
+                                QANotifyPatterns.TOPIC_ENRICH_MISSING_PID,
+                                    item2.getID().toString(), 2))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+            .param("target", UUID.randomUUID().toString())
+            .param("source", QAEvent.OPENAIRE_SOURCE))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.qualityassurancetopics").doesNotExist())
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(0)));
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+                .param("target", item2.getID().toString())
+                .param("source", "test-source"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.qualityassurancetopics").doesNotExist())
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(0)));
+
+    }
+
+    @Test
+    public void findByTargetZeroEventsOpenaireTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item1 = ItemBuilder.createItem(context, col1).withTitle("Science and Freedom").build();
+        QAEventBuilder.createTarget(context, item1)
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID).build();
+        context.restoreAuthSystemState();
+        getClient().perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+                .param("source", QAEvent.OPENAIRE_SOURCE)
+                .param("target", item1.getID().toString()))
+                .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findByTargetZeroEventsAnotherSourceTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item1 = ItemBuilder.createItem(context, col1).withTitle("Science and Freedom").build();
+        QAEventBuilder.createTarget(context, item1)
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID).build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+            .param("target", item1.getID().toString())
+            .param("source", "test-source"))
+            .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void findByTargetBadRequest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+            .withName("Parent Community")
+            .build();
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1").build();
+        Item item1 = ItemBuilder.createItem(context, col1).withTitle("Science and Freedom").build();
+        QAEventBuilder.createTarget(context, item1)
+            .withSource("test-source")
+            .withTopic(QANotifyPatterns.TOPIC_ENRICH_MISSING_PID).build();
+        context.restoreAuthSystemState();
+        String authToken = getAuthToken(eperson.getEmail(), password);
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+            .param("source", "test-source"))
+            .andExpect(status().isBadRequest());
+        getClient(authToken).perform(get("/api/integration/qualityassurancetopics/search/byTarget")
+                .param("target", item1.getID().toString()))
+                .andExpect(status().isBadRequest());
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
index 3ba84f344b..1831fc6a8a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RegistrationRestRepositoryIT.java
@@ -24,9 +24,9 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.Iterator;
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.RegistrationMatcher;
 import org.dspace.app.rest.model.RegistrationRest;
@@ -286,6 +286,34 @@ public class RegistrationRestRepositoryIT extends AbstractControllerIntegrationT
         }
     }
 
+    @Test
+    public void testUnauthorizedForgotPasswordTest() throws Exception {
+        configurationService.setProperty("user.registration", false);
+        configurationService.setProperty("user.forgot-password", false);
+
+        List<RegistrationData> registrationDataList = registrationDataDAO.findAll(context, RegistrationData.class);
+        try {
+            assertEquals(0, registrationDataList.size());
+
+            ObjectMapper mapper = new ObjectMapper();
+            RegistrationRest registrationRest = new RegistrationRest();
+            registrationRest.setEmail(eperson.getEmail());
+            getClient().perform(post("/api/eperson/registrations")
+                                    .param(TYPE_QUERY_PARAM, TYPE_FORGOT)
+                                    .content(mapper.writeValueAsBytes(registrationRest))
+                                    .contentType(contentType))
+                       .andExpect(status().isUnauthorized());
+            registrationDataList = registrationDataDAO.findAll(context, RegistrationData.class);
+            assertEquals(0, registrationDataList.size());
+        } finally {
+            Iterator<RegistrationData> iterator = registrationDataList.iterator();
+            while (iterator.hasNext()) {
+                RegistrationData registrationData = iterator.next();
+                registrationDataDAO.delete(context, registrationData);
+            }
+        }
+    }
+
     @Test
     public void registrationFlowWithNoHeaderCaptchaTokenTest() throws Exception {
         String originVerification = configurationService.getProperty("registration.verification.enabled");
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
index aad26ba2c1..25be24a786 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
@@ -172,7 +172,6 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
                              .withAuthor("Smith, Maria")
                              .withPersonIdentifierLastName("Smith")
                              .withPersonIdentifierFirstName("Maria")
-                             .withMetadata("dspace", "entity", "type", "Person")
                              .build();
 
         author3 = ItemBuilder.createItem(context, col1)
@@ -819,7 +818,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         // Make sure we grab the latest instance of the Item from the database
         publication1 = itemService.find(context, publication1.getID());
         // Add a plain text dc.contributor.author value
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text");
         itemService.update(context, publication1);
 
         List<MetadataValue> list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -885,7 +884,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         // Ensure we have the latest instance of the Item from the database
         publication1 = itemService.find(context, publication1.getID());
         // Add a fourth dc.contributor.author mdv
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text two");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text two");
         itemService.update(context, publication1);
 
         context.restoreAuthSystemState();
@@ -954,7 +953,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         context.turnOffAuthorisationSystem();
         // The following additions of Metadata will perform the same sequence of logic and tests as described above
         publication1 = itemService.find(context, publication1.getID());
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text three");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text three");
         itemService.update(context, publication1);
 
         context.restoreAuthSystemState();
@@ -984,10 +983,10 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         context.turnOffAuthorisationSystem();
 
         publication1 = itemService.find(context, publication1.getID());
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text four");
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text five");
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text six");
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text seven");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text four");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text five");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text six");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text seven");
         itemService.update(context, publication1);
 
         context.restoreAuthSystemState();
@@ -1035,11 +1034,11 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         list = itemService.getMetadata(publication1, "dc", "contributor", Item.ANY, Item.ANY);
         assertEquals(10, list.size()); //same size as authors
         list = itemService.getMetadata(publication1, "dc", Item.ANY, Item.ANY, Item.ANY);
-        assertEquals(16, list.size()); //also includes title, 4 date fields, uri
+        assertEquals(15, list.size()); //also includes title, 3 date fields, uri
         list = itemService.getMetadata(publication1, Item.ANY, Item.ANY, Item.ANY, Item.ANY);
         // also includes type, 3 relation.isAuthorOfPublication and 3 relation.isAuthorOfPublication.latestForDiscovery
         // values
-        assertEquals(23, list.size());
+        assertEquals(22, list.size());
 
         } finally {
             RelationshipBuilder.deleteRelationship(idRef1.get());
@@ -1115,7 +1114,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         publication1 = itemService.find(context, publication1.getID());
         // Add a plain text metadatavalue to the publication
         // After this addition, the list of authors should like like "Donald Smith", "plain text"
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text");
         itemService.update(context, publication1);
         context.restoreAuthSystemState();
         List<MetadataValue> list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -1158,7 +1157,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         // Get the publication from the DB again to ensure that we have the latest object
         publication1 = itemService.find(context, publication1.getID());
         // Add a fourth metadata value to the publication
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text two");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text two");
         itemService.update(context, publication1);
         context.restoreAuthSystemState();
         list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -1196,7 +1195,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         context.turnOffAuthorisationSystem();
         publication1 = itemService.find(context, publication1.getID());
         // Create another plain text metadata value on the publication
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text three");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text three");
         itemService.update(context, publication1);
         context.restoreAuthSystemState();
         list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -1324,7 +1323,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         publication1 = itemService.find(context, publication1.getID());
         // Add a plain text metadatavalue to the publication
         // After this addition, the list of authors should like like "Donald Smith", "plain text"
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text");
         itemService.update(context, publication1);
         context.restoreAuthSystemState();
         List<MetadataValue> list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -1368,7 +1367,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         // Get the publication from the DB again to ensure that we have the latest object
         publication1 = itemService.find(context, publication1.getID());
         // Add a fourth metadata value to the publication
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text two");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text two");
         itemService.update(context, publication1);
         context.restoreAuthSystemState();
         list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -1406,7 +1405,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         context.turnOffAuthorisationSystem();
         publication1 = itemService.find(context, publication1.getID());
         // Create another plain text metadata value on the publication
-        itemService.addMetadata(context, publication1, "dc", "contributor", "author", Item.ANY, "plain text three");
+        itemService.addMetadata(context, publication1, "dc", "contributor", "author", null, "plain text three");
         itemService.update(context, publication1);
         context.restoreAuthSystemState();
         list = itemService.getMetadata(publication1, "dc", "contributor", "author", Item.ANY);
@@ -2305,7 +2304,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
         ;
 
         // Perform a GET request to the searchByLabel endpoint, asking for Relationships of type isOrgUnitOfPerson
-        // We do not specificy a DSO param, which means ALL relationships of type isOrgUnitOfPerson should be returned
+        // We do not specify a DSO param, which means ALL relationships of type isOrgUnitOfPerson should be returned
         // Which is what we're checking for, both the first relationship and the one with a different author
         // should be returned
         getClient().perform(get("/api/core/relationships/search/byLabel")
@@ -2703,7 +2702,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
 
             getClient(token).perform(patch("/api/core/items/" + publication1.getID())
                                          .content(getPatchContent(ops))
-                                         .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON));
+                                         .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON));
 
             // Add another relationship
             mvcResult = getClient(token)
@@ -3307,7 +3306,7 @@ public class RelationshipRestRepositoryIT extends AbstractEntityIntegrationTest
     }
 
     @Test
-    public void findByItemsAndTypeEmptyResponceTest() throws Exception {
+    public void findByItemsAndTypeEmptyResponseTest() throws Exception {
 
         context.turnOffAuthorisationSystem();
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RequestItemRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RequestItemRepositoryIT.java
index 2fb7dbbc96..56409d18d7 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RequestItemRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RequestItemRepositoryIT.java
@@ -15,7 +15,6 @@ import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -29,6 +28,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
 import java.sql.SQLException;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
@@ -36,10 +37,10 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.servlet.http.Cookie;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
+import jakarta.servlet.http.Cookie;
 import org.dspace.app.requestitem.RequestItem;
 import org.dspace.app.requestitem.service.RequestItemService;
 import org.dspace.app.rest.converter.RequestItemConverter;
@@ -56,10 +57,12 @@ import org.dspace.builder.RequestItemBuilder;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Collection;
 import org.dspace.content.Item;
+import org.dspace.services.ConfigurationService;
 import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 
 /**
  *
@@ -82,6 +85,12 @@ public class RequestItemRepositoryIT
     @Autowired(required = true)
     RequestItemService requestItemService;
 
+    @Autowired
+    ApplicationContext applicationContext;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
     private Collection collection;
 
     private Item item;
@@ -127,8 +136,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testFindAll()
             throws Exception {
-        System.out.println("findAll");
-
         getClient().perform(get(URI_ROOT))
                 .andExpect(status().isMethodNotAllowed());
     }
@@ -141,8 +148,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testFindOneAuthenticated()
             throws Exception {
-        System.out.println("findOne (authenticated)");
-
         // Create a request.
         RequestItem request = RequestItemBuilder
                 .createRequestItem(context, item, bitstream)
@@ -166,8 +171,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testFindOneNotAuthenticated()
             throws Exception {
-        System.out.println("findOne (not authenticated)");
-
         // Create a request.
         RequestItem request = RequestItemBuilder
                 .createRequestItem(context, item, bitstream)
@@ -190,8 +193,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testFindOneNonexistent()
             throws Exception {
-        System.out.println("findOne (nonexistent request)");
-
         String uri = URI_ROOT + "/impossible";
         getClient().perform(get(uri))
                 .andExpect(status().isNotFound());
@@ -207,8 +208,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testCreateAndReturnAuthenticated()
             throws SQLException, AuthorizeException, IOException, Exception {
-        System.out.println("createAndReturn (authenticated)");
-
         // Fake up a request in REST form.
         RequestItemRest rir = new RequestItemRest();
         rir.setAllfiles(true);
@@ -390,7 +389,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testCreateWithInvalidCSRF()
             throws Exception {
-        System.out.println("testCreateWithInvalidCSRF");
 
         // Login via password to retrieve a valid token
         String token = getAuthToken(eperson.getEmail(), password);
@@ -415,7 +413,7 @@ public class RequestItemRepositoryIT
         getClient().perform(post(URI_ROOT)
                 .content(mapper.writeValueAsBytes(rir))
                 .contentType(contentType)
-                .with(csrf().useInvalidToken().asHeader())
+                .with(invalidCsrfToken())
                 .secure(true)
                 .cookie(cookies))
                 // Should return a 403 Forbidden, for an invalid CSRF token
@@ -549,8 +547,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testPutBadRequest()
             throws Exception {
-        System.out.println("put bad requests");
-
         // Create an item request to approve.
         RequestItem itemRequest = RequestItemBuilder
                 .createRequestItem(context, item, bitstream)
@@ -577,7 +573,6 @@ public class RequestItemRepositoryIT
     @Test
     public void testPutCompletedRequest()
             throws Exception {
-        System.out.println("put completed request");
 
         // Create an item request that is already denied.
         RequestItem itemRequest = RequestItemBuilder
@@ -605,9 +600,43 @@ public class RequestItemRepositoryIT
      */
     @Test
     public void testGetDomainClass() {
-        System.out.println("getDomainClass");
         RequestItemRepository instance = new RequestItemRepository();
         Class instanceClass = instance.getDomainClass();
         assertEquals("Wrong domain class", RequestItemRest.class, instanceClass);
     }
+
+    /**
+     * Test that generated links include the correct base URL, where the UI URL has a subpath like /subdir
+     */
+    @Test
+    public void testGetLinkTokenEmailWithSubPath() throws MalformedURLException, URISyntaxException {
+        RequestItemRepository instance = applicationContext.getBean(
+                RequestItemRest.CATEGORY + '.' + RequestItemRest.PLURAL_NAME,
+                RequestItemRepository.class);
+        String currentDspaceUrl = configurationService.getProperty("dspace.ui.url");
+        String newDspaceUrl = currentDspaceUrl + "/subdir";
+        // Add a /subdir to the url for this test
+        configurationService.setProperty("dspace.ui.url", newDspaceUrl);
+        String expectedUrl = newDspaceUrl + "/request-a-copy/token";
+        String generatedLink = instance.getLinkTokenEmail("token");
+        // The URLs should match
+        assertEquals(expectedUrl, generatedLink);
+        configurationService.reloadConfig();
+    }
+
+    /**
+     * Test that generated links include the correct base URL, with NO subpath elements
+     */
+    @Test
+    public void testGetLinkTokenEmailWithoutSubPath() throws MalformedURLException, URISyntaxException {
+        RequestItemRepository instance = applicationContext.getBean(
+                RequestItemRest.CATEGORY + '.' + RequestItemRest.PLURAL_NAME,
+                RequestItemRepository.class);
+        String currentDspaceUrl = configurationService.getProperty("dspace.ui.url");
+        String expectedUrl = currentDspaceUrl + "/request-a-copy/token";
+        String generatedLink = instance.getLinkTokenEmail("token");
+        // The URLs should match
+        assertEquals(expectedUrl, generatedLink);
+        configurationService.reloadConfig();
+    }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
index 70009d049f..b3c70f8128 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
@@ -20,6 +20,7 @@ import static org.dspace.app.rest.matcher.MetadataMatcher.matchMetadataNotEmpty;
 import static org.dspace.app.rest.matcher.ResourcePolicyMatcher.matchResourcePolicyProperties;
 import static org.dspace.builder.RelationshipTypeBuilder.createRelationshipTypeBuilder;
 import static org.dspace.profile.OrcidEntitySyncPreference.ALL;
+import static org.dspace.profile.OrcidEntitySyncPreference.DISABLED;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.empty;
@@ -2231,6 +2232,156 @@ public class ResearcherProfileRestRepositoryIT extends AbstractControllerIntegra
         assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
     }
 
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithSyncSettingsRemoved() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_owner");
+        configurationService.setProperty("orcid.disconnection.remain-sync", "false");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withOrcid("0000-1111-2222-3333")
+            .withOrcidScope("/read")
+            .withOrcidScope("/write")
+            .withEmail("test@email.it")
+            .withPassword(password)
+            .withNameInMetadata("Test", "User")
+            .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+        String ePersonId = ePerson.getID().toString();
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/mode", "BATCH"),
+            new ReplaceOperation("/orcid/publications", "DISABLED"),
+            new ReplaceOperation("/orcid/fundings", "ALL"),
+            new ReplaceOperation("/orcid/profile", "BIOGRAPHICAL,IDENTIFIERS"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(operations))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.orcidSynchronization.mode", is("BATCH")))
+            .andExpect(jsonPath("$.orcidSynchronization.profilePreferences",
+                containsInAnyOrder("IDENTIFIERS", "BIOGRAPHICAL")))
+            .andExpect(jsonPath("$.orcidSynchronization.fundingsPreference", is(ALL.name())))
+            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is(DISABLED.name())));
+
+        profile = context.reloadEntity(profile);
+        List<MetadataValue> metadata = profile.getMetadata();
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-mode","BATCH")));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-publications",DISABLED.name())));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-fundings",ALL.name())));
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-profile"), hasSize(2));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePersonId)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-profile"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-mode"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-fundings"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-publications"), empty());
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithSyncSettingsRemain() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withOrcid("0000-1111-2222-3333")
+            .withOrcidScope("/read")
+            .withOrcidScope("/write")
+            .withEmail("test@email.it")
+            .withPassword(password)
+            .withNameInMetadata("Test", "User")
+            .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+        String ePersonId = ePerson.getID().toString();
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/mode", "BATCH"),
+            new ReplaceOperation("/orcid/publications", "DISABLED"),
+            new ReplaceOperation("/orcid/fundings", "ALL"),
+            new ReplaceOperation("/orcid/profile", "BIOGRAPHICAL,IDENTIFIERS"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(operations))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.orcidSynchronization.mode", is("BATCH")))
+            .andExpect(jsonPath("$.orcidSynchronization.profilePreferences",
+                containsInAnyOrder("IDENTIFIERS", "BIOGRAPHICAL")))
+            .andExpect(jsonPath("$.orcidSynchronization.fundingsPreference", is(ALL.name())))
+            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is(DISABLED.name())));
+
+        profile = context.reloadEntity(profile);
+        List<MetadataValue> metadata = profile.getMetadata();
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-mode","BATCH")));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-publications",DISABLED.name())));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-fundings",ALL.name())));
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-profile"), hasSize(2));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePersonId)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-mode","BATCH")));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-publications",DISABLED.name())));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-fundings",ALL.name())));
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-profile"), hasSize(2));
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
+
     @Test
     public void testCloneFromExternalProfileAlreadyAssociated() throws Exception {
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
index 5d2a05ab64..bc6f142abe 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ResourcePolicyRestRepositoryIT.java
@@ -29,9 +29,9 @@ import java.util.Date;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.lang3.StringUtils;
 import org.dspace.app.rest.matcher.ResourcePolicyMatcher;
 import org.dspace.app.rest.model.ResourcePolicyRest;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java
new file mode 100644
index 0000000000..9a8d14f3d6
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/RorImportMetadataSourceServiceIT.java
@@ -0,0 +1,164 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.matcher.LambdaMatcher.matches;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasSize;
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.Optional;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.dspace.importer.external.datamodel.ImportRecord;
+import org.dspace.importer.external.liveimportclient.service.LiveImportClientImpl;
+import org.dspace.importer.external.ror.service.RorImportMetadataSourceServiceImpl;
+import org.hamcrest.Matcher;
+import org.junit.Test;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class RorImportMetadataSourceServiceIT extends AbstractLiveImportIntegrationTest {
+
+    @Autowired
+    private LiveImportClientImpl liveImportClient;
+
+    @Autowired
+    private RorImportMetadataSourceServiceImpl rorServiceImpl;
+
+    @Test
+    public void tesGetRecords() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ror-records.json")) {
+
+            String jsonResponse = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(jsonResponse, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            Collection<ImportRecord> recordsImported = rorServiceImpl.getRecords("test query", 0, 2);
+            assertThat(recordsImported, hasSize(20));
+
+            ImportRecord record = recordsImported.iterator().next();
+
+            assertThat(record.getValueList(), hasSize(11));
+
+            assertThat(
+                record.getSingleValue("organization.legalName"),
+                is("The University of Texas")
+            );
+            assertThat(record.getSingleValue("organization.identifier.ror"), is("https://ror.org/02f6dcw23"));
+            assertThat(record.getSingleValue("organization.alternateName"), is("UTHSCSA"));
+            assertThat(record.getSingleValue("organization.url"), is("http://www.uthscsa.edu/"));
+            assertThat(record.getSingleValue("dc.type"), is("Education"));
+            assertThat(record.getSingleValue("organization.address.addressCountry"), is("US"));
+            assertThat(record.getSingleValue("organization.foundingDate"), is("1959"));
+            assertThat(record.getValue("organization", "identifier", "crossrefid"), hasSize(2));
+            assertThat(record.getSingleValue("organization.identifier.isni"), is("0000 0001 0629 5880"));
+            assertThat(record.getSingleValue("organization.parentOrganization"), is("The University of Texas System"));
+
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void tesCount() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ror-records.json")) {
+
+            String jsonResponse = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(jsonResponse, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            Integer count = rorServiceImpl.count("test");
+            assertThat(count, equalTo(200));
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void tesGetRecord() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+
+        try (InputStream file = getClass().getResourceAsStream("ror-record.json")) {
+
+            String jsonResponse = IOUtils.toString(file, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(jsonResponse, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            ImportRecord record = rorServiceImpl.getRecord("https://ror.org/01sps7q28");
+            assertThat(record.getValueList(), hasSize(9));
+            assertThat(
+                record.getSingleValue("organization.legalName"),
+                is("The University of Texas Health Science Center at Tyler")
+            );
+            assertThat(record.getSingleValue("organization.identifier.ror"), is("https://ror.org/01sps7q28"));
+            assertThat(record.getSingleValue("organization.alternateName"), is("UTHSCT"));
+            assertThat(record.getSingleValue("organization.url"),
+                is("https://www.utsystem.edu/institutions/university-texas-health-science-center-tyler"));
+            assertThat(record.getSingleValue("dc.type"), is("Healthcare"));
+            assertThat(record.getSingleValue("organization.address.addressCountry"), is("US"));
+            assertThat(record.getSingleValue("organization.foundingDate"), is("1947"));
+            assertThat(record.getSingleValue("organization.identifier.isni"), is("0000 0000 9704 5790"));
+            assertThat(record.getSingleValue("organization.parentOrganization"), is("The University of Texas System"));
+
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    @Test
+    public void tesGetRecordsCount() throws Exception {
+        context.turnOffAuthorisationSystem();
+        CloseableHttpClient originalHttpClient = liveImportClient.getHttpClient();
+        CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
+        try (InputStream rorResponse = getClass().getResourceAsStream("ror-records.json")) {
+            String rorJsonResponse = IOUtils.toString(rorResponse, Charset.defaultCharset());
+
+            liveImportClient.setHttpClient(httpClient);
+            CloseableHttpResponse response = mockResponse(rorJsonResponse, 200, "OK");
+            when(httpClient.execute(ArgumentMatchers.any())).thenReturn(response);
+
+            context.restoreAuthSystemState();
+            int tot = rorServiceImpl.getRecordsCount("test query");
+            assertEquals(200, tot);
+        } finally {
+            liveImportClient.setHttpClient(originalHttpClient);
+        }
+    }
+
+    private Matcher<Optional<String>> is(String value) {
+        return matches(optionalValue -> optionalValue.isPresent() && optionalValue.get().equals(value));
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java
index aafc75a065..c12eff1f17 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/ScieloImportMetadataSourceServiceIT.java
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SiteRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SiteRestRepositoryIT.java
index 26b01071d1..724e785ba2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SiteRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SiteRestRepositoryIT.java
@@ -133,7 +133,7 @@ public class SiteRestRepositoryIT extends AbstractControllerIntegrationTest {
         getClient(token)
             .perform(patch("/api/core/sites/" + site.getID())
             .content(requestBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isOk())
             .andExpect(
                  jsonPath("$.metadata",
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
index 04d22718e8..681e9bf16b 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SitemapRestControllerIT.java
@@ -14,8 +14,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import javax.servlet.ServletException;
-
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
 import org.dspace.authorize.service.ResourcePolicyService;
 import org.dspace.builder.CollectionBuilder;
@@ -131,18 +129,20 @@ public class SitemapRestControllerIT extends AbstractControllerIntegrationTest {
                    .andExpect(status().isNotFound());
     }
 
-    @Test(expected = ServletException.class)
+    @Test
     public void testSitemap_fileSystemTraversal_dspaceCfg() throws Exception {
         //** WHEN **
         //We attempt to use endpoint for malicious file system traversal
-        getClient().perform(get("/" + SITEMAPS_ENDPOINT + "/%2e%2e/config/dspace.cfg"));
+        getClient().perform(get("/" + SITEMAPS_ENDPOINT + "/%2e%2e/config/dspace.cfg"))
+                   .andExpect(status().isBadRequest());
     }
 
-    @Test(expected = ServletException.class)
+    @Test
     public void testSitemap_fileSystemTraversal_dspaceCfg2() throws Exception {
         //** WHEN **
         //We attempt to use endpoint for malicious file system traversal
-        getClient().perform(get("/" + SITEMAPS_ENDPOINT + "/%2e%2e%2fconfig%2fdspace.cfg"));
+        getClient().perform(get("/" + SITEMAPS_ENDPOINT + "/%2e%2e%2fconfig%2fdspace.cfg"))
+                   .andExpect(status().isBadRequest());
     }
 
     @Test
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
index 613075fe8f..44fc024ce1 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/StatisticsRestRepositoryIT.java
@@ -135,13 +135,13 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
     @Test
     public void usagereports_notProperUUIDAndReportId_Exception() throws Exception {
         getClient(adminToken).perform(get("/api/statistics/usagereports/notProperUUIDAndReportId"))
-                   .andExpect(status().is(HttpStatus.BAD_REQUEST.value()));
+                   .andExpect(status().isNotFound());
     }
 
     @Test
     public void usagereports_nonValidUUIDpart_Exception() throws Exception {
         getClient(adminToken).perform(get("/api/statistics/usagereports/notAnUUID" + "_" + TOTAL_VISITS_REPORT_ID))
-                   .andExpect(status().is(HttpStatus.BAD_REQUEST.value()));
+                   .andExpect(status().isNotFound());
     }
 
     @Test
@@ -193,7 +193,7 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
     public void usagereport_onlyAdminReadRights_unvalidToken() throws Exception {
         // ** WHEN **
         authorizeService.removeAllPolicies(context, itemNotVisitedWithBitstreams);
-        // We request a dso's TotalVisits usage stat report with unvalid token
+        // We request a dso's TotalVisits usage stat report with invalid token
         getClient("unvalidToken").perform(
             get("/api/statistics/usagereports/" + itemNotVisitedWithBitstreams.getID() + "_" + TOTAL_VISITS_REPORT_ID))
                                  // ** THEN **
@@ -826,7 +826,7 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
     public void TotalDownloadsReport_NotSupportedDSO_Collection() throws Exception {
         getClient(adminToken)
             .perform(get("/api/statistics/usagereports/" + collectionVisited.getID() + "_" + TOTAL_DOWNLOADS_REPORT_ID))
-            .andExpect(status().is(HttpStatus.BAD_REQUEST.value()));
+            .andExpect(status().isNotFound());
     }
 
     /**
@@ -1135,7 +1135,7 @@ public class StatisticsRestRepositoryIT extends AbstractControllerIntegrationTes
     public void usagereportSearch_onlyAdminReadRights_unvalidToken() throws Exception {
         // ** WHEN **
         authorizeService.removeAllPolicies(context, itemNotVisitedWithBitstreams);
-        // We request a dso's TotalVisits usage stat report with unvalid token
+        // We request a dso's TotalVisits usage stat report with invalid token
         getClient("unvalidToken")
             .perform(get("/api/statistics/usagereports/search/object?uri=http://localhost:8080/server/api/core" +
                          "/items/" + itemNotVisitedWithBitstreams.getID()))
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubResourcePermissionsIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubResourcePermissionsIT.java
index c5f2ed9a13..d6b4b52d17 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubResourcePermissionsIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubResourcePermissionsIT.java
@@ -331,21 +331,21 @@ public class SubResourcePermissionsIT extends AbstractControllerIntegrationTest
 
         // Calling public parentCommunity as an admin user
         // Should succeed
-        getClient(adminToken).perform(get("/api/core/community/" + parentCommunity.getID()))
+        getClient(adminToken).perform(get("/api/core/communities/" + parentCommunity.getID()))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", CommunityMatcher
                                  .matchCommunityEntry(parentCommunity.getID(), parentCommunity.getHandle())));
 
         // Calling public parentCommunity as a normal EPerson
         // Should succeed
-        getClient(epersonToken).perform(get("/api/core/community/" + parentCommunity.getID()))
+        getClient(epersonToken).perform(get("/api/core/communities/" + parentCommunity.getID()))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", CommunityMatcher
                                  .matchCommunityEntry(parentCommunity.getID(), parentCommunity.getHandle())));
 
         // Calling public parentCommunity as an anon user
         // Should succeed
-        getClient().perform(get("/api/core/community/" + parentCommunity.getID()))
+        getClient().perform(get("/api/core/communities/" + parentCommunity.getID()))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", CommunityMatcher
                                  .matchCommunityEntry(parentCommunity.getID(), parentCommunity.getHandle())));
@@ -404,19 +404,19 @@ public class SubResourcePermissionsIT extends AbstractControllerIntegrationTest
 
         // Calling private parentCommunity as an admin user
         // Should succeed
-        getClient(adminToken).perform(get("/api/core/community/" + parentCommunity.getID()))
+        getClient(adminToken).perform(get("/api/core/communities/" + parentCommunity.getID()))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", CommunityMatcher
                                  .matchCommunityEntry(parentCommunity.getID(), parentCommunity.getHandle())));
 
         // Calling private parentCommunity as a normal EPerson
         // Shouldn't succeed
-        getClient(epersonToken).perform(get("/api/core/community/" + parentCommunity.getID()))
+        getClient(epersonToken).perform(get("/api/core/communities/" + parentCommunity.getID()))
                                .andExpect(status().isForbidden());
 
         // Calling private parentCommunity as an anon user
         // Shouldn't succeed
-        getClient().perform(get("/api/core/community/" + parentCommunity.getID()))
+        getClient().perform(get("/api/core/communities/" + parentCommunity.getID()))
                    .andExpect(status().isUnauthorized());
 
         // Calling fullProjection, as an admin user, of a private Collection should contain the parentCommunity
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionCOARNotifyRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionCOARNotifyRestRepositoryIT.java
new file mode 100644
index 0000000000..b2d4a06606
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionCOARNotifyRestRepositoryIT.java
@@ -0,0 +1,81 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.List;
+
+import org.dspace.app.rest.matcher.SubmissionCOARNotifyMatcher;
+import org.dspace.app.rest.repository.SubmissionCoarNotifyRestRepository;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.coarnotify.NotifyPattern;
+import org.hamcrest.Matchers;
+import org.junit.Test;
+
+/**
+ * Integration test class for {@link SubmissionCoarNotifyRestRepository}.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerIntegrationTest {
+
+    @Test
+    public void findAllTestUnAuthorized() throws Exception {
+        getClient().perform(get("/api/config/submissioncoarnotifyconfigs"))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+
+        getClient(epersonToken).perform(get("/api/config/submissioncoarnotifyconfigs"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.submissioncoarnotifyconfigs", Matchers.containsInAnyOrder(
+                        SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify", List.of(
+                            new NotifyPattern("request-review", true),
+                            new NotifyPattern("request-endorsement", true),
+                            new NotifyPattern("request-ingest", false)))
+                )));
+    }
+
+    @Test
+    public void findOneTestUnAuthorized() throws Exception {
+        getClient().perform(get("/api/config/submissioncoarnotifyconfigs/coarnotify"))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneTestNonExistingCOARNotify() throws Exception {
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+
+        getClient(epersonToken).perform(get("/api/config/submissioncoarnotifyconfigs/non-existing-coar"))
+                .andExpect(status().isNotFound());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+
+        getClient(epersonToken).perform(get("/api/config/submissioncoarnotifyconfigs/coarnotify"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", Matchers.is(
+                        SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify", List.of(
+                            new NotifyPattern("request-review", true),
+                            new NotifyPattern("request-endorsement", true),
+                            new NotifyPattern("request-ingest", false)))
+                )));
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
index 1a1a4576dc..0722949ffd 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionDefinitionsControllerIT.java
@@ -35,7 +35,7 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
     // The total number of expected submission definitions is referred to in multiple tests and assertions as
     // is the last page (totalDefinitions - 1)
     // This integer should be maintained along with any changes to item-submissions.xml
-    private static final int totalDefinitions = 9;
+    private static final int totalDefinitions = 12;
 
     @Test
     public void findAll() throws Exception {
@@ -96,6 +96,7 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                    //The status has to be 200 OK
                    .andExpect(status().isOk())
                    .andExpect(jsonPath("$", SubmissionDefinitionsMatcher.matchFullEmbeds()))
+                   .andExpect(jsonPath("$", SubmissionDefinitionsMatcher.matchLinks()))
                    //We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
 
@@ -210,7 +211,7 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                    // We expect the content type to be "application/hal+json;charset=UTF-8"
                    .andExpect(content().contentType(contentType))
                    // Match only that a section exists with a submission configuration behind
-                   .andExpect(jsonPath("$._embedded.submissionsections", hasSize(9)))
+                   .andExpect(jsonPath("$._embedded.submissionsections", hasSize(10)))
                    .andExpect(jsonPath("$._embedded.submissionsections",
                                        Matchers.hasItem(
                                            allOf(
@@ -248,107 +249,107 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
                 .param("size", "1")
                 .param("page", "0"))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(contentType))
-            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("traditional")))
-            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$.page.size", is(1)))
-            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.number", is(0)));
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("traditional")))
+                .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.number", is(0)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
                 .param("size", "1")
                 .param("page", "1"))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(contentType))
-            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("languagetestprocess")))
-            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$.page.size", is(1)))
-            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.number", is(1)));
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("languagetestprocess")))
+                .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                        Matchers.containsString("/api/config/submissiondefinitions?"),
+                        Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.number", is(1)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
                 .param("size", "1")
                 .param("page", "2"))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(contentType))
-            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("extractiontestprocess")))
-            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=3"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$.page.size", is(1)))
-            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.number", is(2)));
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("extractiontestprocess")))
+                .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=3"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.number", is(2)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
                 .param("size", "1")
                 .param("page", "3"))
-            .andExpect(status().isOk())
-            .andExpect(content().contentType(contentType))
-            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("qualdroptest")))
-            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=3"), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
-                Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
-            .andExpect(jsonPath("$.page.size", is(1)))
-            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
-            .andExpect(jsonPath("$.page.number", is(3)));
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("qualdroptest")))
+                .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=2"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=4"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=3"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                    Matchers.containsString("/api/config/submissiondefinitions?"),
+                    Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+                .andExpect(jsonPath("$.page.number", is(3)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
-                .param("size", "1")
-                .param("page", "4"))
+            .param("size", "1")
+            .param("page", "4"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(contentType))
             .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("typebindtest")))
@@ -373,8 +374,8 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
             .andExpect(jsonPath("$.page.number", is(4)));
 
         getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
-                .param("size", "1")
-                .param("page", "5"))
+            .param("size", "1")
+            .param("page", "5"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(contentType))
             .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("accessConditionNotDiscoverable")))
@@ -392,7 +393,7 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                 Matchers.containsString("page=5"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
-                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+                    Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$.page.size", is(1)))
             .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
             .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
@@ -455,7 +456,7 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                 .param("page", "7"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(contentType))
-            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("collectiontest")))
+            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("topcommunitytest")))
             .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
                 Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
@@ -481,13 +482,16 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
                 .param("page", "8"))
             .andExpect(status().isOk())
             .andExpect(content().contentType(contentType))
-            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("entitytypetest")))
+            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("subcommunitytest")))
             .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
                 Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
                 Matchers.containsString("page=7"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=9"), Matchers.containsString("size=1"))))
             .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
                 Matchers.containsString("/api/config/submissiondefinitions?"),
                 Matchers.containsString("page=8"), Matchers.containsString("size=1"))))
@@ -499,6 +503,80 @@ public class SubmissionDefinitionsControllerIT extends AbstractControllerIntegra
             .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
             .andExpect(jsonPath("$.page.number", is(8)));
 
+        getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
+                .param("size", "1")
+                .param("page", "9"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("collectiontest")))
+            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=8"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=10"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=9"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$.page.size", is(1)))
+            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+            .andExpect(jsonPath("$.page.number", is(9)));
+
+        getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
+                .param("size", "1")
+                .param("page", "10"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("entitytypetest")))
+            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=9"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.next.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=11"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=10"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$.page.size", is(1)))
+            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+            .andExpect(jsonPath("$.page.number", is(10)));
+
+        getClient(tokenAdmin).perform(get("/api/config/submissiondefinitions")
+                .param("size", "1")
+                .param("page", "11"))
+            .andExpect(status().isOk())
+            .andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.submissiondefinitions[0].id", is("test-duplicate-detection")))
+            .andExpect(jsonPath("$._links.first.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.prev.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=10"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=11"), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$._links.last.href", Matchers.allOf(
+                Matchers.containsString("/api/config/submissiondefinitions?"),
+                Matchers.containsString("page=" + (totalDefinitions - 1)), Matchers.containsString("size=1"))))
+            .andExpect(jsonPath("$.page.size", is(1)))
+            .andExpect(jsonPath("$.page.totalElements", is(totalDefinitions)))
+            .andExpect(jsonPath("$.page.totalPages", is(totalDefinitions)))
+            .andExpect(jsonPath("$.page.number", is(11)));
     }
 
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
index 006c22dae1..b3d1360076 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionFormsControllerIT.java
@@ -398,7 +398,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                           + " (ad esempio, se è un set di dati o un'immagine) selezionare (N/A)",
                           null, "dc.language.iso", "common_iso_languages"))));
 
-        // user select ukranian language
+        // user select ukrainian language
         getClient(tokenEperson).perform(get("/api/config/submissionforms/languagetest").locale(uk))
                  .andExpect(status().isOk())
                  .andExpect(content().contentType(contentType))
@@ -478,7 +478,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
                           + " (ad esempio, se è un set di dati o un'immagine) selezionare (N/A)",
                           null, "dc.language.iso", "common_iso_languages"))));
 
-        // user with ukranian prefer language
+        // user with ukrainian prefer language
         getClient(tokenEpersonUK).perform(get("/api/config/submissionforms/languagetest"))
                  .andExpect(status().isOk())
                  .andExpect(content().contentType(contentType))
@@ -528,7 +528,7 @@ public class SubmissionFormsControllerIT extends AbstractControllerIntegrationTe
 
         String tokenEpersonUK = getAuthToken(epersonUK.getEmail(), password);
 
-        // user prefer ukranian but choice italian language
+        // user prefer ukrainian but choice italian language
         getClient(tokenEpersonUK).perform(get("/api/config/submissionforms/languagetest").locale(it))
                  .andExpect(status().isOk())
                  .andExpect(content().contentType(contentType))
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionRestRepositoryIT.java
new file mode 100644
index 0000000000..a3294fbda1
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionRestRepositoryIT.java
@@ -0,0 +1,477 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.dspace.app.rest.matcher.SuggestionMatcher.matchSuggestion;
+import static org.dspace.builder.SuggestionTargetBuilder.EVIDENCE_MOCK_NAME;
+import static org.dspace.builder.SuggestionTargetBuilder.EVIDENCE_MOCK_NOTE;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.data.rest.webmvc.RestMediaTypes.TEXT_URI_LIST_VALUE;
+import static org.springframework.http.MediaType.parseMediaType;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.Map;
+import java.util.UUID;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.dspace.app.rest.matcher.MetadataMatcher;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.app.suggestion.MockSuggestionExternalDataSource;
+import org.dspace.app.suggestion.SuggestionTarget;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.SuggestionTargetBuilder;
+import org.dspace.builder.WorkspaceItemBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.test.web.servlet.MvcResult;
+
+/**
+ * Integration Tests against the /api/integration/suggestions endpoint
+ */
+public class SuggestionRestRepositoryIT extends AbstractControllerIntegrationTest {
+    private Collection colPeople;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        // We turn off the authorization system in order to create the structure as
+        // defined below
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        colPeople = CollectionBuilder.createCollection(context, parentCommunity).withName("People")
+                .withEntityType("Person").build();
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        context.restoreAuthSystemState();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestions"))
+                .andExpect(status().isMethodNotAllowed());
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(get("/api/integration/suggestions")).andExpect(status().isMethodNotAllowed());
+        getClient().perform(get("/api/integration/suggestions")).andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void findByTargetAndSourceTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "scopus")
+                        .param("target", itemFirst.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.contains(
+                        matchSuggestion("scopus", itemFirst, "Suggestion scopus 1", "1",
+                                100.0, EVIDENCE_MOCK_NAME, 100.0, EVIDENCE_MOCK_NOTE),
+                        matchSuggestion("scopus", itemFirst, "Suggestion scopus 3", "3",
+                                98.0, EVIDENCE_MOCK_NAME, 98.0, EVIDENCE_MOCK_NOTE),
+                        matchSuggestion("scopus", itemFirst, "Suggestion scopus 2", "2",
+                                0.5, EVIDENCE_MOCK_NAME, 0.5, EVIDENCE_MOCK_NOTE))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString(
+                                "/api/integration/suggestions/search/findByTargetAndSource?"),
+                        Matchers.containsString("source=scopus"),
+                        Matchers.containsString("target=" + itemFirst.getID().toString()))))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(3)));
+        Item itemSecond = targetSecond.getTarget();
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                        .param("target", itemSecond.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.containsInAnyOrder(
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 1", "1"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 2", "2"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 3", "3"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 4", "4"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 5", "5"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 6", "6"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 7", "7"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 8", "8"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 9", "9"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 10", "10"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 11", "11"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString(
+                                "/api/integration/suggestions/search/findByTargetAndSource?"),
+                        Matchers.containsString("source=reciter"),
+                        Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(11)));
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                        .param("target", itemSecond.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.containsInAnyOrder(
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 1", "1"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 2", "2"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 3", "3"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 4", "4"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 5", "5"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 6", "6"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 7", "7"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 8", "8"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 9", "9"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 10", "10"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 11", "11"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString(
+                                "/api/integration/suggestions/search/findByTargetAndSource?"),
+                        Matchers.containsString("source=reciter"),
+                        Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(11)));
+    }
+
+    @Test
+    public void findByTargetAndSourcePaginationTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        Item itemSecond = targetSecond.getTarget();
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                        .param("size", "5")
+                        .param("target", itemSecond.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.contains(
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 1", "1"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 3", "3"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 5", "5"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 7", "7"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 9", "9"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString(
+                                "/api/integration/suggestions/search/findByTargetAndSource?"),
+                        Matchers.containsString("source=reciter"),
+                        Matchers.containsString("size=5"),
+                        Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=1"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=2"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.prev.href").doesNotExist())
+                .andExpect(jsonPath("$.page.size", is(5))).andExpect(jsonPath("$.page.totalElements", is(11)));
+
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                        .param("size", "5")
+                        .param("page", "1")
+                        .param("target", itemSecond.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.contains(
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 11", "11"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 10", "10"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 8", "8"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 6", "6"),
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 4", "4"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString(
+                                "/api/integration/suggestions/search/findByTargetAndSource?"),
+                        Matchers.containsString("source=reciter"),
+                        Matchers.containsString("page=1"),
+                        Matchers.containsString("size=5"),
+                        Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=2"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=2"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$.page.size", is(5))).andExpect(jsonPath("$.page.totalElements", is(11)));
+
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                        .param("size", "5")
+                        .param("page", "2")
+                        .param("target", itemSecond.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.contains(
+                        matchSuggestion("reciter", itemSecond, "Suggestion reciter 2", "2"))))
+                .andExpect(jsonPath("$._links.self.href", Matchers.allOf(
+                        Matchers.containsString(
+                                "/api/integration/suggestions/search/findByTargetAndSource?"),
+                        Matchers.containsString("source=reciter"),
+                        Matchers.containsString("page=2"),
+                        Matchers.containsString("size=5"),
+                        Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=1"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=2"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString(
+                                        "/api/integration/suggestions/search/findByTargetAndSource?"),
+                                Matchers.containsString("source=reciter"),
+                                Matchers.containsString("page=0"),
+                                Matchers.containsString("size=5"),
+                                Matchers.containsString("target=" + itemSecond.getID().toString()))))
+                .andExpect(jsonPath("$._links.next.href").doesNotExist())
+                .andExpect(jsonPath("$.page.size", is(5))).andExpect(jsonPath("$.page.totalElements", is(11)));
+    }
+
+    @Test
+    public void findByTargetAndSourceNotAdminTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+        // anonymous cannot access the suggestions source endpoint
+        getClient()
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource")
+                        .param("target", UUID.randomUUID().toString()).param("source", "reciter"))
+                .andExpect(status().isUnauthorized());
+        // nor normal user
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource")
+                        .param("target", UUID.randomUUID().toString()).param("source", "reciter"))
+                .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        //targetSecond refers to eperson
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String suggestionId = "reciter:" + itemFirst.getID().toString() + ":6";
+        getClient(adminToken).perform(get("/api/integration/suggestions/" + suggestionId)).andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestion("reciter", itemFirst, "Suggestion reciter 6", "6")))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestions/" + suggestionId)));
+        //test targetSecond refers to eperson
+        Item itemSecond = targetSecond.getTarget();
+        String epersonSuggestionId = "reciter:" + itemSecond.getID().toString() + ":2";
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken).perform(get("/api/integration/suggestions/" + epersonSuggestionId))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestion("reciter", itemSecond, "Suggestion reciter 2", "2")))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestions/" + epersonSuggestionId)));
+    }
+
+    @Test
+    public void findOneNotAdminTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        String suggestionId = "reciter:" + itemFirst.getID().toString() + ":6";
+        getClient(epersonToken).perform(get("/api/integration/suggestions/" + suggestionId))
+                .andExpect(status().isForbidden());
+        getClient(epersonToken).perform(get("/api/integration/suggestions/not-exist"))
+                .andExpect(status().isForbidden());
+        getClient().perform(get("/api/integration/suggestions/" + suggestionId)).andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestions/not-exist")).andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void acceptSuggestionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Collection colPublications = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Publications").build();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 2).build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String suggestionId = "reciter:" + itemFirst.getID().toString() + ":1";
+        // the suggestion is here
+        getClient(adminToken).perform(get("/api/integration/suggestions/" + suggestionId)).andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestion("reciter", itemFirst, "Suggestion reciter 1", "1")))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestions/" + suggestionId)));
+        Integer workspaceItemId = null;
+        try {
+            ObjectMapper mapper = new ObjectMapper();
+            MvcResult mvcResult = getClient(adminToken).perform(
+                    post("/api/submission/workspaceitems?owningCollection=" + colPublications.getID().toString())
+                            .param("embed", "item")
+                            .contentType(parseMediaType(TEXT_URI_LIST_VALUE))
+                            .content("http://localhost/api/integration/externalsources/"
+                                    + MockSuggestionExternalDataSource.NAME + "/entryValues/" + suggestionId))
+                    .andExpect(status().isCreated()).andReturn();
+            String content = mvcResult.getResponse().getContentAsString();
+            Map<String,Object> map = mapper.readValue(content, Map.class);
+            workspaceItemId = (Integer) map.get("id");
+            String itemUuidString = String.valueOf(((Map) ((Map) map.get("_embedded")).get("item")).get("uuid"));
+
+            getClient(adminToken).perform(get("/api/submission/workspaceitems/" + workspaceItemId)
+                                            .param("embed", "item"))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$", Matchers.allOf(
+                                hasJsonPath("$.id", is(workspaceItemId)),
+                                hasJsonPath("$.type", is("workspaceitem")),
+                                hasJsonPath("$._embedded.item", Matchers.allOf(
+                                    hasJsonPath("$.id", is(itemUuidString)),
+                                    hasJsonPath("$.uuid", is(itemUuidString)),
+                                    hasJsonPath("$.type", is("item")),
+                                    hasJsonPath("$.metadata", Matchers.allOf(
+                                        MetadataMatcher.matchMetadata("dc.title", "Title Suggestion 1")
+                                    )))))
+                            ));
+
+            getClient(adminToken).perform(get("/api/integration/suggestions/" + suggestionId))
+                    .andExpect(status().isNotFound());
+            // 1 suggestion is still pending
+            getClient(adminToken)
+                .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                        .param("target", itemFirst.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestions", Matchers.contains(
+                        matchSuggestion("reciter", itemFirst, "Suggestion reciter 2", "2"))))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        } finally {
+            if (workspaceItemId != null) {
+                WorkspaceItemBuilder.deleteWorkspaceItem(workspaceItemId);
+            }
+        }
+    }
+
+    @Test
+    public void rejectSuggestionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Collection colPublications = CollectionBuilder.createCollection(context, parentCommunity)
+                .withName("Publications").build();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 2).build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        String suggestionId = "reciter:" + itemFirst.getID().toString() + ":1";
+        // reject the suggestion
+        getClient(adminToken).perform(delete("/api/integration/suggestions/" + suggestionId))
+                .andExpect(status().isNoContent());
+        getClient(adminToken).perform(get("/api/integration/suggestions/" + suggestionId))
+                .andExpect(status().isNotFound());
+        // 1 suggestion is still pending
+        getClient(adminToken)
+            .perform(get("/api/integration/suggestions/search/findByTargetAndSource").param("source", "reciter")
+                    .param("target", itemFirst.getID().toString()))
+            .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+            .andExpect(jsonPath("$._embedded.suggestions", Matchers.contains(
+                    matchSuggestion("reciter", itemFirst, "Suggestion reciter 2", "2"))))
+            .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+    }
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionSourceRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionSourceRestRepositoryIT.java
new file mode 100644
index 0000000000..30a1779fbd
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionSourceRestRepositoryIT.java
@@ -0,0 +1,168 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.matcher.SuggestionSourceMatcher.matchSuggestionSource;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.app.suggestion.SuggestionTarget;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.SuggestionTargetBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration Tests against the /api/integration/suggestionsources endpoint
+ */
+public class SuggestionSourceRestRepositoryIT extends AbstractControllerIntegrationTest {
+    private Collection colPeople;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        // We turn off the authorization system in order to create the structure as
+        // defined below
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        colPeople = CollectionBuilder.createCollection(context, parentCommunity).withName("People")
+                .withEntityType("Person").build();
+        context.restoreAuthSystemState();
+    }
+
+    /**
+     * Build a list of suggestion target, Bollini, Andrea has suggestion from both
+     * sources, Digilio, Giuseppe only from reciter Test 0, 3, 6 from both sources,
+     * Test 1, 2, 4, 5 only from ReCiter and finally Lombardi, Corrado only from
+     * scopus
+     */
+    private void buildSuggestionTargetsList() {
+        // We turn off the authorization system in order to create the structure as
+        // defined below
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        for (int idx = 0; idx < 8; idx++) {
+            Item item = ItemBuilder.createItem(context, colPeople).withTitle("Test " + idx).build();
+            SuggestionTargetBuilder.createTarget(context, item).withSuggestionCount("reciter", idx + 3).build();
+            if (idx % 3 == 0) {
+                SuggestionTargetBuilder.createTarget(context, item).withSuggestionCount("scopus", idx + 7).build();
+            }
+        }
+        Item itemLast = ItemBuilder.createItem(context, colPeople).withTitle("Lombardi, Corrado").build();
+        SuggestionTarget targetLast = SuggestionTargetBuilder.createTarget(context, itemLast)
+                .withSuggestionCount("scopus", 3).build();
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        buildSuggestionTargetsList();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestionsources")).andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestionsources",
+                        Matchers.contains(matchSuggestionSource("reciter", 10), matchSuggestionSource("scopus", 5))))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(2)));
+    }
+
+    @Test
+    public void findAllPaginationTest() throws Exception {
+        buildSuggestionTargetsList();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestionsources").param("size", "1"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestionsources",
+                        Matchers.contains(matchSuggestionSource("reciter", 10))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString("/api/integration/suggestionsources")))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(Matchers.containsString("/api/integration/suggestionsources?"),
+                                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(Matchers.containsString("/api/integration/suggestionsources?"),
+                                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(Matchers.containsString("/api/integration/suggestionsources?"),
+                                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href").doesNotExist()).andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.totalElements", is(2)));
+        getClient(adminToken).perform(get("/api/integration/suggestionsources").param("size", "1").param("page", "1"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestionsources",
+                        Matchers.contains(matchSuggestionSource("scopus", 5))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString("/api/integration/suggestionsources")))
+                .andExpect(jsonPath("$._links.next.href").doesNotExist())
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(Matchers.containsString("/api/integration/suggestionsources?"),
+                                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(Matchers.containsString("/api/integration/suggestionsources?"),
+                                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(Matchers.containsString("/api/integration/suggestionsources?"),
+                                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1))).andExpect(jsonPath("$.page.totalElements", is(2)));
+    }
+
+    @Test
+    public void findAllNotAdminTest() throws Exception {
+        buildSuggestionTargetsList();
+        // anonymous cannot access the suggestions source endpoint
+        getClient().perform(get("/api/integration/suggestionsources")).andExpect(status().isUnauthorized());
+        // nor normal user
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson).perform(get("/api/integration/suggestionsources")).andExpect(status().isForbidden());
+
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        buildSuggestionTargetsList();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestionsources/reciter")).andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestionSource("reciter", 10))).andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestionsources/reciter")));
+        getClient(adminToken).perform(get("/api/integration/suggestionsources/scopus")).andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestionSource("scopus", 5))).andExpect(
+                        jsonPath("$._links.self.href", Matchers.endsWith("/api/integration/suggestionsources/scopus")));
+
+    }
+
+    @Test
+    public void findOneNotAdminTest() throws Exception {
+        buildSuggestionTargetsList();
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken).perform(get("/api/integration/suggestionsources/reciter"))
+                .andExpect(status().isForbidden());
+        getClient(epersonToken).perform(get("/api/integration/suggestionsources/not-exist"))
+                .andExpect(status().isForbidden());
+        getClient().perform(get("/api/integration/suggestionsources/reciter")).andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestionsources/not-exist")).andExpect(status().isUnauthorized());
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionTargetRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionTargetRestRepositoryIT.java
new file mode 100644
index 0000000000..21108010f5
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SuggestionTargetRestRepositoryIT.java
@@ -0,0 +1,597 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest;
+
+import static org.dspace.app.rest.matcher.SuggestionTargetMatcher.matchSuggestionTarget;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import java.util.UUID;
+
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.app.suggestion.SuggestionTarget;
+import org.dspace.builder.CollectionBuilder;
+import org.dspace.builder.CommunityBuilder;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.SuggestionTargetBuilder;
+import org.dspace.content.Collection;
+import org.dspace.content.Item;
+import org.dspace.eperson.EPerson;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration Tests against the /api/integration/suggestiontargets endpoint
+ */
+public class SuggestionTargetRestRepositoryIT extends AbstractControllerIntegrationTest {
+    private Collection colPeople;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        // We turn off the authorization system in order to create the structure as
+        // defined below
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context).withName("Parent Community").build();
+        colPeople = CollectionBuilder.createCollection(context, parentCommunity).withName("People")
+                .withEntityType("Person").build();
+        context.restoreAuthSystemState();
+    }
+
+    /**
+     * Build a list of suggestion target, Bollini, Andrea has suggestion from both
+     * sources, Digilio, Giuseppe only from reciter Test 0, 3, 6 from both sources,
+     * Test 1, 2, 4, 5 only from ReCiter and finally Lombardi, Corrado only from
+     * scopus
+     */
+    private void buildSuggestionTargetsList() {
+        // We turn off the authorization system in order to create the structure as
+        // defined below
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetSecond = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        for (int idx = 0; idx < 8; idx++) {
+            Item item = ItemBuilder.createItem(context, colPeople).withTitle("Test " + idx).build();
+            SuggestionTargetBuilder.createTarget(context, item).withSuggestionCount("reciter", idx + 3).build();
+            if (idx % 3 == 0) {
+                SuggestionTargetBuilder.createTarget(context, item).withSuggestionCount("scopus", idx + 7).build();
+            }
+        }
+        Item itemLast = ItemBuilder.createItem(context, colPeople).withTitle("Lombardi, Corrado").build();
+        SuggestionTarget targetLast = SuggestionTargetBuilder.createTarget(context, itemLast)
+                .withSuggestionCount("scopus", 3).build();
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void findAllTest() throws Exception {
+        buildSuggestionTargetsList();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets"))
+                .andExpect(status().isMethodNotAllowed());
+        String token = getAuthToken(eperson.getEmail(), password);
+        getClient(token).perform(get("/api/integration/suggestiontargets")).andExpect(status().isMethodNotAllowed());
+        getClient().perform(get("/api/integration/suggestiontargets")).andExpect(status().isMethodNotAllowed());
+    }
+
+    @Test
+    public void findBySourceTest() throws Exception {
+        buildSuggestionTargetsList();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "reciter"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets", Matchers.contains(
+                        matchSuggestionTarget("Bollini, Andrea", "reciter", 31),
+                        matchSuggestionTarget("Digilio, Giuseppe", "reciter", 11),
+                        matchSuggestionTarget("Test 7", "reciter", 10), matchSuggestionTarget("Test 6", "reciter", 9),
+                        matchSuggestionTarget("Test 5", "reciter", 8), matchSuggestionTarget("Test 4", "reciter", 7),
+                        matchSuggestionTarget("Test 3", "reciter", 6), matchSuggestionTarget("Test 2", "reciter", 5),
+                        matchSuggestionTarget("Test 1", "reciter", 4), matchSuggestionTarget("Test 0", "reciter", 3)
+                        )))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString(
+                                "/api/integration/suggestiontargets/search/findBySource?source=reciter")))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(10)));
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "scopus"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.containsInAnyOrder(
+                                matchSuggestionTarget("Test 6", "scopus", 13),
+                                matchSuggestionTarget("Test 3", "scopus", 10),
+                                matchSuggestionTarget("Test 0", "scopus", 7),
+                                matchSuggestionTarget("Bollini, Andrea", "scopus", 3),
+                                matchSuggestionTarget("Lombardi, Corrado", "scopus", 3))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString(
+                                "/api/integration/suggestiontargets/search/findBySource?source=scopus")))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(5)));
+    }
+
+    @Test
+    public void findBySourcePaginationTest() throws Exception {
+        buildSuggestionTargetsList();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource")
+                        .param("source", "reciter").param("size", "1"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Bollini, Andrea", "reciter", 31))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=1"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=9"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href").doesNotExist()).andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.totalElements", is(10)));
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "reciter")
+                        .param("size", "1").param("page", "1"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Digilio, Giuseppe", "reciter", 11))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=1"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=2"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=9"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1))).andExpect(jsonPath("$.page.totalElements", is(10)));
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "reciter")
+                        .param("size", "1").param("page", "9"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Test 0", "reciter", 3))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=9"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href").doesNotExist())
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=9"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=reciter"), Matchers.containsString("page=8"),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$.page.size", is(1))).andExpect(jsonPath("$.page.totalElements", is(10)));
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "scopus")
+                        .param("size", "3").param("page", "0"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(
+                                matchSuggestionTarget("Test 6", "scopus", 13),
+                                matchSuggestionTarget("Test 3", "scopus", 10),
+                                matchSuggestionTarget("Test 0", "scopus", 7))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=1"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=1"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.prev.href").doesNotExist()).andExpect(jsonPath("$.page.size", is(3)))
+                .andExpect(jsonPath("$.page.totalElements", is(5)));
+
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "scopus")
+                        .param("size", "3").param("page", "1"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets", Matchers.iterableWithSize(2)))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.containsInAnyOrder(matchSuggestionTarget("Bollini, Andrea", "scopus", 3),
+                                matchSuggestionTarget("Lombardi, Corrado", "scopus", 3))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=1"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.next.href").doesNotExist())
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=1"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findBySource?"),
+                                Matchers.containsString("source=scopus"), Matchers.containsString("page=0"),
+                                Matchers.containsString("size=3"))))
+                .andExpect(jsonPath("$.page.size", is(3))).andExpect(jsonPath("$.page.totalElements", is(5)));
+    }
+
+    @Test
+    public void findBySourceUnAuthenticatedTest() throws Exception {
+        buildSuggestionTargetsList();
+        // anonymous cannot access the suggestions endpoint
+        getClient().perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "reciter"))
+                .andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "not-exist"))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findBySourceForbiddenTest() throws Exception {
+        buildSuggestionTargetsList();
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "reciter"))
+                .andExpect(status().isForbidden());
+        getClient(tokenEperson)
+                .perform(get("/api/integration/suggestiontargets/search/findBySource").param("source", "not-exist"))
+                .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findBySourceBadRequestTest() throws Exception {
+        String tokenEperson = getAuthToken(admin.getEmail(), password);
+        getClient(tokenEperson).perform(get("/api/integration/suggestiontargets/search/findBySource"))
+                .andExpect(status().isBadRequest());
+    }
+
+    @Test
+    public void findOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        SuggestionTarget target = SuggestionTargetBuilder.createTarget(context, colPeople, "Bollini, Andrea")
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetEPerson = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+        String uuidStr = target.getID().toString();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets/" + uuidStr)).andExpect(status().isOk())
+                .andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestionTarget("Bollini, Andrea", "scopus", 3))).andExpect(jsonPath(
+                        "$._links.self.href", Matchers.endsWith("/api/integration/suggestiontargets/" + uuidStr)));
+        // build a person profile linked to our eperson
+        String uuidStrEpersonProfile = targetEPerson.getID().toString();
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson).perform(get("/api/integration/suggestiontargets/" + uuidStrEpersonProfile))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestionTarget("Digilio, Giuseppe", "reciter", 11)))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestiontargets/" + uuidStrEpersonProfile)));
+    }
+
+    @Test
+    public void findOneFullProjectionTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        SuggestionTarget target = SuggestionTargetBuilder.createTarget(context, colPeople, "Bollini, Andrea")
+                .withSuggestionCount("scopus", 3).build();
+        SuggestionTarget targetEPerson = SuggestionTargetBuilder
+                .createTarget(context, colPeople, "Digilio, Giuseppe", eperson).withSuggestionCount("reciter", 11)
+                .build();
+        context.restoreAuthSystemState();
+        String uuidStrTarget = target.getID().toString();
+        String uuidStrProfile = target.getTarget().getID().toString();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/" + uuidStrTarget).param("projection", "full"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestionTarget("Bollini, Andrea", "scopus", 3)))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestiontargets/" + uuidStrTarget)))
+                .andExpect(jsonPath("$._embedded.target.id", Matchers.is(uuidStrProfile)));
+        String uuidStrEpersonTarget = targetEPerson.getID().toString();
+        String uuidStrEpersonProfile = targetEPerson.getTarget().getID().toString();
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken)
+                .perform(get("/api/integration/suggestiontargets/" + uuidStrEpersonTarget).param("projection", "full"))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$", matchSuggestionTarget("Digilio, Giuseppe", "reciter", 11)))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.endsWith("/api/integration/suggestiontargets/" + uuidStrEpersonTarget)))
+                .andExpect(jsonPath("$._embedded.target.id", Matchers.is(uuidStrEpersonProfile)));
+    }
+
+    @Test
+    public void findOneUnAuthenticatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        SuggestionTarget target = SuggestionTargetBuilder.createTarget(context, colPeople, "Bollini, Andrea")
+                .withSuggestionCount("reciter", 31).build();
+        context.restoreAuthSystemState();
+        String uuidStr = target.getID().toString();
+        getClient().perform(get("/api/integration/suggestiontargets/" + uuidStr)).andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findOneForbiddenTest() throws Exception {
+        // build a generic person profile
+        context.turnOffAuthorisationSystem();
+        SuggestionTarget target = SuggestionTargetBuilder.createTarget(context, colPeople, "Bollini, Andrea")
+                .withSuggestionCount("reciter", 31).build();
+        context.restoreAuthSystemState();
+        String uuidStr = target.getID().toString();
+        String tokenEperson = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenEperson).perform(get("/api/integration/suggestiontargets/" + uuidStr))
+                .andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findOneTestWrongID() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets/not-an-uuid"))
+                .andExpect(status().isNotFound());
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets/" + UUID.randomUUID()))
+                .andExpect(status().isNotFound());
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets/scopus:" + UUID.randomUUID()))
+                .andExpect(status().isNotFound());
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets/invalid:" + UUID.randomUUID()))
+                .andExpect(status().isNotFound());
+
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken).perform(get("/api/integration/suggestiontargets/not-an-uuid"))
+                .andExpect(status().isForbidden());
+        getClient(epersonToken).perform(get("/api/integration/suggestiontargets/" + UUID.randomUUID()))
+                .andExpect(status().isForbidden());
+        getClient(epersonToken).perform(get("/api/integration/suggestiontargets/scopus:" + UUID.randomUUID()))
+                .andExpect(status().isForbidden());
+        getClient(epersonToken).perform(get("/api/integration/suggestiontargets/invalid:" + UUID.randomUUID()))
+                .andExpect(status().isForbidden());
+
+        getClient().perform(get("/api/integration/suggestiontargets/not-an-uuid")).andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestiontargets/" + UUID.randomUUID()))
+                .andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestiontargets/scopus:" + UUID.randomUUID()))
+                .andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestiontargets/invalid:" + UUID.randomUUID()))
+                .andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findByTargetTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        Item itemLast = ItemBuilder.createItem(context, colPeople).withTitle("Lombardi, Corrado")
+                .withDSpaceObjectOwner(eperson.getFullName(), eperson.getID().toString()).build();
+        SuggestionTarget targetLast = SuggestionTargetBuilder.createTarget(context, itemLast)
+                .withSuggestionCount("scopus", 2).build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                        itemFirst.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Bollini, Andrea", "reciter", 31),
+                                matchSuggestionTarget("Bollini, Andrea", "scopus", 3))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?target="
+                                + itemFirst.getID().toString())))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(2)));
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                        itemLast.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Lombardi, Corrado", "scopus", 2))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?target="
+                                + itemLast.getID().toString())))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+        String epersonToken = getAuthToken(eperson.getEmail(), password);
+        getClient(epersonToken)
+                .perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                        itemLast.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Lombardi, Corrado", "scopus", 2))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?target="
+                                + itemLast.getID().toString())))
+                .andExpect(jsonPath("$.page.size", is(20))).andExpect(jsonPath("$.page.totalElements", is(1)));
+    }
+
+    @Test
+    public void findByTargetPaginationTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        context.restoreAuthSystemState();
+
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findByTarget").param("size", "1")
+                        .param("target", itemFirst.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Bollini, Andrea", "reciter", 31))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.prev.href").doesNotExist()).andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.size", is(1))).andExpect(jsonPath("$.page.totalElements", is(2)));
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findByTarget").param("size", "1")
+                        .param("page", "1").param("target", itemFirst.getID().toString()))
+                .andExpect(status().isOk()).andExpect(content().contentType(contentType))
+                .andExpect(jsonPath("$._embedded.suggestiontargets",
+                        Matchers.contains(matchSuggestionTarget("Bollini, Andrea", "scopus", 3))))
+                .andExpect(jsonPath("$._links.self.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("size=1"), Matchers.containsString("page=1"))))
+                .andExpect(jsonPath("$._links.prev.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.last.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("page=1"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.first.href",
+                        Matchers.allOf(
+                                Matchers.containsString("/api/integration/suggestiontargets/search/findByTarget?"),
+                                Matchers.containsString("target=" + itemFirst.getID().toString()),
+                                Matchers.containsString("page=0"), Matchers.containsString("size=1"))))
+                .andExpect(jsonPath("$._links.next.href").doesNotExist()).andExpect(jsonPath("$.page.size", is(1)))
+                .andExpect(jsonPath("$.page.size", is(1))).andExpect(jsonPath("$.page.totalElements", is(2)));
+    }
+
+    @Test
+    public void findByTargetUnAuthenticatedTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        Item itemLast = ItemBuilder.createItem(context, colPeople).withTitle("Lombardi, Corrado")
+                .withDSpaceObjectOwner(eperson.getFullName(), eperson.getID().toString()).build();
+        SuggestionTarget targetLast = SuggestionTargetBuilder.createTarget(context, itemLast)
+                .withSuggestionCount("scopus", 2).build();
+        context.restoreAuthSystemState();
+
+        // anonymous cannot access the suggestions endpoint
+        getClient().perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                itemFirst.getID().toString())).andExpect(status().isUnauthorized());
+        getClient().perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                itemLast.getID().toString())).andExpect(status().isUnauthorized());
+    }
+
+    @Test
+    public void findByTargetForbiddenTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        Item itemFirst = ItemBuilder.createItem(context, colPeople).withTitle("Bollini, Andrea").build();
+        SuggestionTarget targetFirstReciter = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("reciter", 31).build();
+        SuggestionTarget targetFirstScopus = SuggestionTargetBuilder.createTarget(context, itemFirst)
+                .withSuggestionCount("scopus", 3).build();
+        Item itemLast = ItemBuilder.createItem(context, colPeople).withTitle("Lombardi, Corrado")
+                .withDSpaceObjectOwner(eperson.getFullName(), eperson.getID().toString()).build();
+        SuggestionTarget targetLast = SuggestionTargetBuilder.createTarget(context, itemLast)
+                .withSuggestionCount("scopus", 2).build();
+        EPerson anotherEPerson = EPersonBuilder.createEPerson(context).withEmail("another@example.com")
+                .withPassword(password).withNameInMetadata("Test", "Test").build();
+        context.restoreAuthSystemState();
+
+        String tokenAnother = getAuthToken(anotherEPerson.getEmail(), password);
+        getClient(tokenAnother).perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                itemFirst.getID().toString())).andExpect(status().isForbidden());
+        getClient(tokenAnother).perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target",
+                itemLast.getID().toString())).andExpect(status().isForbidden());
+    }
+
+    @Test
+    public void findByTargetBadRequestTest() throws Exception {
+        String adminToken = getAuthToken(admin.getEmail(), password);
+        getClient(adminToken)
+                .perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target", "not-exist"))
+                .andExpect(status().isBadRequest());
+        getClient(adminToken).perform(get("/api/integration/suggestiontargets/search/findByTarget"))
+                .andExpect(status().isBadRequest());
+        getClient().perform(get("/api/integration/suggestiontargets/search/findByTarget").param("target", "not-exist"))
+                .andExpect(status().isBadRequest());
+    }
+
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SupervisionOrderRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SupervisionOrderRestRepositoryIT.java
index 27b436b6bc..cd8f834413 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/SupervisionOrderRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/SupervisionOrderRestRepositoryIT.java
@@ -25,8 +25,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.dspace.app.rest.matcher.WorkflowItemMatcher;
 import org.dspace.app.rest.matcher.WorkspaceItemMatcher;
 import org.dspace.app.rest.model.patch.ReplaceOperation;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
index a9b5c6a582..5185bc732c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/TaskRestRepositoriesIT.java
@@ -290,7 +290,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
                 .withWorkflowGroup(1, reviewer1, reviewer2).build();
 
-        // reviewer2 and admin are only in the wf of one colletion
+        // reviewer2 and admin are only in the wf of one collection
         Collection col2 = CollectionBuilder.createCollection(context, child1).withName("Collection 2")
                 .withWorkflowGroup(1, reviewer1, admin).build();
 
@@ -434,7 +434,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         Collection col1 = CollectionBuilder.createCollection(context, parentCommunity).withName("Collection 1")
                 .withWorkflowGroup(1, reviewer1, reviewer2).build();
 
-        // reviewer2 and admin are only in the wf of one colletion
+        // reviewer2 and admin are only in the wf of one collection
         Collection col2 = CollectionBuilder.createCollection(context, child1).withName("Collection 2")
                 .withWorkflowGroup(1, reviewer1, admin).build();
 
@@ -471,7 +471,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String authReviewer1 = getAuthToken(reviewer1.getEmail(), password);
-        // reviewer1 tries to get the pooltask of reviewer2 and viceversa
+        // reviewer1 tries to get the pooltask of reviewer2 and vice-versa
         getClient(authReviewer1).perform(get("/api/workflow/pooltasks/search/findByUser")
                     .param("uuid", reviewer2.getID().toString()))
                 .andExpect(status().isForbidden());
@@ -2320,7 +2320,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         // try non valid option (submit_edit_metadata), default wf step 2 (edit step)
         getClient(reviewer2Token).perform(post("/api/workflow/claimedtasks/" + idRef.get())
             .param("submit_non_valid_option", "true")
-            .param("reason", "I need to test an unvalid option")
+            .param("reason", "I need to test an invalid option")
             .contentType(MediaType.APPLICATION_FORM_URLENCODED))
             .andExpect(status().isUnprocessableEntity());
 
@@ -2738,7 +2738,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
 
         getClient(authToken).perform(patch("/api/workflow/workflowitems/" + witem.getID())
             .content(patchBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isUnprocessableEntity());
     }
 
@@ -2892,7 +2892,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
 
         getClient(authToken).perform(patch("/api/workflow/workflowitems/" + witem.getID())
             .content(patchBody)
-            .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+            .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
             .andExpect(status().isUnprocessableEntity());
     }
 
@@ -3854,7 +3854,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         String reviewer1Token = getAuthToken(reviewer1.getEmail(), password);
         String reviewer2Token = getAuthToken(reviewer2.getEmail(), password);
 
-        getClient(reviewer1Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer1Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                 .param("uuid", claimedTask1.getWorkflowItem().getItem().getID().toString()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.id", is(claimedTask1.getID())))
@@ -3864,7 +3864,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
                            Matchers.is(WorkflowItemMatcher.matchItemWithTitleAndDateIssuedAndSubject(
                                    claimedTask1.getWorkflowItem(), "Workflow Item 1", "2017-10-17", "ExtraEntry"))));
 
-        getClient(reviewer2Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer2Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                 .param("uuid", claimedTask2.getWorkflowItem().getItem().getID().toString()))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.id", is(claimedTask2.getID())))
@@ -3929,27 +3929,27 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         String reviewer1Token = getAuthToken(reviewer1.getEmail(), password);
         String reviewer2Token = getAuthToken(reviewer2.getEmail(), password);
 
-        getClient(reviewer2Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer2Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", claimedTask1.getWorkflowItem().getItem().getID().toString()))
                                  .andExpect(status().isNoContent());
 
-        getClient(reviewer1Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer1Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", claimedTask2.getWorkflowItem().getItem().getID().toString()))
                                  .andExpect(status().isNoContent());
 
-        getClient(adminToken).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(adminToken).perform(get("/api/workflow/claimedtasks/search/findByItem")
                              .param("uuid", claimedTask1.getWorkflowItem().getItem().getID().toString()))
                              .andExpect(status().isNoContent());
 
-        getClient(adminToken).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(adminToken).perform(get("/api/workflow/claimedtasks/search/findByItem")
                              .param("uuid", claimedTask2.getWorkflowItem().getItem().getID().toString()))
                              .andExpect(status().isNoContent());
 
-        getClient(submitterToken).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(submitterToken).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", claimedTask1.getWorkflowItem().getItem().getID().toString()))
                                  .andExpect(status().isNoContent());
 
-        getClient(submitterToken).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(submitterToken).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", claimedTask2.getWorkflowItem().getItem().getID().toString()))
                                  .andExpect(status().isNoContent());
 
@@ -3987,7 +3987,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
 
         context.restoreAuthSystemState();
 
-        getClient().perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient().perform(get("/api/workflow/claimedtasks/search/findByItem")
                    .param("uuid", claimedTask.getWorkflowItem().getItem().getID().toString()))
                    .andExpect(status().isUnauthorized());
     }
@@ -4025,7 +4025,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String reviewer1Token = getAuthToken(reviewer1.getEmail(), password);
-        getClient(reviewer1Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer1Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", UUID.randomUUID().toString()))
                                  .andExpect(status().isUnprocessableEntity());
     }
@@ -4063,12 +4063,12 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
         context.restoreAuthSystemState();
 
         String reviewer1Token = getAuthToken(reviewer1.getEmail(), password);
-        getClient(reviewer1Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer1Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", "wrongID"))
                                  .andExpect(status().isBadRequest());
 
         // the required param is no provided
-        getClient(reviewer1Token).perform(get("/api/workflow/claimedtask/search/findByItem"))
+        getClient(reviewer1Token).perform(get("/api/workflow/claimedtasks/search/findByItem"))
                                  .andExpect(status().isBadRequest());
     }
 
@@ -4100,7 +4100,7 @@ public class TaskRestRepositoriesIT extends AbstractControllerIntegrationTest {
 
         String reviewer1Token = getAuthToken(reviewer1.getEmail(), password);
 
-        getClient(reviewer1Token).perform(get("/api/workflow/claimedtask/search/findByItem")
+        getClient(reviewer1Token).perform(get("/api/workflow/claimedtasks/search/findByItem")
                                  .param("uuid", publicItem.getID().toString()))
                                  .andExpect(status().isNoContent());
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java
index ed3e811db2..daec24d29e 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VersionRestRepositoryIT.java
@@ -931,7 +931,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", Matchers.allOf(
                                      hasJsonPath("$.version", is(v2.getVersionNumber())),
@@ -979,7 +979,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", Matchers.allOf(
                                      hasJsonPath("$.version", is(v2.getVersionNumber())),
@@ -1027,7 +1027,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$", Matchers.allOf(
                                         hasJsonPath("$.version", is(v2.getVersionNumber())),
@@ -1054,7 +1054,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + Integer.MAX_VALUE)
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isNotFound());
     }
 
@@ -1089,7 +1089,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isBadRequest());
     }
 
@@ -1124,7 +1124,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isUnprocessableEntity());
     }
 
@@ -1159,7 +1159,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String adminToken = getAuthToken(admin.getEmail(), password);
         getClient(adminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isUnprocessableEntity());
     }
 
@@ -1194,7 +1194,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         getClient().perform(patch("/api/versioning/versions/" + v2.getID())
                    .content(patchBody)
-                   .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                   .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                    .andExpect(status().isUnauthorized());
     }
 
@@ -1227,7 +1227,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         getClient().perform(patch("/api/versioning/versions/" + v2.getID())
                    .content(patchBody)
-                   .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                   .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                    .andExpect(status().isUnauthorized());
     }
 
@@ -1261,7 +1261,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String epersonToken = getAuthToken(eperson.getEmail(), password);
         getClient(epersonToken).perform(patch("/api/versioning/versions/" + v2.getID())
                                .content(patchBody)
-                               .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                               .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                                .andExpect(status().isForbidden());
     }
 
@@ -1297,7 +1297,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
         String colAdminToken = getAuthToken(eperson.getEmail(), password);
         getClient(colAdminToken).perform(patch("/api/versioning/versions/" + v2.getID())
                                 .content(patchBody)
-                                .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                                 .andExpect(status().isOk())
                                 .andExpect(jsonPath("$", Matchers.allOf(
                                         hasJsonPath("$.version", is(v2.getVersionNumber())),
@@ -1359,7 +1359,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         getClient(adminCommBToken).perform(patch("/api/versioning/versions/" + v2.getID())
                                   .content(patchBody)
-                                  .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                  .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                                   .andExpect(status().isForbidden());
 
         getClient(adminCommAToken).perform(get("/api/versioning/versions/" + v2.getID()))
@@ -1368,7 +1368,7 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         getClient(adminCommAToken).perform(patch("/api/versioning/versions/" + v2.getID())
                                   .content(patchBody)
-                                  .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                                  .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                                   .andExpect(status().isOk());
 
         getClient(adminCommAToken).perform(get("/api/versioning/versions/" + v2.getID()))
@@ -1412,17 +1412,17 @@ public class VersionRestRepositoryIT extends AbstractControllerIntegrationTest {
 
         getClient(adminToken).perform(patch("/api/versioning/versions/" + Integer.MAX_VALUE)
                              .content(patchBody)
-                             .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                              .andExpect(status().isForbidden());
 
         getClient(epersonToken).perform(patch("/api/versioning/versions/" + Integer.MAX_VALUE)
                                .content(patchBody)
-                               .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                               .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                                .andExpect(status().isForbidden());
 
         getClient().perform(patch("/api/versioning/versions/" + Integer.MAX_VALUE)
                    .content(patchBody)
-                   .contentType(javax.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
+                   .contentType(jakarta.ws.rs.core.MediaType.APPLICATION_JSON_PATCH_JSON))
                    .andExpect(status().isUnauthorized());
     }
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java
index c3063ca234..7651227244 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/VuFindImportMetadataSourceServiceIT.java
@@ -17,8 +17,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import javax.el.MethodNotFoundException;
 
+import jakarta.el.MethodNotFoundException;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.impl.client.CloseableHttpClient;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java
index f1d3f5303e..7ec6734d1b 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WOSImportMetadataSourceServiceIT.java
@@ -51,7 +51,7 @@ public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrat
         }
         CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
         CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
-        try (InputStream file = getClass().getResourceAsStream("wos-responce.xml")) {
+        try (InputStream file = getClass().getResourceAsStream("wos-response.xml")) {
             String wosXmlResp = IOUtils.toString(file, Charset.defaultCharset());
 
             liveImportClientImpl.setHttpClient(httpClient);
@@ -80,7 +80,7 @@ public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrat
         }
         CloseableHttpClient originalHttpClient = liveImportClientImpl.getHttpClient();
         CloseableHttpClient httpClient = Mockito.mock(CloseableHttpClient.class);
-        try (InputStream file = getClass().getResourceAsStream("wos-responce.xml")) {
+        try (InputStream file = getClass().getResourceAsStream("wos-response.xml")) {
             String wosXmlResp = IOUtils.toString(file, Charset.defaultCharset());
 
             liveImportClientImpl.setHttpClient(httpClient);
@@ -136,6 +136,7 @@ public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrat
         MetadatumDTO subject15 = createMetadatumDTO("dc", "subject", null, "Coding concepts");
         MetadatumDTO subject16 = createMetadatumDTO("dc", "subject", null, "Lesson design");
         MetadatumDTO subject17 = createMetadatumDTO("dc", "subject", null, "Social Sciences");
+        MetadatumDTO publisher = createMetadatumDTO("dc", "publisher", null, "SPRINGER");
         MetadatumDTO other = createMetadatumDTO("dc", "identifier", "other", "WOS:000805105200003");
         metadatums.add(edition);
         metadatums.add(date);
@@ -166,6 +167,7 @@ public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrat
         metadatums.add(subject15);
         metadatums.add(subject16);
         metadatums.add(subject17);
+        metadatums.add(publisher);
         metadatums.add(other);
         ImportRecord firstrRecord = new ImportRecord(metadatums);
 
@@ -205,6 +207,7 @@ public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrat
         MetadatumDTO subject26 = createMetadatumDTO("dc", "subject", null, "Social Sciences");
         MetadatumDTO subject27 = createMetadatumDTO("dc", "subject", null, "Science & Technology");
         MetadatumDTO subject28 = createMetadatumDTO("dc", "subject", null, "Life Sciences & Biomedicine");
+        MetadatumDTO publisher2 = createMetadatumDTO("dc", "publisher", null, "NATURE PORTFOLIO");
         MetadatumDTO other2 = createMetadatumDTO("dc", "identifier", "other", "WOS:000805100600001");
         MetadatumDTO rid = createMetadatumDTO("person", "identifier", "rid", "C-6334-2011");
         MetadatumDTO rid2 = createMetadatumDTO("person", "identifier", "rid", "B-1251-2008");
@@ -236,6 +239,7 @@ public class WOSImportMetadataSourceServiceIT extends AbstractLiveImportIntegrat
         metadatums2.add(subject26);
         metadatums2.add(subject27);
         metadatums2.add(subject28);
+        metadatums2.add(publisher2);
         metadatums2.add(other2);
         metadatums2.add(rid);
         metadatums2.add(rid2);
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowActionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowActionRestRepositoryIT.java
index ec963fd2f3..9fdc20a7d6 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowActionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowActionRestRepositoryIT.java
@@ -46,7 +46,7 @@ public class WorkflowActionRestRepositoryIT extends AbstractControllerIntegratio
     private GroupService groupService = EPersonServiceFactory.getInstance().getGroupService();
 
     private static final String WORKFLOW_ACTIONS_ENDPOINT
-        = "/api/" + WorkflowActionRest.CATEGORY + "/" + WorkflowActionRest.NAME_PLURAL;
+        = "/api/" + WorkflowActionRest.CATEGORY + "/" + WorkflowActionRest.PLURAL_NAME;
 
     @Test
     public void getAllWorkflowActions_NonImplementedEndpoint() throws Exception {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java
index a222839abf..ad994be57c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowDefinitionRestRepositoryIT.java
@@ -48,7 +48,7 @@ public class WorkflowDefinitionRestRepositoryIT extends AbstractControllerIntegr
             = XmlWorkflowServiceFactory.getInstance().getWorkflowFactory();
 
     private static final String WORKFLOW_DEFINITIONS_ENDPOINT
-        = "/api/" + WorkflowDefinitionRest.CATEGORY + "/" + WorkflowDefinitionRest.NAME_PLURAL;
+        = "/api/" + WorkflowDefinitionRest.CATEGORY + "/" + WorkflowDefinitionRest.PLURAL_NAME;
 
     @Test
     public void getAllWorkflowDefinitionsEndpoint() throws Exception {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java
index 72612fc5eb..6275360b3c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowItemRestRepositoryIT.java
@@ -28,8 +28,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.dspace.app.rest.matcher.CollectionMatcher;
 import org.dspace.app.rest.matcher.ItemMatcher;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowStepRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowStepRestRepositoryIT.java
index e06ba08f69..4012fd2d33 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowStepRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkflowStepRestRepositoryIT.java
@@ -31,7 +31,7 @@ public class WorkflowStepRestRepositoryIT extends AbstractControllerIntegrationT
     private XmlWorkflowFactory xmlWorkflowFactory = XmlWorkflowServiceFactory.getInstance().getWorkflowFactory();
 
     private static final String WORKFLOW_ACTIONS_ENDPOINT
-        = "/api/" + WorkflowStepRest.CATEGORY + "/" + WorkflowStepRest.NAME_PLURAL;
+        = "/api/" + WorkflowStepRest.CATEGORY + "/" + WorkflowStepRest.PLURAL_NAME;
 
     @Test
     public void getAllWorkflowSteps_NonImplementedEndpoint() throws Exception {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
index 0061b38e56..71e5c27754 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/WorkspaceItemRestRepositoryIT.java
@@ -46,12 +46,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jayway.jsonpath.matchers.JsonPathMatchers;
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.dspace.app.ldn.NotifyServiceEntity;
 import org.dspace.app.rest.matcher.CollectionMatcher;
 import org.dspace.app.rest.matcher.ItemMatcher;
 import org.dspace.app.rest.matcher.MetadataMatcher;
@@ -70,6 +71,8 @@ import org.dspace.builder.EPersonBuilder;
 import org.dspace.builder.EntityTypeBuilder;
 import org.dspace.builder.GroupBuilder;
 import org.dspace.builder.ItemBuilder;
+import org.dspace.builder.NotifyServiceBuilder;
+import org.dspace.builder.NotifyServiceInboundPatternBuilder;
 import org.dspace.builder.RelationshipBuilder;
 import org.dspace.builder.RelationshipTypeBuilder;
 import org.dspace.builder.ResourcePolicyBuilder;
@@ -5630,7 +5633,7 @@ public class WorkspaceItemRestRepositoryIT extends AbstractControllerIntegration
         // auth
         String authToken = getAuthToken(eperson.getEmail(), password);
 
-        // perpare patch body
+        // prepare patch body
         Map<String, String> value = new HashMap<>();
         value.put("name", "openaccess");
         List<Operation> ops = new ArrayList<>();
@@ -8027,7 +8030,7 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
                 .contentType(textUriContentType))
                 .andExpect(status().isCreated());
 
-        // Bistream access policies are as expected and there are no duplicates
+        // Bitstream access policies are as expected and there are no duplicates
         getClient(adminToken)
                 .perform(get("/api/authz/resourcepolicies/search/resource")
                 .param("uuid", bitstream.getID().toString()))
@@ -8627,6 +8630,1202 @@ ResourcePolicyBuilder.createResourcePolicy(context, null, adminGroup)
                 .content("/api/submission/workspaceitems/" + workspaceItem.getID())
                 .contentType(textUriContentType))
                 .andExpect(status().isCreated());
+    }
+
+
+    @Test
+    public void testSubmissionWithCOARNotifyServicesSection() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection collection = CollectionBuilder.createCollection(context, parentCommunity)
+                                                 .withName("Collection 1")
+                                                 .build();
+
+        // create three notify services
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        // append the three services to the workspace item with different patterns
+        WorkspaceItem workspaceItem = WorkspaceItemBuilder.createWorkspaceItem(context, collection)
+                  .withTitle("Workspace Item")
+                  .withIssueDate("2024-10-10")
+                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                  .withCOARNotifyService(notifyServiceTwo, "request-endorsement")
+                  .withCOARNotifyService(notifyServiceThree, "request-endorsement")
+                  .build();
+
+        context.restoreAuthSystemState();
+        String adminToken = getAuthToken(admin.getEmail(), password);
+
+        // check coarnotify section data
+        getClient(adminToken)
+            .perform(get("/api/submission/workspaceitems/" + workspaceItem.getID()))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.sections.coarnotify.request-endorsement", contains(
+                notifyServiceTwo.getID(), notifyServiceThree.getID())))
+            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                notifyServiceOne.getID())));
+    }
+
+    @Test
+    public void patchCOARNotifyServiceAddTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceOne)
+                                          .withPattern("request-review")
+                                          .withConstraint("itemFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceTwo)
+                                          .withPattern("request-review")
+                                          .withConstraint("itemFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceThree)
+                                          .withPattern("request-review")
+                                          .withConstraint("itemFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // try to add new service of review pattern to witem
+        List<Operation> addOpts = new ArrayList<Operation>();
+        addOpts.add(new AddOperation("/sections/coarnotify/request-review/-",
+            List.of(notifyServiceTwo.getID(), notifyServiceThree.getID())));
+
+        String patchBody = getPatchContent(addOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(3)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review",contains(
+                                notifyServiceOne.getID(),
+                                notifyServiceTwo.getID(),
+                                notifyServiceThree.getID()
+                            )));
 
     }
+
+    @Test
+    public void patchCOARNotifyServiceAddWithInCompatibleServicesTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(1)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceOne.getID()
+                            )));
+
+        // try to add new service of review pattern to witem
+        List<Operation> addOpts = new ArrayList<Operation>();
+        addOpts.add(new AddOperation("/sections/coarnotify/request-review/-",
+            List.of(notifyServiceTwo.getID(), notifyServiceThree.getID())));
+
+        String patchBody = getPatchContent(addOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void patchCOARNotifyServiceAddWithInvalidPatternTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // try to add new service of unknown pattern to witem
+        List<Operation> addOpts = new ArrayList<Operation>();
+        addOpts.add(new AddOperation("/sections/coarnotify/unknown/-", List.of(notifyServiceOne.getID())));
+
+        String patchBody = getPatchContent(addOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void patchCOARNotifyServiceAddWithInvalidServiceIdTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceOne.getID()
+                            )));
+
+        // try to add new service of review pattern to witem but service not exist
+        List<Operation> addOpts = new ArrayList<Operation>();
+        addOpts.add(new AddOperation("/sections/coarnotify/request-review/-", List.of("123456789")));
+
+        String patchBody = getPatchContent(addOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void patchCOARNotifyServiceReplaceTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceOne)
+                                          .withPattern("request-review")
+                                          .withConstraint("itemFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceTwo)
+                                          .withPattern("request-review")
+                                          .withConstraint("demo_filter")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceThree)
+                                          .withPattern("request-review")
+                                          .withConstraint("demo_filter")
+                                          .isAutomatic(false)
+                                          .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .withCOARNotifyService(notifyServiceTwo, "request-review")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(2)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceOne.getID(),
+                                notifyServiceTwo.getID())));
+
+        // try to replace the notifyServiceOne of witem with notifyServiceThree of review pattern
+        List<Operation> replaceOpts = new ArrayList<Operation>();
+        replaceOpts.add(new ReplaceOperation("/sections/coarnotify/request-review/0", notifyServiceThree.getID()));
+
+        String patchBody = getPatchContent(replaceOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(2)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceThree.getID(), notifyServiceTwo.getID()
+                            )));
+
+    }
+
+    @Test
+    public void patchCOARNotifyServiceReplaceWithInCompatibleServicesTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .withCOARNotifyService(notifyServiceTwo, "request-review")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(2)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceOne.getID(),
+                                notifyServiceTwo.getID())));
+
+        // try to replace the notifyServiceOne of witem with notifyServiceThree of review pattern
+        List<Operation> replaceOpts = new ArrayList<Operation>();
+        replaceOpts.add(new ReplaceOperation("/sections/coarnotify/request-review/0", notifyServiceThree.getID()));
+
+        String patchBody = getPatchContent(replaceOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isUnprocessableEntity());
+
+    }
+
+    @Test
+    public void patchCOARNotifyServiceRemoveTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .withCOARNotifyService(notifyServiceTwo, "request-review")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(2)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceOne.getID(), notifyServiceTwo.getID()
+                            )));
+
+        // try to remove the notifyServiceOne of witem
+        List<Operation> removeOpts = new ArrayList<Operation>();
+        removeOpts.add(new RemoveOperation("/sections/coarnotify/request-review/0"));
+
+        String patchBody = getPatchContent(removeOpts);
+
+        getClient(authToken).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                .content(patchBody)
+                                .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(1)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review",contains(
+                                notifyServiceTwo.getID())));
+
+    }
+
+    @Test
+    public void submissionCOARNotifyServicesSectionWithValidationErrorsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceTwo =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name two")
+                                .withLdnUrl("https://service2.ldn.org/inbox")
+                                .build();
+
+        NotifyServiceEntity notifyServiceThree =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name three")
+                                .withLdnUrl("https://service3.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withType("Journal Article")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-endorsement")
+                                                  .withCOARNotifyService(notifyServiceTwo, "request-review")
+                                                  .withCOARNotifyService(notifyServiceThree, "request-review")
+                                                  .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceOne)
+                                          .withPattern("request-endorsement")
+                                          .withConstraint("fakeFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceTwo)
+                                          .withPattern("request-review")
+                                          .withConstraint("type_filter")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceThree)
+                                          .withPattern("request-review")
+                                          .withConstraint("fakeFilterA")
+                                          .isAutomatic(false)
+                                          .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem also check the errors
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(2)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", contains(
+                                notifyServiceTwo.getID(),
+                                notifyServiceThree.getID())))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-endorsement", hasSize(1)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-endorsement", contains(
+                                notifyServiceOne.getID())))
+                            .andExpect(jsonPath("$.errors[?(@.message=='error.validation.coarnotify.invalidfilter')]",
+                                Matchers.contains(
+                                    hasJsonPath("$.paths", Matchers.containsInAnyOrder(
+                                        "/sections/coarnotify/request-review/1",
+                                        "/sections/coarnotify/request-endorsement/0")))));
+
+    }
+
+    @Test
+    public void submissionCOARNotifyServicesSectionWithoutValidationErrorsTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //** GIVEN **
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                                           .withName("Sub Community")
+                                           .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1).withName("Collection 1").build();
+
+
+        NotifyServiceEntity notifyServiceOne =
+            NotifyServiceBuilder.createNotifyServiceBuilder(context, "service name one")
+                                .withLdnUrl("https://service.ldn.org/inbox")
+                                .build();
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("Test WorkspaceItem")
+                                                  .withIssueDate("2017-10-17")
+                                                  .withType("Journal Article")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-review")
+                                                  .withCOARNotifyService(notifyServiceOne, "request-endorsement")
+                                                  .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceOne)
+                                          .withPattern("request-endorsement")
+                                          .withConstraint("type_filter")
+                                          .isAutomatic(false)
+                                          .build();
+
+        NotifyServiceInboundPatternBuilder.createNotifyServiceInboundPatternBuilder(context, notifyServiceOne)
+                                          .withPattern("request-review")
+                                          .withConstraint("type_filter")
+                                          .isAutomatic(false)
+                                          .build();
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        // check the coar notify services of witem also check the errors
+        getClient(authToken).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                            .andExpect(status().isOk())
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review", hasSize(1)))
+                            .andExpect(jsonPath("$.sections.coarnotify.request-review",
+                                contains(notifyServiceOne.getID())))
+                            .andExpect(jsonPath(
+                                "$.errors[?(@.message=='error.validation.coarnotify.invalidfilter')]")
+                                    .doesNotExist());
+    }
+
+    @Test
+    public void patchAddPrimaryTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                             .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                                    "$.sections.upload.files[0].uuid")));
+
+        List<Operation> addPrimaryOps = new ArrayList<Operation>();
+        addPrimaryOps.add(new AddOperation("/sections/upload/primary", idRef.get()));
+
+        String patchBody = getPatchContent(addPrimaryOps);
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(patchBody)
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idRef.get())));
+    }
+
+    @Test
+    public void patchAddPrimaryBitstreamWithOwnerTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        context.setCurrentUser(eperson);
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        String tokenSubmitter = getAuthToken(eperson.getEmail(), password);
+        getClient(tokenSubmitter).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                                 .andExpect(status().isOk())
+                                 .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                                 .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                                        "$.sections.upload.files[0].uuid")));
+
+        List<Operation> addPrimaryOps = new ArrayList<Operation>();
+        addPrimaryOps.add(new AddOperation("/sections/upload/primary", idRef.get()));
+
+        String patchBody = getPatchContent(addPrimaryOps);
+        getClient(tokenSubmitter).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                 .content(patchBody)
+                                 .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                                 .andExpect(status().isOk());
+
+        getClient(tokenSubmitter).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                                 .andExpect(status().isOk())
+                                 .andExpect(jsonPath("$.sections.upload.primary", is(idRef.get())));
+    }
+
+    @Test
+    public void patchAddPrimaryBitstreamWithNotOwnerTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        EPerson submitter = EPersonBuilder.createEPerson(context)
+                                          .withEmail("test-email@mail.com")
+                                          .withPassword(password)
+                                          .build();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        context.setCurrentUser(submitter);
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        String tokenSubmitter = getAuthToken(submitter.getEmail(), password);
+        getClient(tokenSubmitter).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                                 .andExpect(status().isOk())
+                                 .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                                 .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                                        "$.sections.upload.files[0].uuid")));
+
+        List<Operation> addPrimaryOps = new ArrayList<Operation>();
+        addPrimaryOps.add(new AddOperation("/sections/upload/primary", idRef.get()));
+
+        String tokenNotSubmitter = getAuthToken(eperson.getEmail(), password);
+
+        // non submitter cannot add primary bitstream
+        getClient(tokenNotSubmitter).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                                    .content(getPatchContent(addPrimaryOps))
+                                    .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                                    .andExpect(status().isForbidden());
+
+        // even anonymous users cannot add primary bitstream
+        getClient().perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                   .content(getPatchContent(addPrimaryOps))
+                   .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                   .andExpect(status().isUnauthorized());
+
+        getClient(tokenSubmitter).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                                 .andExpect(status().isOk())
+                                 .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+    }
+
+    @Test
+    public void patchAddPrimaryBitstreamUpdateAlredySettedOneTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+        InputStream pdf2 = getClass().getResourceAsStream("bibtex-test.bib");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withFulltext("bibtex-test.bib",
+                                                                "/local/path/bibtex-test.bib", pdf2)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idFirstPdf = new AtomicReference<String>();
+        AtomicReference<String> idSecondPdf = new AtomicReference<String>();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                             .andDo(result -> idFirstPdf.set(read(result.getResponse().getContentAsString(),
+                                    "$.sections.upload.files[0].uuid")))
+                             .andDo(result -> idSecondPdf.set(read(result.getResponse().getContentAsString(),
+                                     "$.sections.upload.files[1].uuid")));
+
+        List<Operation> addPrimaryOps = new ArrayList<Operation>();
+        addPrimaryOps.add(new AddOperation("/sections/upload/primary", idFirstPdf.get()));
+
+        String patchBody = getPatchContent(addPrimaryOps);
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(patchBody)
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idFirstPdf.get())));
+
+        List<Operation> addPrimaryOps2 = new ArrayList<Operation>();
+        addPrimaryOps2.add(new AddOperation("/sections/upload/primary", idSecondPdf.get()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(addPrimaryOps2))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idSecondPdf.get())));
+    }
+
+    @Test
+    public void patchAddPrimaryUUIDofNotExistingBitstreamTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+
+        List<Operation> addOperations = new ArrayList<Operation>();
+        addOperations.add(new AddOperation("/sections/upload/primary", UUID.randomUUID()));
+
+        String patchBody = getPatchContent(addOperations);
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(patchBody)
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isUnprocessableEntity());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+    }
+
+    @Test
+    public void patchAddPrimaryWrongUUIDTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+
+        List<Operation> addOperations = new ArrayList<Operation>();
+        addOperations.add(new AddOperation("/sections/upload/primary", "wrong-uuid"));
+
+        String patchBody = getPatchContent(addOperations);
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(patchBody)
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isUnprocessableEntity());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+    }
+
+    @Test
+    public void patchRemovePrimaryTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idRef = new AtomicReference<String>();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                             .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(),
+                                    "$.sections.upload.files[0].uuid")));
+
+        List<Operation> addOperations = new ArrayList<Operation>();
+        addOperations.add(new AddOperation("/sections/upload/primary", idRef.get()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(addOperations))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idRef.get())));
+
+        List<Operation> removeOps = new ArrayList<Operation>();
+        removeOps.add(new RemoveOperation("/sections/upload/primary"));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(removeOps))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+    }
+
+    @Test
+    public void patchReplacePrimaryTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+        InputStream pdf2 = getClass().getResourceAsStream("bibtex-test.bib");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withFulltext("bibtex-test.bib",
+                                                                "/local/path/bibtex-test.bib", pdf2)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idFirstPdf = new AtomicReference<String>();
+        AtomicReference<String> idSecondPdf = new AtomicReference<String>();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                             .andDo(result -> idFirstPdf.set(read(result.getResponse().getContentAsString(),
+                                    "$.sections.upload.files[0].uuid")))
+                             .andDo(result -> idSecondPdf.set(read(result.getResponse().getContentAsString(),
+                                     "$.sections.upload.files[1].uuid")));
+
+        List<Operation> addOperations = new ArrayList<Operation>();
+        addOperations.add(new AddOperation("/sections/upload/primary", idFirstPdf.get()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(addOperations))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idFirstPdf.get())));
+
+        List<Operation> replaceOperations = new ArrayList<Operation>();
+        replaceOperations.add(new ReplaceOperation("/sections/upload/primary", idSecondPdf.get()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(replaceOperations))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idSecondPdf.get())));
+    }
+
+    @Test
+    public void patchReplacePrimaryWhenPrimariIsUnsetTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+        InputStream pdf2 = getClass().getResourceAsStream("bibtex-test.bib");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .withSubject("testEntry")
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idPdf = new AtomicReference<String>();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                             .andDo(result -> idPdf.set(read(result.getResponse().getContentAsString(),
+                                    "$.sections.upload.files[0].uuid")));
+
+        List<Operation> replaceOperations = new ArrayList<Operation>();
+        replaceOperations.add(new ReplaceOperation("/sections/upload/primary", idPdf.get()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(replaceOperations))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isUnprocessableEntity());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()));
+    }
+
+    @Test
+    public void patchReplaceProvidingWrongPrimaryTest() throws Exception {
+        context.turnOffAuthorisationSystem();
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                                          .withName("Parent Community")
+                                          .build();
+
+        Collection col1 = CollectionBuilder.createCollection(context, parentCommunity)
+                                           .withName("Collection 1")
+                                           .build();
+
+        InputStream pdf = getClass().getResourceAsStream("simple-article.pdf");
+
+        WorkspaceItem witem = WorkspaceItemBuilder.createWorkspaceItem(context, col1)
+                                                  .withTitle("TITLE test")
+                                                  .withIssueDate("2023-10-18")
+                                                  .withFulltext("simple-article.pdf",
+                                                                "/local/path/simple-article.pdf", pdf)
+                                                  .build();
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<String> idFirstPdf = new AtomicReference<String>();
+
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", nullValue()))
+                             .andDo(result -> idFirstPdf.set(read(result.getResponse().getContentAsString(),
+                                    "$.sections.upload.files[0].uuid")));
+
+        List<Operation> addOperations = new ArrayList<Operation>();
+        addOperations.add(new AddOperation("/sections/upload/primary", idFirstPdf.get()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(addOperations))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isOk());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idFirstPdf.get())));
+
+        List<Operation> replaceOperations = new ArrayList<Operation>();
+        replaceOperations.add(new ReplaceOperation("/sections/upload/primary", UUID.randomUUID()));
+
+        getClient(tokenAdmin).perform(patch("/api/submission/workspaceitems/" + witem.getID())
+                             .content(getPatchContent(replaceOperations))
+                             .contentType(MediaType.APPLICATION_JSON_PATCH_JSON))
+                             .andExpect(status().isUnprocessableEntity());
+
+        getClient(tokenAdmin).perform(get("/api/submission/workspaceitems/" + witem.getID()))
+                             .andExpect(status().isOk())
+                             .andExpect(jsonPath("$.sections.upload.primary", is(idFirstPdf.get())));
+    }
+
+    @Test
+    public void createWorkspaceWithoutCclicense_CclicenseRequired() throws Exception {
+        context.turnOffAuthorisationSystem();
+
+        //1. A community-collection structure with one parent community with sub-community and one collection.
+        parentCommunity = CommunityBuilder.createCommunity(context)
+                .withName("Parent Community")
+                .build();
+        Community child1 = CommunityBuilder.createSubCommunity(context, parentCommunity)
+                .withName("Sub Community")
+                .build();
+        Collection col1 = CollectionBuilder.createCollection(context, child1)
+                .withName("Collection 1")
+                .withSubmitterGroup(eperson)
+                .build();
+
+        String authToken = getAuthToken(eperson.getEmail(), password);
+
+        //disable file upload mandatory
+        configurationService.setProperty("webui.submit.upload.required", false);
+        configurationService.setProperty("cc.license.required", true);
+
+        context.restoreAuthSystemState();
+
+        AtomicReference<Integer> idRef = new AtomicReference<>();
+        try {
+            // create an empty workspaceitem explicitly in the col1, check validation on creation
+            getClient(authToken).perform(post("/api/submission/workspaceitems")
+                            .param("owningCollection", col1.getID().toString())
+                            .contentType(org.springframework.http.MediaType.APPLICATION_JSON))
+                    .andExpect(status().isCreated())
+                    // cclicense is required
+                    .andExpect(jsonPath("$.errors[?(@.message=='error.validation.cclicense.required')]",
+                            contains(
+                                    hasJsonPath("$.paths", contains(
+                                            hasJsonPath("$", Matchers.is("/sections/cclicense"))
+                                    )))))
+                    .andDo(result -> idRef.set(read(result.getResponse().getContentAsString(), "$.id")));
+        } finally {
+            WorkspaceItemBuilder.deleteWorkspaceItem(idRef.get());
+        }
+    }
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CollectionAdminFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CollectionAdminFeatureIT.java
index 15539d2a9d..e2d6f5ee6e 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CollectionAdminFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CollectionAdminFeatureIT.java
@@ -103,7 +103,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify the general admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -116,7 +116,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -129,7 +129,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -142,7 +142,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify the collection admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -155,7 +155,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -175,8 +175,10 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
         String token = getAuthToken(eperson.getEmail(), password);
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isCollectionAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -197,7 +199,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -218,7 +220,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -239,7 +241,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -260,7 +262,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -284,8 +286,10 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
         String token = getAuthToken(eperson.getEmail(), password);
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isCollectionAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -310,7 +314,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -335,7 +339,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -360,7 +364,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a sub-subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
@@ -385,7 +389,7 @@ public class CollectionAdminFeatureIT extends AbstractControllerIntegrationTest
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCollectionAdmin')]")
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ComColAdminFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ComColAdminFeatureIT.java
index df386a0c79..e50553cc57 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ComColAdminFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ComColAdminFeatureIT.java
@@ -102,8 +102,10 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(admin.getEmail(), password);
 
         // Verify the general admin has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isComColAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -116,7 +118,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -129,7 +131,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -142,7 +144,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the collection admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -155,7 +157,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -175,8 +177,10 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(eperson.getEmail(), password);
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isComColAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -197,7 +201,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -218,7 +222,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -239,7 +243,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -260,7 +264,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -284,8 +288,10 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
         String token = getAuthToken(eperson.getEmail(), password);
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
+        // Filter by "feature" ID because Admins may have >20 features enabled & cause this endpoint to paginate.
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()
+            + "&feature=isComColAdmin"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -310,7 +316,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -335,7 +341,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -360,7 +366,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
@@ -385,7 +391,7 @@ public class ComColAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isComColAdmin')]")
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CommunityAdminFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CommunityAdminFeatureIT.java
index 7aabb447e9..6720cf1dcf 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CommunityAdminFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/CommunityAdminFeatureIT.java
@@ -103,7 +103,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the general admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -116,7 +116,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -129,7 +129,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -142,7 +142,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the collection admin doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -155,7 +155,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -176,7 +176,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -197,7 +197,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -218,7 +218,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -239,7 +239,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a collection admin group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -260,7 +260,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -285,7 +285,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -310,7 +310,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -335,7 +335,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -360,7 +360,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a collection admin group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
@@ -385,7 +385,7 @@ public class CommunityAdminFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='isCommunityAdmin')]")
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EPersonForgotPasswordFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EPersonForgotPasswordFeatureIT.java
new file mode 100644
index 0000000000..23f5aaabb6
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/EPersonForgotPasswordFeatureIT.java
@@ -0,0 +1,143 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.authorization;
+
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.is;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.authorization.impl.EPersonForgotPasswordFeature;
+import org.dspace.app.rest.converter.EPersonConverter;
+import org.dspace.app.rest.converter.SiteConverter;
+import org.dspace.app.rest.model.EPersonRest;
+import org.dspace.app.rest.model.SiteRest;
+import org.dspace.app.rest.projection.Projection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.app.rest.utils.Utils;
+import org.dspace.builder.EPersonBuilder;
+import org.dspace.content.Site;
+import org.dspace.content.service.SiteService;
+import org.dspace.eperson.EPerson;
+import org.dspace.services.ConfigurationService;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * @author Vincenzo Mecca (vins01-4science - vincenzo.mecca at 4science.com)
+ **/
+public class EPersonForgotPasswordFeatureIT extends AbstractControllerIntegrationTest {
+    @Autowired
+    private AuthorizationFeatureService authorizationFeatureService;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+    @Autowired
+    private SiteService siteService;
+
+    @Autowired
+    private SiteConverter siteConverter;
+
+
+    @Autowired
+    private EPersonConverter personConverter;
+
+    @Autowired
+    private Utils utils;
+
+    private AuthorizationFeature epersonForgotPasswordFeature;
+
+    public static final String[] SHIB_ONLY = {"org.dspace.authenticate.ShibAuthentication"};
+
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        epersonForgotPasswordFeature = authorizationFeatureService.find(EPersonForgotPasswordFeature.NAME);
+    }
+
+    @Test
+    public void userForgotPasswordSuccessTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        EPerson epersonPassLogin = EPersonBuilder.createEPerson(context)
+                                              .withNameInMetadata("Vincenzo", "Mecca")
+                                              .withCanLogin(true)
+                                              .withPassword("Strong-Password")
+                                              .withEmail("vincenzo.mecca@4science.it")
+                                              .build();
+        context.restoreAuthSystemState();
+
+        configurationService.setProperty("user.forgot-password", true);
+        EPersonRest personRest = personConverter.convert(epersonPassLogin, Projection.DEFAULT);
+        String personUri = utils.linkToSingleResource(personRest, "self").getHref();
+
+        getClient().perform(get("/api/authz/authorizations/search/object")
+                                .param("uri", personUri)
+                                .param("feature", epersonForgotPasswordFeature.getName()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.page.totalElements", greaterThan(0)));
+    }
+
+    @Test
+    public void userForgotPasswordFeatureUnauthorizedTest() throws Exception {
+
+        Site site = siteService.findSite(context);
+        SiteRest SiteRest = siteConverter.convert(site, Projection.DEFAULT);
+        String siteUri = utils.linkToSingleResource(SiteRest, "self").getHref();
+
+        configurationService.setProperty("user.forgot-password", false);
+
+        getClient().perform(get("/api/authz/authorizations/search/object")
+                                .param("uri", siteUri)
+                                .param("feature", epersonForgotPasswordFeature.getName()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+
+    @Test
+    public void userForgotPasswordNoLoginTest() throws Exception {
+
+        context.turnOffAuthorisationSystem();
+        EPerson noLoginPerson = EPersonBuilder.createEPerson(context)
+                                      .withNameInMetadata("User", "NoLogin")
+                                      .withCanLogin(false)
+                                      .withPassword("Strong-Password")
+                                      .build();
+        context.restoreAuthSystemState();
+
+        EPersonRest personRest = personConverter.convert(noLoginPerson, Projection.DEFAULT);
+        String personUri = utils.linkToSingleResource(personRest, "self").getHref();
+        configurationService.setProperty("user.forgot-password", true);
+        getClient().perform(get("/api/authz/authorizations/search/object")
+                                .param("uri", personUri)
+                                .param("feature", epersonForgotPasswordFeature.getName()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+
+    @Test
+    public void userForgotPasswordUnauthorizedNoPasswordAuthMethodTest() throws Exception {
+        //Enable Shibboleth and password login
+        configurationService.setProperty("plugin.sequence.org.dspace.authenticate.AuthenticationMethod", SHIB_ONLY);
+
+        EPersonRest personRest = personConverter.convert(eperson, Projection.DEFAULT);
+        String personUri = utils.linkToSingleResource(personRest, "self").getHref();
+
+        getClient().perform(get("/api/authz/authorizations/search/object")
+                                .param("uri", personUri)
+                                .param("feature", epersonForgotPasswordFeature.getName()))
+                   .andExpect(status().isOk())
+                   .andExpect(jsonPath("$.page.totalElements", is(0)));
+    }
+}
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 8ddd24348c..7a08b70eb9 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
@@ -38,6 +38,7 @@ import org.dspace.services.ConfigurationService;
 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:
@@ -53,6 +54,8 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class GenericAuthorizationFeatureIT extends AbstractControllerIntegrationTest {
 
+    private static final int SIZE = 100;
+
     @Autowired
     ConfigurationService configurationService;
 
@@ -205,215 +208,163 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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());
@@ -426,41 +377,31 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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?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?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?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?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?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());
@@ -475,73 +416,55 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         // 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?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?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?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?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?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?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?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?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?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());
@@ -549,65 +472,49 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         // 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?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?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?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?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?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?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?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?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());
@@ -615,57 +522,43 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         // 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?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?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?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?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?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?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?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());
@@ -677,17 +570,13 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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?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?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());
@@ -695,25 +584,19 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         // 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?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?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?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());
@@ -751,41 +634,31 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         final String feature = "canMove";
 
         // 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()))
+        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?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?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?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?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());
@@ -801,9 +674,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         context.restoreAuthSystemState();
 
         // 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()))
+        getAuthorizationFeatures(item1WriterToken, "http://localhost/api/core/items/" + item1.getID())
             .andExpect(status().isOk())
             .andExpect(jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canMove')]")
                 .exists());
@@ -823,9 +694,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
 
         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="
-                + "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());
@@ -861,29 +730,25 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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?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());
@@ -901,162 +766,139 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
             .build();
         context.restoreAuthSystemState();
         String communityAAAdminToken = getAuthToken(communityAAAdmin.getEmail(), password);
-        getClient(communityAAAdminToken).perform(get("/api/authz/authorizations/search/object?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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?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());
@@ -1082,8 +924,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1096,8 +937,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
             .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="
-            + "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());
@@ -1110,8 +950,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
             .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="
-            + "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());
@@ -1140,14 +979,12 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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());
@@ -1167,20 +1004,17 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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());
@@ -1199,20 +1033,17 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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());
@@ -1231,8 +1062,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1251,8 +1081,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1275,23 +1104,17 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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?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?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?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());
@@ -1310,20 +1133,17 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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());
@@ -1342,8 +1162,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1367,8 +1186,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1383,36 +1201,31 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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?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?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());
@@ -1426,28 +1239,24 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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?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());
@@ -1462,36 +1271,31 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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?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?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());
@@ -1505,22 +1309,19 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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());
@@ -1539,8 +1340,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1559,8 +1359,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1592,8 +1391,7 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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());
@@ -1612,22 +1410,19 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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?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?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());
@@ -1650,10 +1445,23 @@ public class GenericAuthorizationFeatureIT extends AbstractControllerIntegration
         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="
-            + "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
+                )
+            );
+    }
 }
+
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ManageGroupsFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ManageGroupsFeatureIT.java
index a42f219909..7a412ad425 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ManageGroupsFeatureIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/ManageGroupsFeatureIT.java
@@ -103,7 +103,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the general admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -116,7 +116,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -129,7 +129,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -142,7 +142,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the collection admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -155,7 +155,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -176,7 +176,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -197,7 +197,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -218,7 +218,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -239,7 +239,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -260,7 +260,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -285,7 +285,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -310,7 +310,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -335,7 +335,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -360,7 +360,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -385,7 +385,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -404,7 +404,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the general admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -422,7 +422,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -440,7 +440,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -458,7 +458,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the collection admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -476,7 +476,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -502,7 +502,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -528,7 +528,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -554,7 +554,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -580,7 +580,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -606,7 +606,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -636,7 +636,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -666,7 +666,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -696,7 +696,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -726,7 +726,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -756,7 +756,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -779,7 +779,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the general admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -801,7 +801,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -823,7 +823,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -845,7 +845,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the collection admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -867,7 +867,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -897,7 +897,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -927,7 +927,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -957,7 +957,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -987,7 +987,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1017,7 +1017,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1051,7 +1051,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1085,7 +1085,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1119,7 +1119,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1153,7 +1153,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1187,7 +1187,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1214,7 +1214,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the general admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1240,7 +1240,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the community admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1266,7 +1266,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the subcommunity admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1292,7 +1292,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify the collection admin has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1318,7 +1318,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify a submitter doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1352,7 +1352,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1386,7 +1386,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1420,7 +1420,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1454,7 +1454,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1488,7 +1488,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1526,7 +1526,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of the site administrators has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID() + "&feature=canManageGroups"))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1564,7 +1564,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a community admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1602,7 +1602,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a subcommunity admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1640,7 +1640,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of a collection admin group has this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
@@ -1678,7 +1678,7 @@ public class ManageGroupsFeatureIT extends AbstractControllerIntegrationTest {
 
         // Verify an ePerson in a sub-subgroup of submitter group doesn't have this feature
         getClient(token).perform(get("/api/authz/authorizations/search/object?embed=feature&uri="
-            + "http://localhost/api/core/site/" + siteService.findSite(context).getID()))
+            + "http://localhost/api/core/sites/" + siteService.findSite(context).getID()))
             .andExpect(status().isOk())
             .andExpect(
                 jsonPath("$._embedded.authorizations[?(@._embedded.feature.id=='canManageGroups')]")
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/QAAuthorizationFeatureIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/QAAuthorizationFeatureIT.java
new file mode 100644
index 0000000000..f3e508485a
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/authorization/QAAuthorizationFeatureIT.java
@@ -0,0 +1,84 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.authorization;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.dspace.app.rest.authorization.impl.QAAuthorizationFeature;
+import org.dspace.app.rest.converter.SiteConverter;
+import org.dspace.app.rest.matcher.AuthorizationMatcher;
+import org.dspace.app.rest.model.SiteRest;
+import org.dspace.app.rest.projection.DefaultProjection;
+import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
+import org.dspace.content.Site;
+import org.dspace.content.service.SiteService;
+import org.dspace.services.ConfigurationService;
+import org.hamcrest.Matchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * Test suite for the Quality Assurance Authorization feature
+ * 
+ * @author Francesco Bacchelli (francesco.bacchelli at 4science.it)
+ *
+ */
+public class QAAuthorizationFeatureIT extends AbstractControllerIntegrationTest {
+
+    @Autowired
+    private AuthorizationFeatureService authorizationFeatureService;
+
+    @Autowired
+    private SiteService siteService;
+
+    @Autowired
+    private SiteConverter siteConverter;
+
+    @Autowired
+    private ConfigurationService configurationService;
+
+
+    private AuthorizationFeature qaAuthorizationFeature;
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        context.turnOffAuthorisationSystem();
+        qaAuthorizationFeature = authorizationFeatureService.find(QAAuthorizationFeature.NAME);
+        context.restoreAuthSystemState();
+    }
+
+    @Test
+    public void testQAAuthorizationSuccess() throws Exception {
+        configurationService.setProperty("qaevents.enabled", true);
+        Site site = siteService.findSite(context);
+        SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        Authorization authAdminSite = new Authorization(admin, qaAuthorizationFeature, siteRest);
+
+        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + authAdminSite.getID()))
+                   .andExpect(jsonPath("$", Matchers.is(
+                              AuthorizationMatcher.matchAuthorization(authAdminSite))));
+    }
+
+    @Test
+    public void testQAAuthorizationFail() throws Exception {
+        configurationService.setProperty("qaevents.enabled", false);
+        Site site = siteService.findSite(context);
+        SiteRest siteRest = siteConverter.convert(site, DefaultProjection.DEFAULT);
+        String tokenAdmin = getAuthToken(admin.getEmail(), password);
+        Authorization authAdminSite = new Authorization(admin, qaAuthorizationFeature, siteRest);
+
+        getClient(tokenAdmin).perform(get("/api/authz/authorizations/" + authAdminSite.getID()))
+            .andExpect(status().isNotFound());
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/ConverterServiceIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/ConverterServiceIT.java
index 685bd5dbfd..4c432ddf63 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/ConverterServiceIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/converter/ConverterServiceIT.java
@@ -113,7 +113,7 @@ public class ConverterServiceIT extends AbstractControllerIntegrationTest {
     /**
      * When calling {@code toRest} with the default projection, the converter should run and no changes should be made.
      * This converter.toRest will now also check permissions through the PreAuthorize annotation on the
-     * Repository's findOne method. Therefor a repository has been added for this MockObjectRest namely
+     * Repository's findOne method. Therefore a repository has been added for this MockObjectRest namely
      * {@link org.dspace.app.rest.repository.MockObjectRestRepository} and added PreAuthorize annotations
      * on the methods of this Repository
      */
@@ -296,6 +296,11 @@ public class ConverterServiceIT extends AbstractControllerIntegrationTest {
         public String getType() {
             return null;
         }
+
+        @Override
+        public String getTypePlural() {
+            return null;
+        }
     }
 
     class MockHalResource extends HALResource<MockRestAddressableModel> {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
index d1679ae1d2..05d83de20a 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/eperson/DeleteEPersonSubmitterIT.java
@@ -22,8 +22,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.dspace.app.requestitem.RequestItemAuthor;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java
index d17db108ba..ae509e42c5 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/iiif/IIIFControllerIT.java
@@ -16,8 +16,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.io.InputStream;
 import java.util.UUID;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
 import org.dspace.app.rest.test.AbstractControllerIntegrationTest;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ContentReportMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ContentReportMatcher.java
new file mode 100644
index 0000000000..203aafdba9
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ContentReportMatcher.java
@@ -0,0 +1,52 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.content.Item;
+import org.dspace.contentreport.FilteredCollection;
+import org.hamcrest.Matcher;
+
+/**
+ * Utility class to construct a Matcher for a FilteredCollectionRest.
+ * @author Jean-François Morin (Université Laval)
+ */
+public class ContentReportMatcher {
+
+    private ContentReportMatcher() { }
+
+    public static Matcher<? super Object> matchFilteredCollectionProperties(FilteredCollection collection) {
+        return allOf(
+                hasJsonPath("$.label", is(collection.getLabel())),
+                hasJsonPath("$.community_label", is(collection.getCommunityLabel())),
+                hasJsonPath("$.community_handle", is(collection.getCommunityHandle())),
+                hasJsonPath("$.nb_total_items", is(collection.getTotalItems())),
+                hasJsonPath("$.all_filters_value", is(collection.getAllFiltersValue()))
+            );
+    }
+
+    public static Matcher<? super Object> matchFilteredCollectionSummary(int nbTotalItems, int nbFilteredItems) {
+        return allOf(
+                hasJsonPath("$.nb_total_items", is(nbTotalItems)),
+                hasJsonPath("$.all_filters_value", is(nbFilteredItems)));
+    }
+
+    public static Matcher<? super Object> matchFilteredItemProperties(Item item) {
+        return allOf(
+                hasJsonPath("$.name", is(item.getName())),
+                hasJsonPath("$.inArchive", is(item.isArchived())),
+                hasJsonPath("$.discoverable", is(item.isDiscoverable())),
+                hasJsonPath("$.withdrawn", is(item.isWithdrawn())),
+                hasJsonPath("$.type", is("item"))
+            );
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetEntryMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetEntryMatcher.java
index 6483758802..cc15700b92 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetEntryMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/FacetEntryMatcher.java
@@ -169,4 +169,75 @@ public class FacetEntryMatcher {
             hasJsonPath("$._links", matchNextLink(hasNext, "api/discover/facets/entityType"))
         );
     }
+
+    public static Matcher<? super Object> relatedItemFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("relateditem")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/relateditem")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/relateditem"))
+        );
+    }
+
+    public static Matcher<? super Object> originFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("origin")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/origin")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/origin"))
+        );
+    }
+
+    public static Matcher<? super Object> targetFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("target")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/target")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/target"))
+        );
+    }
+
+    public static Matcher<? super Object> queueStatusFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("queue_status")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/queue_status")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/queue_status"))
+        );
+    }
+
+    public static Matcher<? super Object> activityStreamTypeFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("activity_stream_type")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/activity_stream_type")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/activity_stream_type"))
+        );
+    }
+
+    public static Matcher<? super Object> coarNotifyTypeFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("coar_notify_type")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/coar_notify_type")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/coar_notify_type"))
+        );
+    }
+
+    public static Matcher<? super Object> notificationTypeFacet(boolean b) {
+        return allOf(
+            hasJsonPath("$.name", is("notification_type")),
+            hasJsonPath("$.facetType", is("text")),
+            hasJsonPath("$.facetLimit", any(Integer.class)),
+            hasJsonPath("$._links.self.href", containsString("api/discover/facets/notification_type")),
+            hasJsonPath("$._links", matchNextLink(b, "api/discover/facets/notification_type"))
+        );
+    }
+
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/HalMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/HalMatcher.java
index 4c73ee1af0..dee47877b2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/HalMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/HalMatcher.java
@@ -43,7 +43,7 @@ public class HalMatcher {
      * a separate matcher.
      *
      * @param rels the names of the rels. If a given name ends with "[]", it is assumed to be a paged subresource
-     *             and must therefore contain an embeded array with the same property name as the rel (without the []).
+     *             and must therefore contain an embedded array with the same property name as the rel (without the []).
      */
     public static Matcher<? super Object> matchEmbeds(String... rels) {
         if (rels.length == 0) {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java
index 64905f90ea..44121b7e42 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ItemMatcher.java
@@ -58,7 +58,8 @@ public class ItemMatcher {
                 "version",
                 "relationships[]",
                 "templateItemOf",
-                "thumbnail"
+                "thumbnail",
+                "submitter"
         );
     }
 
@@ -76,7 +77,8 @@ public class ItemMatcher {
                 "self",
                 "version",
                 "templateItemOf",
-                "thumbnail"
+                "thumbnail",
+                "submitter"
         );
     }
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/NotifyServiceMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/NotifyServiceMatcher.java
new file mode 100644
index 0000000000..377ed043e8
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/NotifyServiceMatcher.java
@@ -0,0 +1,132 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.dspace.app.rest.test.AbstractControllerIntegrationTest.REST_SERVER_URL;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.endsWith;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
+
+import org.hamcrest.Matcher;
+
+/**
+ * Class to match JSON NotifyServiceEntity in ITs
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ */
+public class NotifyServiceMatcher {
+
+    private NotifyServiceMatcher() { }
+
+    public static Matcher<? super Object> matchNotifyService(String name, String description, String url,
+                                                             String ldnUrl) {
+        return allOf(
+            hasJsonPath("$.name", is(name)),
+            hasJsonPath("$.description", is(description)),
+            hasJsonPath("$.url", is(url)),
+            hasJsonPath("$.ldnUrl", is(ldnUrl)),
+            hasJsonPath("$._links.self.href", containsString("/api/ldn/ldnservices/"))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyServiceWithoutLinks(
+        String name, String description, String url, String ldnUrl) {
+        return allOf(
+            hasJsonPath("$.name", is(name)),
+            hasJsonPath("$.description", is(description)),
+            hasJsonPath("$.url", is(url)),
+            hasJsonPath("$.ldnUrl", is(ldnUrl))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyService(String name, String description, String url,
+                                                             String ldnUrl, boolean enabled) {
+        return allOf(
+            hasJsonPath("$.name", is(name)),
+            hasJsonPath("$.description", is(description)),
+            hasJsonPath("$.url", is(url)),
+            hasJsonPath("$.ldnUrl", is(ldnUrl)),
+            hasJsonPath("$.enabled", is(enabled)),
+            hasJsonPath("$._links.self.href", containsString("/api/ldn/ldnservices/"))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyService(String name, String description, String url,
+                                                             String ldnUrl, boolean enabled,
+                                                             String lowerIp, String upperIp) {
+        return allOf(
+            hasJsonPath("$.name", is(name)),
+            hasJsonPath("$.description", is(description)),
+            hasJsonPath("$.url", is(url)),
+            hasJsonPath("$.ldnUrl", is(ldnUrl)),
+            hasJsonPath("$.enabled", is(enabled)),
+            hasJsonPath("$.lowerIp", is(lowerIp)),
+            hasJsonPath("$.upperIp", is(upperIp)),
+            hasJsonPath("$._links.self.href", containsString("/api/ldn/ldnservices/"))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyService(int id, String name, String description,
+                                                             String url, String ldnUrl) {
+        return allOf(
+            hasJsonPath("$.id", is(id)),
+            matchNotifyService(name, description, url, ldnUrl),
+            hasJsonPath("$._links.self.href", startsWith(REST_SERVER_URL)),
+            hasJsonPath("$._links.self.href", endsWith("/api/ldn/ldnservices/" + id))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyService(int id, String name, String description,
+                                                             String url, String ldnUrl, boolean enabled) {
+        return allOf(
+            hasJsonPath("$.id", is(id)),
+            matchNotifyService(name, description, url, ldnUrl, enabled),
+            hasJsonPath("$._links.self.href", startsWith(REST_SERVER_URL)),
+            hasJsonPath("$._links.self.href", endsWith("/api/ldn/ldnservices/" + id))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyService(int id, String name, String description,
+                                                             String url, String ldnUrl, boolean enabled,
+                                                             String lowerIp, String upperIp) {
+        return allOf(
+            hasJsonPath("$.id", is(id)),
+            matchNotifyService(name, description, url, ldnUrl, enabled, lowerIp, upperIp),
+            hasJsonPath("$._links.self.href", startsWith(REST_SERVER_URL)),
+            hasJsonPath("$._links.self.href", endsWith("/api/ldn/ldnservices/" + id))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyServiceWithoutLinks(
+        int id, String name, String description, String url, String ldnUrl) {
+        return allOf(
+            hasJsonPath("$.id", is(id)),
+            matchNotifyServiceWithoutLinks(name, description, url, ldnUrl)
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyServicePattern(String pattern, String constraint) {
+        return allOf(
+            hasJsonPath("$.pattern", is(pattern)),
+            hasJsonPath("$.constraint", is(constraint))
+        );
+    }
+
+    public static Matcher<? super Object> matchNotifyServicePattern(String pattern,
+                                                                    String constraint,
+                                                                    Boolean automatic) {
+        return allOf(
+            matchNotifyServicePattern(pattern, constraint),
+            hasJsonPath("$.automatic", is(automatic))
+        );
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QAEventMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QAEventMatcher.java
new file mode 100644
index 0000000000..8eb569468d
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QAEventMatcher.java
@@ -0,0 +1,173 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.emptyOrNullString;
+import static org.hamcrest.Matchers.is;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.dspace.app.rest.model.hateoas.QAEventResource;
+import org.dspace.content.QAEvent;
+import org.dspace.qaevent.service.dto.NotifyMessageDTO;
+import org.dspace.qaevent.service.dto.OpenaireMessageDTO;
+import org.dspace.qaevent.service.dto.QAMessageDTO;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+import org.hamcrest.core.IsAnything;
+
+
+/**
+ * Matcher related to {@link QAEventResource}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QAEventMatcher {
+
+    private QAEventMatcher() {
+    }
+
+    public static Matcher<? super Object> matchQAEventFullEntry(QAEvent event) {
+        return allOf(
+                matchQAEventEntry(event),
+                hasJsonPath("$._embedded.topic.name", is(event.getTopic())),
+                hasJsonPath("$._embedded.target.id", is(event.getTarget())),
+                event.getRelated() != null ?
+                        hasJsonPath("$._embedded.related.id", is(event.getRelated())) :
+                        hasJsonPath("$._embedded.related", is(emptyOrNullString()))
+                );
+    }
+
+    public static Matcher<? super Object> matchQAEventEntry(QAEvent event) {
+        try {
+            ObjectMapper jsonMapper = new JsonMapper();
+            DecimalFormat decimalFormat = new DecimalFormat("0.000", new DecimalFormatSymbols(Locale.ENGLISH));
+            return allOf(hasJsonPath("$.id", is(event.getEventId())),
+                    hasJsonPath("$.originalId", is(event.getOriginalId())),
+                    hasJsonPath("$.title", is(event.getTitle())),
+                    hasJsonPath("$.trust", is(decimalFormat.format(event.getTrust()))),
+                    hasJsonPath("$.status", Matchers.equalToIgnoringCase(event.getStatus())),
+                    hasJsonPath("$.message",
+                            matchMessage(event.getTopic(), jsonMapper.readValue(event.getMessage(),
+                                OpenaireMessageDTO.class))),
+                    hasJsonPath("$._links.target.href", Matchers.endsWith(event.getEventId() + "/target")),
+                    hasJsonPath("$._links.related.href", Matchers.endsWith(event.getEventId() + "/related")),
+                    hasJsonPath("$._links.topic.href", Matchers.endsWith(event.getEventId() + "/topic")),
+                    hasJsonPath("$.type", is("qualityassuranceevent")));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    public static Matcher<? super Object> matchQAEventNotifyEntry(QAEvent event) {
+        try {
+            ObjectMapper jsonMapper = new JsonMapper();
+            return allOf(hasJsonPath("$.id", is(event.getEventId())),
+                    hasJsonPath("$.originalId", is(event.getOriginalId())),
+                    hasJsonPath("$.title", is(event.getTitle())),
+                    hasJsonPath("$.trust", is(new DecimalFormat("0.000").format(event.getTrust()))),
+                    hasJsonPath("$.status", Matchers.equalToIgnoringCase(event.getStatus())),
+                    hasJsonPath("$.message",
+                            matchMessage(event.getTopic(), jsonMapper.readValue(event.getMessage(),
+                                NotifyMessageDTO.class))),
+                    hasJsonPath("$._links.target.href", Matchers.endsWith(event.getEventId() + "/target")),
+                    hasJsonPath("$._links.related.href", Matchers.endsWith(event.getEventId() + "/related")),
+                    hasJsonPath("$._links.topic.href", Matchers.endsWith(event.getEventId() + "/topic")),
+                    hasJsonPath("$.type", is("qualityassuranceevent")));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException(e);
+        }
+    }
+    private static Matcher<? super Object> matchMessage(String topic, QAMessageDTO message) {
+        if (message instanceof OpenaireMessageDTO) {
+            OpenaireMessageDTO oadto = (OpenaireMessageDTO) message;
+            if (StringUtils.endsWith(topic, "/ABSTRACT")) {
+                return allOf(hasJsonPath("$.abstract", is(oadto.getAbstracts())));
+            } else if (StringUtils.endsWith(topic, "/PID")) {
+                return allOf(
+                        hasJsonPath("$.value", is(oadto.getValue())),
+                        hasJsonPath("$.type", is(oadto.getType())),
+                        hasJsonPath("$.pidHref", is(calculateOpenairePidHref(oadto.getType(), oadto.getValue()))));
+            } else if (StringUtils.endsWith(topic, "/PROJECT")) {
+                return allOf(
+                        hasJsonPath("$.openaireId", is(oadto.getOpenaireId())),
+                        hasJsonPath("$.acronym", is(oadto.getAcronym())),
+                        hasJsonPath("$.code", is(oadto.getCode())),
+                        hasJsonPath("$.funder", is(oadto.getFunder())),
+                        hasJsonPath("$.fundingProgram", is(oadto.getFundingProgram())),
+                        hasJsonPath("$.jurisdiction", is(oadto.getJurisdiction())),
+                        hasJsonPath("$.title", is(oadto.getTitle())));
+            }
+        } else if (message instanceof NotifyMessageDTO) {
+            NotifyMessageDTO notifyDTO = (NotifyMessageDTO) message;
+            if (StringUtils.endsWith(topic, "/REVIEW")) {
+                return allOf(
+                            hasJsonPath("$.serviceName", is(notifyDTO.getServiceName())),
+                            hasJsonPath("$.serviceId", is(notifyDTO.getServiceId())),
+                            hasJsonPath("$.href", is(notifyDTO.getHref())),
+                            hasJsonPath("$.relationship", is(notifyDTO.getRelationship()))
+                );
+            } else if (StringUtils.endsWith(topic, "/ENDORSEMENT")) {
+                return allOf(
+                    hasJsonPath("$.serviceName", is(notifyDTO.getServiceName())),
+                    hasJsonPath("$.serviceId", is(notifyDTO.getServiceId())),
+                    hasJsonPath("$.href", is(notifyDTO.getHref())),
+                    hasJsonPath("$.relationship", is(notifyDTO.getRelationship()))
+                );
+            }
+        }
+        return IsAnything.anything();
+    }
+
+    private static String calculateOpenairePidHref(String type, String value) {
+        if (type == null) {
+            return null;
+        }
+
+        String hrefPrefix = null;
+
+        switch (type) {
+            case "arxiv":
+                hrefPrefix = "https://arxiv.org/abs/";
+                break;
+            case "handle":
+                hrefPrefix = "https://hdl.handle.net/";
+                break;
+            case "urn":
+                hrefPrefix = "";
+                break;
+            case "doi":
+                hrefPrefix = "https://doi.org/";
+                break;
+            case "pmc":
+                hrefPrefix = "https://www.ncbi.nlm.nih.gov/pmc/articles/";
+                break;
+            case "pmid":
+                hrefPrefix = "https://pubmed.ncbi.nlm.nih.gov/";
+                break;
+            case "ncid":
+                hrefPrefix = "https://ci.nii.ac.jp/ncid/";
+                break;
+            default:
+                break;
+        }
+
+        return hrefPrefix != null ? hrefPrefix + value : null;
+
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QASourceMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QASourceMatcher.java
new file mode 100644
index 0000000000..c0466ee408
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QASourceMatcher.java
@@ -0,0 +1,43 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.app.rest.model.hateoas.QASourceResource;
+import org.hamcrest.Matcher;
+
+/**
+ * Matcher related to {@link QASourceResource}.
+ *
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+public class QASourceMatcher {
+
+    private QASourceMatcher() { }
+
+    public static Matcher<? super Object> matchQASourceEntry(String key, int totalEvents) {
+        return allOf(
+            hasJsonPath("$.type", is("qualityassurancesource")),
+            hasJsonPath("$.id", is(key)),
+            hasJsonPath("$.totalEvents", is(totalEvents))
+        );
+    }
+
+
+    public static Matcher<? super Object> matchQASourceEntry(String key) {
+        return allOf(
+            hasJsonPath("$.type", is("qualityassurancesource")),
+            hasJsonPath("$.id", is(key))
+        );
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QATopicMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QATopicMatcher.java
new file mode 100644
index 0000000000..c2a2e76d73
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/QATopicMatcher.java
@@ -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/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.app.rest.model.hateoas.QATopicResource;
+import org.dspace.content.QAEvent;
+import org.hamcrest.Matcher;
+
+/**
+ * Matcher related to {@link QATopicResource}.
+ *
+ * @author Andrea Bollini (andrea.bollini at 4science.it)
+ *
+ */
+public class QATopicMatcher {
+
+    private QATopicMatcher() { }
+
+    public static Matcher<? super Object> matchQATopicEntry(String topicName, int totalEvents) {
+        return matchQATopicEntry(QAEvent.OPENAIRE_SOURCE, topicName, totalEvents);
+    }
+
+
+    public static Matcher<? super Object> matchQATopicEntry(String topicName) {
+        return matchQATopicEntry(QAEvent.OPENAIRE_SOURCE, topicName);
+    }
+
+    public static Matcher<? super Object> matchQATopicEntry(String source, String topicName, int totalEvents) {
+        return allOf(
+            hasJsonPath("$.type", is("qualityassurancetopic")),
+            hasJsonPath("$.name", is(topicName)),
+            hasJsonPath("$.id", is(source + ":" + topicName.replace("/", "!"))),
+            hasJsonPath("$.totalEvents", is(totalEvents))
+        );
+    }
+
+    public static Matcher<? super Object> matchQATopicEntry(String source, String topicName) {
+        return allOf(
+            hasJsonPath("$.type", is("qualityassurancetopic")),
+            hasJsonPath("$.name", is(topicName)),
+            hasJsonPath("$.id", is(source + ":" + topicName.replace("/", "!")))
+        );
+    }
+
+    public static Matcher<? super Object> matchQATopicEntry(String source, String topicName, String itemUuid,
+           int totalEvents) {
+        return allOf(
+                hasJsonPath("$.type", is("qualityassurancetopic")),
+                hasJsonPath("$.name", is(topicName)),
+                hasJsonPath("$.id", is(source + ":" + topicName.replace("/", "!") + ":" + itemUuid)),
+                hasJsonPath("$.totalEvents", is(totalEvents))
+            );
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/RegistrationMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/RegistrationMatcher.java
index a154091a2e..2a4cee8375 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/RegistrationMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/RegistrationMatcher.java
@@ -17,7 +17,7 @@ import org.hamcrest.Matcher;
 
 public class RegistrationMatcher {
 
-    private RegistrationMatcher(){}
+    private RegistrationMatcher() {}
 
     public static Matcher<? super Object> matchRegistration(String email, UUID epersonUuid) {
         return allOf(
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ResourcePolicyMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ResourcePolicyMatcher.java
index d80fb638cd..caae7bb7c0 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ResourcePolicyMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/ResourcePolicyMatcher.java
@@ -14,8 +14,7 @@ import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.nullValue;
 
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nullable;
 import org.dspace.authorize.ResourcePolicy;
 import org.dspace.content.DSpaceObject;
 import org.dspace.core.Constants;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionCOARNotifyMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionCOARNotifyMatcher.java
new file mode 100644
index 0000000000..937b414486
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionCOARNotifyMatcher.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.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.contains;
+import static org.hamcrest.Matchers.is;
+
+import java.util.List;
+
+import org.dspace.coarnotify.NotifyPattern;
+import org.hamcrest.Matcher;
+
+/**
+ * Matcher for the Submission COAR Notify.
+ *
+ * @author Mohamed Eskander (mohamed.eskander at 4science.com)
+ *
+ */
+public class SubmissionCOARNotifyMatcher {
+
+    private SubmissionCOARNotifyMatcher() {
+    }
+
+    public static Matcher<? super Object> matchCOARNotifyEntry(String id, List<NotifyPattern> patterns) {
+        return allOf(
+            hasJsonPath("$.id", is(id)),
+            hasJsonPath(
+                "$.patterns", contains(
+                patterns.stream()
+                        .map(coarPattern ->
+                            allOf(
+                                hasJsonPath("pattern", is(coarPattern.getPattern())),
+                                hasJsonPath("multipleRequest", is(coarPattern.isMultipleRequest()))
+                            ))
+                        .toArray(Matcher[]::new))));
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java
index 47f96fd136..e17df53459 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SubmissionFormFieldMatcher.java
@@ -39,7 +39,7 @@ public class SubmissionFormFieldMatcher {
      * @param typeBind
      *            the expected type-bind field(s)
      * @param mandatoryMessage
-     *            the expected mandatoryMessage, can be null. If not empty the fiedl is expected to be flagged as
+     *            the expected mandatoryMessage, can be null. If not empty the field is expected to be flagged as
      *            mandatory
      * @param repeatable
      *            the expected repeatable flag
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionMatcher.java
new file mode 100644
index 0000000000..38be403cb2
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionMatcher.java
@@ -0,0 +1,57 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.is;
+
+import org.dspace.content.Item;
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+
+public class SuggestionMatcher {
+
+    private SuggestionMatcher() { }
+
+    // Matcher for a suggestion
+    public static Matcher<? super Object> matchSuggestion(String source, Item target, String display,
+            String suggestionId) {
+        return Matchers.allOf(
+                hasJsonPath("$.display", is(display)),
+                hasJsonPath("$.source", is(source)),
+                hasJsonPath("$.id", is(source + ":" + target.getID().toString() + ":" + suggestionId)),
+                hasJsonPath("$.metadata['dc.title'][0].value", is("Title Suggestion " + suggestionId )),
+                hasJsonPath("$.metadata['dc.source'][0].value", is("Source 1")),
+                hasJsonPath("$.metadata['dc.source'][1].value", is("Source 2")),
+                hasJsonPath("$.score"),
+                hasJsonPath("$.evidences"),
+                hasJsonPath("$.type", is("suggestion"))
+        );
+    }
+
+    public static Matcher<? super Object> matchSuggestion(String source, Item target, String display,
+            String suggestionId, double score, String evidenceName, double evidenceScore, String evidenceNote) {
+        return Matchers.allOf(
+                hasJsonPath("$.display", is(display)),
+                hasJsonPath("$.source", is(source)),
+                hasJsonPath("$.id", is(source + ":" + target.getID().toString() + ":" + suggestionId)),
+                hasJsonPath("$.metadata['dc.title'][0].value", is("Title Suggestion " + suggestionId )),
+                hasJsonPath("$.metadata['dc.source'][0].value", is("Source 1")),
+                hasJsonPath("$.metadata['dc.source'][1].value", is("Source 2")),
+                hasJsonPath("$.score", is(String.format("%.2f", score))),
+                hasJsonPath("$.evidences." + evidenceName, Matchers.is(
+                        hasJsonPath("$",
+                                Matchers.allOf(
+                                        hasJsonPath("$.score", is(String.format("%.2f", evidenceScore))),
+                                        hasJsonPath("$.notes", is(evidenceNote))))
+                        )),
+                hasJsonPath("$.type", is("suggestion"))
+        );
+    }
+
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionSourceMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionSourceMatcher.java
new file mode 100644
index 0000000000..f9d70cef86
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionSourceMatcher.java
@@ -0,0 +1,28 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.is;
+
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+
+public class SuggestionSourceMatcher {
+
+    private SuggestionSourceMatcher() { }
+
+    // Matcher for a suggestion target
+    public static Matcher<? super Object> matchSuggestionSource(String name, int total) {
+        return Matchers.allOf(
+                hasJsonPath("$.id", is(name)),
+                hasJsonPath("$.total", is(total)),
+                hasJsonPath("$.type", is("suggestionsource"))
+        );
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionTargetMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionTargetMatcher.java
new file mode 100644
index 0000000000..b88b51020e
--- /dev/null
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/SuggestionTargetMatcher.java
@@ -0,0 +1,29 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.app.rest.matcher;
+
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.hasJsonPath;
+import static org.hamcrest.Matchers.is;
+
+import org.hamcrest.Matcher;
+import org.hamcrest.Matchers;
+
+public class SuggestionTargetMatcher {
+
+    private SuggestionTargetMatcher() { }
+
+    // Matcher for a suggestion target
+    public static Matcher<? super Object> matchSuggestionTarget(String name, String source, int total) {
+        return Matchers.allOf(
+                hasJsonPath("$.display", is(name)),
+                hasJsonPath("$.source", is(source)),
+                hasJsonPath("$.total", is(total)),
+                hasJsonPath("$.type", is("suggestiontarget"))
+        );
+    }
+}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowActionMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowActionMatcher.java
index e727eb8acc..1360e2f4a2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowActionMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowActionMatcher.java
@@ -25,7 +25,7 @@ import org.hamcrest.Matchers;
 public class WorkflowActionMatcher {
 
     private static final String WORKFLOW_ACTIONS_ENDPOINT
-            = "/api/" + WorkflowActionRest.CATEGORY + "/" + WorkflowActionRest.NAME_PLURAL + "/";
+            = "/api/" + WorkflowActionRest.CATEGORY + "/" + WorkflowActionRest.PLURAL_NAME + "/";
 
     private WorkflowActionMatcher() {
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java
index f3d6890bbd..cd933abcb4 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowDefinitionMatcher.java
@@ -30,7 +30,7 @@ public class WorkflowDefinitionMatcher {
     private static XmlWorkflowFactory xmlWorkflowFactory = XmlWorkflowServiceFactory.getInstance().getWorkflowFactory();
 
     private static final String WORKFLOW_DEFINITIONS_ENDPOINT
-            = "/api/" + WorkflowDefinitionRest.CATEGORY + "/" + WorkflowDefinitionRest.NAME_PLURAL + "/";
+            = "/api/" + WorkflowDefinitionRest.CATEGORY + "/" + WorkflowDefinitionRest.PLURAL_NAME + "/";
 
     private WorkflowDefinitionMatcher() {
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowStepMatcher.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowStepMatcher.java
index 2dc37d3586..72277cf87d 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowStepMatcher.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/matcher/WorkflowStepMatcher.java
@@ -25,7 +25,7 @@ import org.hamcrest.Matchers;
 public class WorkflowStepMatcher {
 
     private static final String WORKFLOW_ACTIONS_ENDPOINT
-        = "/api/" + WorkflowStepRest.CATEGORY + "/" + WorkflowStepRest.NAME_PLURAL + "/";;
+        = "/api/" + WorkflowStepRest.CATEGORY + "/" + WorkflowStepRest.PLURAL_NAME + "/";;
 
     private WorkflowStepMatcher() {}
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/MockObjectRest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/MockObjectRest.java
index 039e94ab40..377705ad5f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/MockObjectRest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/model/MockObjectRest.java
@@ -28,6 +28,7 @@ public class MockObjectRest extends BaseObjectRest<Long> {
     public static final String CATEGORY = "test";
 
     public static final String NAME = "testobject";
+    public static final String PLURAL_NAME = "testobjects";
 
     public static final String O_CHILDREN = "optionallyEmbeddedChildren";
 
@@ -66,6 +67,11 @@ public class MockObjectRest extends BaseObjectRest<Long> {
         return NAME;
     }
 
+    @Override
+    public String getTypePlural() {
+        return PLURAL_NAME;
+    }
+
     public String getValue() {
         return value;
     }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
index 14dc4e95dc..007814aeaa 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/orcid/OrcidQueueRestRepositoryIT.java
@@ -122,7 +122,7 @@ public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTes
         String tokenResearcher = getAuthToken(researcher.getEmail(), password);
         String tokenResearcher2 = getAuthToken(researcher2.getEmail(), password);
 
-        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+        getClient(tokenResearcher).perform(get("/api/eperson/orcidqueues/search/findByProfileItem")
             .param("profileItemId", itemPerson.getID().toString()))
                                   .andExpect(status().isOk())
                                   .andExpect(jsonPath("$._embedded.orcidqueues", Matchers.containsInAnyOrder(
@@ -131,7 +131,7 @@ public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTes
                                              )))
                                   .andExpect(jsonPath("$.page.totalElements", is(2)));
 
-        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueues/search/findByProfileItem")
             .param("profileItemId", itemPerson2.getID().toString()))
                                    .andExpect(status().isOk())
                                    .andExpect(jsonPath("$._embedded.orcidqueues", Matchers.contains(
@@ -139,9 +139,9 @@ public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTes
                                               )))
                                    .andExpect(jsonPath("$.page.totalElements", is(1)))
                                    .andExpect(jsonPath("$._links.self.href", Matchers
-                .containsString("/api/eperson/orcidqueue/search/findByProfileItem")));
+                .containsString("/api/eperson/orcidqueues/search/findByProfileItem")));
 
-        getClient(tokenAdmin).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+        getClient(tokenAdmin).perform(get("/api/eperson/orcidqueues/search/findByProfileItem")
             .param("profileItemId", itemPerson.getID().toString()))
                              .andExpect(status().isOk())
                              .andExpect(jsonPath("$._embedded.orcidqueues", Matchers.containsInAnyOrder(
@@ -213,7 +213,7 @@ public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTes
         context.restoreAuthSystemState();
         String tokenResearcher2 = getAuthToken(researcher2.getEmail(), password);
 
-        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+        getClient(tokenResearcher2).perform(get("/api/eperson/orcidqueues/search/findByProfileItem")
             .param("profileItemId", itemPerson.getID().toString()))
                                    .andExpect(status().isForbidden());
     }
@@ -259,7 +259,7 @@ public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTes
 
         context.restoreAuthSystemState();
 
-        getClient().perform(get("/api/eperson/orcidqueue/search/findByProfileItem")
+        getClient().perform(get("/api/eperson/orcidqueues/search/findByProfileItem")
             .param("profileItemId", itemPerson.getID().toString()))
                    .andExpect(status().isUnauthorized());
     }
@@ -461,7 +461,7 @@ public class OrcidQueueRestRepositoryIT extends AbstractControllerIntegrationTes
 
         context.restoreAuthSystemState();
 
-        getClient().perform(get("/api/eperson/orcidqueue/" + orcidQueue.getID().toString()))
+        getClient().perform(get("/api/eperson/orcidqueues/" + orcidQueue.getID().toString()))
                    .andExpect(status().isUnauthorized());
     }
 
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/projection/MockProjection.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/projection/MockProjection.java
index 780cc90cfb..a74462e1eb 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/projection/MockProjection.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/projection/MockProjection.java
@@ -7,8 +7,7 @@
  */
 package org.dspace.app.rest.projection;
 
-import javax.annotation.Nullable;
-
+import jakarta.annotation.Nullable;
 import org.dspace.app.rest.model.LinkRest;
 import org.dspace.app.rest.model.MockObject;
 import org.dspace.app.rest.model.MockObjectRest;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/AbstractMockObjectChildLinkRepository.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/AbstractMockObjectChildLinkRepository.java
index 0b9babda68..2e974e47e9 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/AbstractMockObjectChildLinkRepository.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/AbstractMockObjectChildLinkRepository.java
@@ -9,9 +9,9 @@ package org.dspace.app.rest.repository;
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.annotation.Nullable;
-import javax.servlet.http.HttpServletRequest;
 
+import jakarta.annotation.Nullable;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.app.rest.model.MockObject;
 import org.dspace.app.rest.model.MockObjectRest;
 import org.dspace.app.rest.projection.Projection;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectNeverEmbedChildLinkRepository.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectNeverEmbedChildLinkRepository.java
index 7d82938ae8..1442eac66c 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectNeverEmbedChildLinkRepository.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectNeverEmbedChildLinkRepository.java
@@ -13,7 +13,7 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository used by {@link MockObjectRest} to test that never-embedded subresources work correctly.
  */
-@Component(MockObjectRest.CATEGORY + "." + MockObjectRest.NAME + "." + MockObjectRest.N_CHILDREN)
+@Component(MockObjectRest.CATEGORY + "." + MockObjectRest.PLURAL_NAME + "." + MockObjectRest.N_CHILDREN)
 public class MockObjectNeverEmbedChildLinkRepository extends AbstractMockObjectChildLinkRepository {
     @Override
     public boolean isEmbeddableRelation(Object data, String name) {
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectOptionallyEmbedChildLinkRepository.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectOptionallyEmbedChildLinkRepository.java
index e75351a78e..a81eceb5b2 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectOptionallyEmbedChildLinkRepository.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectOptionallyEmbedChildLinkRepository.java
@@ -13,6 +13,6 @@ import org.springframework.stereotype.Component;
 /**
  * Link repository used by {@link MockObjectRest} to test that optionally-embedded subresources work correctly.
  */
-@Component(MockObjectRest.CATEGORY + "." + MockObjectRest.NAME + "." + MockObjectRest.O_CHILDREN)
+@Component(MockObjectRest.CATEGORY + "." + MockObjectRest.PLURAL_NAME + "." + MockObjectRest.O_CHILDREN)
 public class MockObjectOptionallyEmbedChildLinkRepository extends AbstractMockObjectChildLinkRepository {
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectRestRepository.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectRestRepository.java
index 0c54811249..596f846f13 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectRestRepository.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/repository/MockObjectRestRepository.java
@@ -18,7 +18,7 @@ import org.springframework.stereotype.Component;
  * This class has been added to allow the MockObjectRest to act as an actual BaseObjectRest since they're
  * expected to have a RestRepository
  */
-@Component(MockObjectRest.CATEGORY + "." + MockObjectRest.NAME)
+@Component(MockObjectRest.CATEGORY + "." + MockObjectRest.PLURAL_NAME)
 public class MockObjectRestRepository extends DSpaceRestRepository<MockObjectRest, Long> {
 
     // Added a permitAll preAuthorize annotation to allow the object to be used in tests by every user
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepositoryTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepositoryTest.java
index 0b9964fe6a..95ce6bb37f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepositoryTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/DSpaceCsrfTokenRepositoryTest.java
@@ -8,11 +8,13 @@
 package org.dspace.app.rest.security;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
-import java.util.List;
-import javax.servlet.http.Cookie;
-import javax.ws.rs.core.HttpHeaders;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.ws.rs.core.HttpHeaders;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,10 +22,11 @@ import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.security.web.csrf.CsrfToken;
+import org.springframework.security.web.csrf.DeferredCsrfToken;
 
 /**
- * This is almost an exact copy of Spring Security's CookieCsrfTokenRepositoryTests
- * https://github.com/spring-projects/spring-security/blob/5.2.x/web/src/test/java/org/springframework/security/web/csrf/CookieCsrfTokenRepositoryTests.java
+ * This is almost an exact copy of Spring Security's DSpaceCsrfTokenRepositoryTests
+ * https://github.com/spring-projects/spring-security/blob/6.2.x/web/src/test/java/org/springframework/security/web/csrf/CookieCsrfTokenRepositoryTests.java
  *
  * The only modifications are:
  *   - Updating these tests to use our custom DSpaceCsrfTokenRepository
@@ -46,12 +49,9 @@ public class DSpaceCsrfTokenRepositoryTest {
     @Test
     public void generateToken() {
         CsrfToken generateToken = this.repository.generateToken(this.request);
-
         assertThat(generateToken).isNotNull();
-        assertThat(generateToken.getHeaderName())
-            .isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_HEADER_NAME);
-        assertThat(generateToken.getParameterName())
-            .isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_PARAMETER_NAME);
+        assertThat(generateToken.getHeaderName()).isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_HEADER_NAME);
+        assertThat(generateToken.getParameterName()).isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_PARAMETER_NAME);
         assertThat(generateToken.getToken()).isNotEmpty();
     }
 
@@ -61,9 +61,7 @@ public class DSpaceCsrfTokenRepositoryTest {
         String parameterName = "paramName";
         this.repository.setHeaderName(headerName);
         this.repository.setParameterName(parameterName);
-
         CsrfToken generateToken = this.repository.generateToken(this.request);
-
         assertThat(generateToken).isNotNull();
         assertThat(generateToken.getHeaderName()).isEqualTo(headerName);
         assertThat(generateToken.getParameterName()).isEqualTo(parameterName);
@@ -74,17 +72,21 @@ public class DSpaceCsrfTokenRepositoryTest {
     public void saveToken() {
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getMaxAge()).isEqualTo(-1);
-        assertThat(tokenCookie.getName())
-            .isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getName()).isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getPath()).isEqualTo(this.request.getContextPath());
         assertThat(tokenCookie.getSecure()).isEqualTo(this.request.isSecure());
         assertThat(tokenCookie.getValue()).isEqualTo(token.getToken());
-        assertThat(tokenCookie.isHttpOnly()).isEqualTo(true);
+        assertThat(tokenCookie.isHttpOnly()).isTrue();
+    }
+
+    @Test
+    public void saveTokenShouldUseResponseAddCookie() {
+        CsrfToken token = this.repository.generateToken(this.request);
+        MockHttpServletResponse spyResponse = spy(this.response);
+        this.repository.saveToken(token, this.request, spyResponse);
+        verify(spyResponse).addCookie(any(Cookie.class));
     }
 
     @Test
@@ -92,30 +94,73 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.request.setSecure(true);
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getSecure()).isTrue();
-        // DSpace Custom assert to verify SameSite attribute is set
-        // The Cookie class doesn't yet support SameSite, so we have to re-read
-        // the cookie from our headers, and check it.
-        List<String> headers = this.response.getHeaders(HttpHeaders.SET_COOKIE);
-        assertThat(headers.size()).isEqualTo(1);
-        assertThat(headers.get(0)).containsIgnoringCase("SameSite=None");
+
+        // DSpace Custom assert to verify SameSite attribute is "None" when cookie is secure
+        assertThat(tokenCookie.getAttribute("SameSite")).containsIgnoringCase("None");
+    }
+
+    // Custom test for DSpace to verify behavior for non-secure requests
+    @Test
+    public void saveTokenNotSecure() {
+        this.request.setSecure(false);
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getSecure()).isFalse();
+
+        // DSpace Custom assert to verify SameSite attribute is "Lax" when cookie is NOT secure
+        assertThat(tokenCookie.getAttribute("SameSite")).containsIgnoringCase("Lax");
+    }
+
+    @Test
+    public void saveTokenSecureFlagTrue() {
+        this.request.setSecure(false);
+        this.repository.setSecure(Boolean.TRUE);
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getSecure()).isTrue();
+    }
+
+    @Test
+    public void saveTokenSecureFlagTrueUsingCustomizer() {
+        this.request.setSecure(false);
+        this.repository.setCookieCustomizer((customizer) -> customizer.secure(Boolean.TRUE));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getSecure()).isTrue();
+    }
+
+    @Test
+    public void saveTokenSecureFlagFalse() {
+        this.request.setSecure(true);
+        this.repository.setSecure(Boolean.FALSE);
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getSecure()).isFalse();
+    }
+
+    @Test
+    public void saveTokenSecureFlagFalseUsingCustomizer() {
+        this.request.setSecure(true);
+        this.repository.setCookieCustomizer((customizer) -> customizer.secure(Boolean.FALSE));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getSecure()).isFalse();
     }
 
     @Test
     public void saveTokenNull() {
         this.request.setSecure(true);
         this.repository.saveToken(null, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getMaxAge()).isZero();
-        assertThat(tokenCookie.getName())
-            .isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getName()).isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getPath()).isEqualTo(this.request.getContextPath());
         assertThat(tokenCookie.getSecure()).isEqualTo(this.request.isSecure());
         assertThat(tokenCookie.getValue()).isEmpty();
@@ -126,10 +171,16 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository.setCookieHttpOnly(true);
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.isHttpOnly()).isTrue();
+    }
 
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+    @Test
+    public void saveTokenHttpOnlyTrueUsingCustomizer() {
+        this.repository.setCookieCustomizer((customizer) -> customizer.httpOnly(true));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.isHttpOnly()).isTrue();
     }
 
@@ -138,10 +189,16 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository.setCookieHttpOnly(false);
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.isHttpOnly()).isFalse();
+    }
 
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+    @Test
+    public void saveTokenHttpOnlyFalseUsingCustomizer() {
+        this.repository.setCookieCustomizer((customizer) -> customizer.httpOnly(false));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.isHttpOnly()).isFalse();
     }
 
@@ -150,10 +207,7 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository = DSpaceCsrfTokenRepository.withHttpOnlyFalse();
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.isHttpOnly()).isFalse();
     }
 
@@ -163,10 +217,7 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository.setCookiePath(customPath);
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getPath()).isEqualTo(this.repository.getCookiePath());
     }
 
@@ -176,10 +227,7 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository.setCookiePath(customPath);
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getPath()).isEqualTo(this.request.getContextPath());
     }
 
@@ -189,10 +237,7 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository.setCookiePath(customPath);
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getPath()).isEqualTo(this.request.getContextPath());
     }
 
@@ -200,16 +245,82 @@ public class DSpaceCsrfTokenRepositoryTest {
     public void saveTokenWithCookieDomain() {
         String domainName = "example.com";
         this.repository.setCookieDomain(domainName);
-
         CsrfToken token = this.repository.generateToken(this.request);
         this.repository.saveToken(token, this.request, this.response);
-
-        Cookie tokenCookie = this.response
-            .getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
-
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
         assertThat(tokenCookie.getDomain()).isEqualTo(domainName);
     }
 
+    @Test
+    public void saveTokenWithCookieDomainUsingCustomizer() {
+        String domainName = "example.com";
+        this.repository.setCookieCustomizer((customizer) -> customizer.domain(domainName));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getDomain()).isEqualTo(domainName);
+    }
+
+    @Test
+    public void saveTokenWithCookieMaxAge() {
+        int maxAge = 1200;
+        this.repository.setCookieMaxAge(maxAge);
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getMaxAge()).isEqualTo(maxAge);
+    }
+
+    @Test
+    public void saveTokenWithCookieMaxAgeUsingCustomizer() {
+        int maxAge = 1200;
+        this.repository.setCookieCustomizer((customizer) -> customizer.maxAge(maxAge));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getMaxAge()).isEqualTo(maxAge);
+    }
+
+    @Test
+    public void saveTokenWithSameSiteNull() {
+        String sameSitePolicy = null;
+        this.repository.setCookieCustomizer((customizer) -> customizer.sameSite(sameSitePolicy));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getAttribute("SameSite")).isNull();
+    }
+
+    @Test
+    public void saveTokenWithSameSiteStrict() {
+        String sameSitePolicy = "Strict";
+        this.repository.setCookieCustomizer((customizer) -> customizer.sameSite(sameSitePolicy));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getAttribute("SameSite")).isEqualTo(sameSitePolicy);
+    }
+
+    @Test
+    public void saveTokenWithSameSiteLax() {
+        String sameSitePolicy = "Lax";
+        this.repository.setCookieCustomizer((customizer) -> customizer.sameSite(sameSitePolicy));
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getAttribute("SameSite")).isEqualTo(sameSitePolicy);
+    }
+
+    @Test
+    public void saveTokenWithExistingSetCookieThenDoesNotOverwrite() {
+        this.response.setHeader(HttpHeaders.SET_COOKIE, "MyCookie=test");
+        this.repository = new DSpaceCsrfTokenRepository();
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        assertThat(this.response.getCookie("MyCookie")).isNotNull();
+        assertThat(this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME)).isNotNull();
+    }
+
     @Test
     public void loadTokenNoCookiesNull() {
         assertThat(this.repository.loadToken(this.request)).isNull();
@@ -218,32 +329,24 @@ public class DSpaceCsrfTokenRepositoryTest {
     @Test
     public void loadTokenCookieIncorrectNameNull() {
         this.request.setCookies(new Cookie("other", "name"));
-
         assertThat(this.repository.loadToken(this.request)).isNull();
     }
 
     @Test
     public void loadTokenCookieValueEmptyString() {
-        this.request.setCookies(
-            new Cookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME, ""));
-
+        this.request.setCookies(new Cookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME, ""));
         assertThat(this.repository.loadToken(this.request)).isNull();
     }
 
     @Test
     public void loadToken() {
         CsrfToken generateToken = this.repository.generateToken(this.request);
-
         this.request
-            .setCookies(new Cookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME,
-                                   generateToken.getToken()));
-
+            .setCookies(new Cookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME, generateToken.getToken()));
         CsrfToken loadToken = this.repository.loadToken(this.request);
-
         assertThat(loadToken).isNotNull();
         assertThat(loadToken.getHeaderName()).isEqualTo(generateToken.getHeaderName());
-        assertThat(loadToken.getParameterName())
-            .isEqualTo(generateToken.getParameterName());
+        assertThat(loadToken.getParameterName()).isEqualTo(generateToken.getParameterName());
         assertThat(loadToken.getToken()).isNotEmpty();
     }
 
@@ -256,32 +359,95 @@ public class DSpaceCsrfTokenRepositoryTest {
         this.repository.setHeaderName(headerName);
         this.repository.setParameterName(parameterName);
         this.repository.setCookieName(cookieName);
-
         this.request.setCookies(new Cookie(cookieName, value));
-
         CsrfToken loadToken = this.repository.loadToken(this.request);
-
         assertThat(loadToken).isNotNull();
         assertThat(loadToken.getHeaderName()).isEqualTo(headerName);
         assertThat(loadToken.getParameterName()).isEqualTo(parameterName);
         assertThat(loadToken.getToken()).isEqualTo(value);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
+    public void loadDeferredTokenWhenDoesNotExistThenGeneratedAndSaved() {
+        DeferredCsrfToken deferredCsrfToken = this.repository.loadDeferredToken(this.request, this.response);
+        CsrfToken csrfToken = deferredCsrfToken.get();
+        assertThat(csrfToken).isNotNull();
+        assertThat(deferredCsrfToken.isGenerated()).isTrue();
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie).isNotNull();
+        assertThat(tokenCookie.getMaxAge()).isEqualTo(-1);
+        assertThat(tokenCookie.getName()).isEqualTo(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie.getPath()).isEqualTo(this.request.getContextPath());
+        assertThat(tokenCookie.getSecure()).isEqualTo(this.request.isSecure());
+        assertThat(tokenCookie.getValue()).isEqualTo(csrfToken.getToken());
+        assertThat(tokenCookie.isHttpOnly()).isEqualTo(true);
+    }
+
+    @Test
+    public void loadDeferredTokenWhenExistsAndNullSavedThenGeneratedAndSaved() {
+        CsrfToken generatedToken = this.repository.generateToken(this.request);
+        this.request
+            .setCookies(new Cookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME, generatedToken.getToken()));
+        this.repository.saveToken(null, this.request, this.response);
+        DeferredCsrfToken deferredCsrfToken = this.repository.loadDeferredToken(this.request, this.response);
+        CsrfToken csrfToken = deferredCsrfToken.get();
+        assertThat(csrfToken).isNotNull();
+        assertThat(generatedToken).isNotEqualTo(csrfToken);
+        assertThat(deferredCsrfToken.isGenerated()).isTrue();
+    }
+
+    @Test
+    public void cookieCustomizer() {
+        String domainName = "example.com";
+        String customPath = "/custompath";
+        String sameSitePolicy = "Strict";
+        this.repository.setCookieCustomizer((customizer) -> {
+            customizer.domain(domainName);
+            customizer.secure(false);
+            customizer.path(customPath);
+            customizer.sameSite(sameSitePolicy);
+        });
+        CsrfToken token = this.repository.generateToken(this.request);
+        this.repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie).isNotNull();
+        assertThat(tokenCookie.getMaxAge()).isEqualTo(-1);
+        assertThat(tokenCookie.getDomain()).isEqualTo(domainName);
+        assertThat(tokenCookie.getPath()).isEqualTo(customPath);
+        assertThat(tokenCookie.isHttpOnly()).isEqualTo(Boolean.TRUE);
+        assertThat(tokenCookie.getAttribute("SameSite")).isEqualTo(sameSitePolicy);
+    }
+
+    @Test
+    public void withHttpOnlyFalseWhenCookieCustomizerThenStillDefaultsToFalse() {
+        DSpaceCsrfTokenRepository repository = DSpaceCsrfTokenRepository.withHttpOnlyFalse();
+        repository.setCookieCustomizer((customizer) -> customizer.maxAge(1000));
+        CsrfToken token = repository.generateToken(this.request);
+        repository.saveToken(token, this.request, this.response);
+        Cookie tokenCookie = this.response.getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        assertThat(tokenCookie).isNotNull();
+        assertThat(tokenCookie.getMaxAge()).isEqualTo(1000);
+        assertThat(tokenCookie.isHttpOnly()).isEqualTo(Boolean.FALSE);
+    }
+
+    @Test
     public void setCookieNameNullIllegalArgumentException() {
-        this.repository.setCookieName(null);
+        assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setCookieName(null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void setParameterNameNullIllegalArgumentException() {
-        this.repository.setParameterName(null);
+        assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setParameterName(null));
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void setHeaderNameNullIllegalArgumentException() {
-        this.repository.setHeaderName(null);
+        assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setHeaderName(null));
     }
 
-
+    @Test
+    public void setCookieMaxAgeZeroIllegalArgumentException() {
+        assertThatIllegalArgumentException().isThrownBy(() -> this.repository.setCookieMaxAge(0));
+    }
 
 }
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/ShibbolethLoginFilterIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/ShibbolethLoginFilterIT.java
index a8422ec106..f48c58b2ee 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/ShibbolethLoginFilterIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/ShibbolethLoginFilterIT.java
@@ -16,8 +16,8 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
 
 import java.util.ArrayList;
 import java.util.List;
-import javax.ws.rs.core.MediaType;
 
+import jakarta.ws.rs.core.MediaType;
 import org.dspace.app.rest.authorization.AuthorizationFeature;
 import org.dspace.app.rest.authorization.AuthorizationFeatureService;
 import org.dspace.app.rest.authorization.impl.CanChangePasswordFeature;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/EPersonClaimProviderTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/EPersonClaimProviderTest.java
index 8ca6bbcc3b..461c8747d3 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/EPersonClaimProviderTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/EPersonClaimProviderTest.java
@@ -13,9 +13,9 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/JWTTokenHandlerTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/JWTTokenHandlerTest.java
index 66bb68ad81..f28cee14a3 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/JWTTokenHandlerTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/JWTTokenHandlerTest.java
@@ -16,10 +16,10 @@ import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Date;
 import java.util.List;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.dspace.eperson.service.EPersonService;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandlerTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandlerTest.java
index 7049721865..d5a72ea9a5 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandlerTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/ShortLivedJWTTokenHandlerTest.java
@@ -14,10 +14,10 @@ import static org.mockito.Mockito.when;
 import java.text.ParseException;
 import java.util.Base64;
 import java.util.Date;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
 import com.nimbusds.jwt.SignedJWT;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.dspace.eperson.EPerson;
 import org.junit.Before;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProviderTest.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProviderTest.java
index 42ac74be85..9506436809 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProviderTest.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/security/jwt/SpecialGroupClaimProviderTest.java
@@ -14,9 +14,9 @@ import static org.mockito.ArgumentMatchers.any;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
-import javax.servlet.http.HttpServletRequest;
 
 import com.nimbusds.jwt.JWTClaimsSet;
+import jakarta.servlet.http.HttpServletRequest;
 import org.dspace.core.Context;
 import org.junit.After;
 import org.junit.Before;
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/signposting/controller/LinksetRestControllerIT.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/signposting/controller/LinksetRestControllerIT.java
index 6d1d242cad..7fc4f82260 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/signposting/controller/LinksetRestControllerIT.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/signposting/controller/LinksetRestControllerIT.java
@@ -18,6 +18,7 @@ import java.io.InputStream;
 import java.text.DateFormat;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
+import java.time.Period;
 import java.util.Date;
 
 import org.apache.commons.codec.CharEncoding;
@@ -40,15 +41,12 @@ import org.dspace.content.MetadataSchemaEnum;
 import org.dspace.content.RelationshipType;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.authority.Choices;
-import org.dspace.content.authority.service.ChoiceAuthorityService;
-import org.dspace.content.authority.service.MetadataAuthorityService;
 import org.dspace.content.service.BitstreamService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.core.Constants;
 import org.dspace.eperson.Group;
 import org.dspace.services.ConfigurationService;
-import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.util.SimpleMapConverter;
 import org.hamcrest.Matchers;
 import org.junit.Before;
@@ -67,12 +65,6 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
     @Autowired
     private ConfigurationService configurationService;
 
-    @Autowired
-    private MetadataAuthorityService metadataAuthorityService;
-
-    @Autowired
-    private ChoiceAuthorityService choiceAuthorityService;
-
     @Autowired
     private ItemService itemService;
 
@@ -196,7 +188,7 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
 
     @Test
     public void findOneItemJsonLinksetsWithLicence() throws Exception {
-        String licenceUrl = "https://exmple.com/licence";
+        String licenceUrl = "https://example.com/licence";
         String url = configurationService.getProperty("dspace.ui.url");
         String signpostingUrl = configurationService.getProperty("signposting.path");
         context.turnOffAuthorisationSystem();
@@ -466,7 +458,7 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                 .withTitle("Withdrawn Item")
                 .withMetadata("dc", "identifier", "doi", doi)
                 .withIssueDate("2017-11-18")
-                .withEmbargoPeriod("2 week")
+                .withEmbargoPeriod(Period.ofWeeks(2))
                 .build();
         context.restoreAuthSystemState();
 
@@ -735,10 +727,6 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                 .andExpect(jsonPath("$[?(@.href == '" + uiUrl + "/signposting/linksets/" + item.getID() + "/json" +
                         "' && @.rel == 'linkset' " +
                         "&& @.type == 'application/linkset+json')]").exists());
-
-        DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
-        metadataAuthorityService.clearCache();
-        choiceAuthorityService.clearCache();
     }
 
     @Test
@@ -760,7 +748,7 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                     .withMimeType(bitstreamMimeType)
                     .build();
         }
-        bitstreamService.addMetadata(context, bitstream, "dc", "type", null, Item.ANY, "Article");
+        bitstreamService.addMetadata(context, bitstream, "dc", "type", null, null, "Article");
 
         context.restoreAuthSystemState();
 
@@ -780,10 +768,6 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                         "&& @.type == 'application/linkset+json')]").exists())
                 .andExpect(jsonPath("$[?(@.href == 'https://schema.org/ScholarlyArticle' " +
                         "&& @.rel == 'type')]").exists());
-
-        DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
-        metadataAuthorityService.clearCache();
-        choiceAuthorityService.clearCache();
     }
 
     @Test
@@ -813,10 +797,6 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
 
         getClient().perform(get("/signposting/links/" + bitstream.getID()))
                 .andExpect(status().isUnauthorized());
-
-        DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
-        metadataAuthorityService.clearCache();
-        choiceAuthorityService.clearCache();
     }
 
     @Test
@@ -837,17 +817,13 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                     .withName("Bitstream")
                     .withDescription("description")
                     .withMimeType(bitstreamMimeType)
-                    .withEmbargoPeriod("6 months")
+                    .withEmbargoPeriod(Period.ofMonths(6))
                     .build();
         }
         context.restoreAuthSystemState();
 
         getClient().perform(get("/signposting/links/" + bitstream.getID()))
                 .andExpect(status().isUnauthorized());
-
-        DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
-        metadataAuthorityService.clearCache();
-        choiceAuthorityService.clearCache();
     }
 
     @Test
@@ -860,7 +836,7 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                 .withTitle("Workspace Item")
                 .build();
         Item item = workspaceItem.getItem();
-        itemService.addMetadata(context, item, "dc", "identifier", "doi", Item.ANY, doi);
+        itemService.addMetadata(context, item, "dc", "identifier", "doi", null, doi);
 
         Bitstream bitstream = null;
         try (InputStream is = IOUtils.toInputStream(bitstreamContent, CharEncoding.UTF_8)) {
@@ -874,10 +850,6 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
 
         getClient().perform(get("/signposting/links/" + bitstream.getID()))
                 .andExpect(status().isUnauthorized());
-
-        DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
-        metadataAuthorityService.clearCache();
-        choiceAuthorityService.clearCache();
     }
 
     @Test
@@ -890,10 +862,6 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
 
         getClient().perform(get("/signposting/links/" + item.getID()))
                 .andExpect(status().isUnauthorized());
-
-        DSpaceServicesFactory.getInstance().getConfigurationService().reloadConfig();
-        metadataAuthorityService.clearCache();
-        choiceAuthorityService.clearCache();
     }
 
     @Test
@@ -949,7 +917,7 @@ public class LinksetRestControllerIT extends AbstractControllerIntegrationTest {
                 .withTitle("Withdrawn Item")
                 .withMetadata("dc", "identifier", "doi", doi)
                 .withIssueDate("2017-11-18")
-                .withEmbargoPeriod("2 week")
+                .withEmbargoPeriod(Period.ofWeeks(2))
                 .build();
         context.restoreAuthSystemState();
 
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 00339ba2e4..26dac5facd 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
@@ -7,7 +7,6 @@
  */
 package org.dspace.app.rest.test;
 
-import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf;
 import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
@@ -17,14 +16,18 @@ import java.nio.charset.StandardCharsets;
 import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.List;
-import javax.servlet.Filter;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.Filter;
+import jakarta.servlet.http.Cookie;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
 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.security.DSpaceCsrfTokenRepository;
 import org.dspace.app.rest.utils.DSpaceConfigurationInitializer;
 import org.dspace.app.rest.utils.DSpaceKernelInitializer;
 import org.junit.Assert;
@@ -39,11 +42,12 @@ import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.RequestPostProcessor;
 import org.springframework.test.web.servlet.result.MockMvcResultHandlers;
 import org.springframework.test.web.servlet.setup.DefaultMockMvcBuilder;
@@ -68,18 +72,17 @@ import org.springframework.web.context.WebApplicationContext;
 // 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)
 @WebAppConfiguration
 // Load our src/test/resources/application-test.properties to override some settings in default application.properties
 @TestPropertySource(locations = "classpath:application-test.properties")
-// Enable our custom Logging listener to log when each test method starts/stops
-@TestExecutionListeners(listeners = {LoggingTestExecutionListener.class},
-    mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS)
 public class AbstractControllerIntegrationTest extends AbstractIntegrationTestWithDatabase {
 
+    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger();
+
     protected static final String AUTHORIZATION_HEADER = "Authorization";
     protected static final String AUTHORIZATION_COOKIE = "Authorization-cookie";
 
@@ -137,26 +140,20 @@ public class AbstractControllerIntegrationTest extends AbstractIntegrationTestWi
             context.commit();
         }
 
-        DefaultMockMvcBuilder mockMvcBuilder = webAppContextSetup(webApplicationContext)
-            //Always log the response to debug
-            .alwaysDo(MockMvcResultHandlers.print())
-            //Add all filter implementations
-            .addFilters(new ErrorPageFilter())
-            .addFilters(requestFilters.toArray(new Filter[requestFilters.size()]))
-            // Enable/Integrate Spring Security with MockMVC
-            .apply(springSecurity());
+        DefaultMockMvcBuilder mockMvcBuilder = setupDefaultMockMvcBuilder(true);
+
+        // Default to performing a GET request to the root path
+        MockHttpServletRequestBuilder defaultRequest = get("/");
 
-        // Make sure all MockMvc requests (in all tests) include a valid CSRF token (in header) by default.
         // If an authToken was passed in, also make sure request sends the authToken in the "Authorization" header
         if (StringUtils.isNotBlank(authToken)) {
-            mockMvcBuilder.defaultRequest(
-                get("/").with(csrf().asHeader()).header(AUTHORIZATION_HEADER, AUTHORIZATION_TYPE + authToken));
-        } else {
-            mockMvcBuilder.defaultRequest(get("/").with(csrf().asHeader()));
+            defaultRequest.header(AUTHORIZATION_HEADER, AUTHORIZATION_TYPE + authToken);
         }
 
-        return mockMvcBuilder
-            .build();
+        // Make sure all MockMvc requests (in all tests) include a valid CSRF token by default.
+        defaultRequest.with(validCsrfToken());
+
+        return mockMvcBuilder.defaultRequest(defaultRequest).build();
     }
 
     public MockHttpServletResponse getAuthResponse(String user, String password) throws Exception {
@@ -205,4 +202,162 @@ public class AbstractControllerIntegrationTest extends AbstractIntegrationTestWi
             return request;
         };
     }
+
+    /**
+     * Adds a *valid* CSRF token to the current mock request. This is useful for tests
+     * that need to verify behavior when an valid CSRF token is sent.
+     * Usage: .with(validCsrfToken())
+     * <P>
+     * TODO: Ideally this would be replaced by Spring Security's "csrf().asHeader()".  But, at this time
+     * that post processor doesn't fully support CookieCsrfTokenRepository's (which is what DSpace uses)
+     * See https://stackoverflow.com/a/77368421 and https://github.com/spring-projects/spring-security/issues/12774
+     * @return RequestPostProcessor with invalid token added
+     */
+    public RequestPostProcessor validCsrfToken() {
+        return request -> {
+            // Obtain the current CSRF token cookie from the (mock) backend via GET request
+            // TODO: This method may be expensive for ITs as it GETs a new token for every request. We may want to
+            // investigate if caching the CSRF token would work without causing random test failures.
+            Cookie csrfCookie = getCsrfTokenCookie();
+
+            if (csrfCookie != null) {
+                // Get any currently set cookies & append CSRF cookie to list
+                Cookie[] cookies = request.getCookies();
+
+                // To the current request, add the obtained CSRF cookie and matching CSRF header
+                request.setCookies(ArrayUtils.add(cookies, csrfCookie));
+                request.addHeader(DSpaceCsrfTokenRepository.DEFAULT_CSRF_HEADER_NAME, csrfCookie.getValue());
+                return request;
+            } else {
+                log.warn("Could not obtain CSRFToken to add it to the current mock request");
+                return request;
+            }
+        };
+    }
+
+    /**
+     * Adds a *valid* CSRF token to the current mock request via a request parameter. This is useful for tests
+     * that need to verify behavior when an valid CSRF token is sent via a request param (e.g. ?_csrf=[token]).
+     * Usage: .with(validCsrfTokenViaParam())
+     * <P>
+     * This method is identical to validCsrfToken() except it sends the CSRF token as a request parameter instead of
+     * an HTTP Header.
+     * <P>
+     * TODO: Ideally this would be replaced by Spring Security's "csrf()".  But, at this time
+     * that post processor doesn't fully support CookieCsrfTokenRepository's (which is what DSpace uses)
+     * See https://stackoverflow.com/a/77368421 and https://github.com/spring-projects/spring-security/issues/12774
+     * @return RequestPostProcessor with invalid token added
+     */
+    public RequestPostProcessor validCsrfTokenViaParam() {
+        return request -> {
+            // Obtain the current CSRF token cookie from the (mock) backend via GET request
+            // TODO: This method may be expensive for ITs as it GETs a new token for every request. We may want to
+            // investigate if caching the CSRF token would work without causing random test failures.
+            Cookie csrfCookie = getCsrfTokenCookie();
+
+            if (csrfCookie != null) {
+                // Get any currently set cookies & append CSRF cookie to list
+                Cookie[] cookies = request.getCookies();
+
+                // If an CSRF cookie already exists in this list of cookies, remove it. We'll replace it below.
+                // (This is necessary because our tests all default to calling validCsrfToken())
+                cookies = Arrays.stream(cookies)
+                                .filter(c -> !c.getName()
+                                               .equalsIgnoreCase(
+                                                   DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME))
+                                .toArray(Cookie[]::new);
+
+                // Also remove CSRF header if it is already set. We'll send the CSRF token via a request parameter
+                request.removeHeader(DSpaceCsrfTokenRepository.DEFAULT_CSRF_HEADER_NAME);
+
+                // To the current request, add the obtained CSRF cookie and matching CSRF parameter
+                request.setCookies(ArrayUtils.add(cookies, csrfCookie));
+                request.addParameter(DSpaceCsrfTokenRepository.DEFAULT_CSRF_PARAMETER_NAME, csrfCookie.getValue());
+                return request;
+            } else {
+                log.warn("Could not obtain CSRFToken to add it to the current mock request");
+                return request;
+            }
+        };
+    }
+
+    /**
+     * Adds an invalid CSRF token to the current mock request. This is useful for tests which need to verify behavior
+     * when an invalid CSRF token is sent.
+     * <P>
+     * Usage: .with(invalidCsrfToken())
+     * @return RequestPostProcessor with invalid token added
+     */
+    public RequestPostProcessor invalidCsrfToken() {
+        return request -> {
+            // Get any currently set request Cookies
+            Cookie[] cookies = request.getCookies();
+
+            // If an CSRF cookie already exists in this list of cookies, remove it. We'll replace it below.
+            // (This is necessary because our tests all default to sending a *valid* CSRF token)
+            cookies = Arrays.stream(cookies)
+                                       .filter(c -> !c.getName()
+                                                      .equalsIgnoreCase(
+                                                          DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME))
+                                       .toArray(Cookie[]::new);
+
+            // Also remove CSRF header if it is already set. We'll replace it below.
+            request.removeHeader(DSpaceCsrfTokenRepository.DEFAULT_CSRF_HEADER_NAME);
+
+            // To the current mock request, add a fake CSRF cookie and header that do NOT match.
+            request.setCookies(ArrayUtils.add(cookies,
+                                              new Cookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME,
+                                                         "fake-csrf-token")));
+            request.addHeader(DSpaceCsrfTokenRepository.DEFAULT_CSRF_HEADER_NAME, "not-a-valid-csrf-token");
+            return request;
+        };
+    }
+
+
+    /**
+     * Setup our DefaultMockMvcBuilder for DSpace.  This is centralized in a private method as it's used in
+     * multiple places in this class.
+     * @param enableLogging whether to default to logging the MockMvc request or not.
+     * @return DefaultMockMvcBuilder
+     */
+    private DefaultMockMvcBuilder setupDefaultMockMvcBuilder(boolean enableLogging) {
+        DefaultMockMvcBuilder defaultMockMvcBuilder = webAppContextSetup(webApplicationContext)
+            // Add all filter implementations
+            .addFilters(new ErrorPageFilter())
+            .addFilters(requestFilters.toArray(new Filter[requestFilters.size()]))
+            // Enable/Integrate Spring Security with MockMVC
+            .apply(springSecurity());
+
+        if (enableLogging) {
+            // Always log the MockMvc request/response, to allow for easier debugging.
+            return defaultMockMvcBuilder.alwaysDo(MockMvcResultHandlers.print());
+        } else {
+            return defaultMockMvcBuilder;
+        }
+    }
+
+
+    /**
+     * Return the Cookie set by Spring Security which contains the CSRF token.
+     * The value() of the cookie is the CSRF Token.
+     * @return Cookie with CSRF token
+     * @throws Exception
+     */
+    public Cookie getCsrfTokenCookie() {
+        try {
+            // Set up a non-logging MockMvc builder to obtain the CSRF cookie
+            // This call is not logged by default to avoid cluttering logs of ITs, but you can switch this to "true"
+            // if you wish it to be logged.
+            MockMvc mockMvc = setupDefaultMockMvcBuilder(false).build();
+
+            // Perform a GET request to our CSRF endpoint to obtain the current CSRF token
+            MvcResult mvcResult = mockMvc.perform(get("/api/security/csrf")).andReturn();
+
+            // Read and return the Cookie which contains the CSRF token for DSpace
+            return mvcResult.getResponse().getCookie(DSpaceCsrfTokenRepository.DEFAULT_CSRF_COOKIE_NAME);
+        } catch (Exception e) {
+            log.error("Could not obtain the CSRF token cookie for Integration Tests", e);
+        }
+        return null;
+    }
 }
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 75b0143e3e..e4ef1c741f 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,20 +9,19 @@ package org.dspace.app.rest.test;
 
 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;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.context.ApplicationContext;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.RequestEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.TestExecutionListeners;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 
@@ -47,14 +46,11 @@ import org.springframework.test.context.junit4.SpringRunner;
 // 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
 @TestPropertySource(locations = "classpath:application-test.properties")
-// Enable our custom Logging listener to log when each test method starts/stops
-@TestExecutionListeners(listeners = {LoggingTestExecutionListener.class},
-                        mergeMode = TestExecutionListeners.MergeMode.MERGE_WITH_DEFAULTS)
 public class AbstractWebClientIntegrationTest extends AbstractIntegrationTestWithDatabase {
     // (Random) port chosen for test web server
     @LocalServerPort
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/LoggingTestExecutionListener.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/LoggingTestExecutionListener.java
deleted file mode 100644
index 2a04bab204..0000000000
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/LoggingTestExecutionListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.app.rest.test;
-
-import org.apache.logging.log4j.Logger;
-import org.springframework.test.context.TestContext;
-import org.springframework.test.context.support.AbstractTestExecutionListener;
-
-/**
- * Custom DSpace TestExecutionListener which logs messages whenever a specific Test Case (i.e. test method) has
- * started or ended execution. This makes Test environment logs easier to read/understand as you know which method has
- * caused errors, etc.
- */
-public class LoggingTestExecutionListener extends AbstractTestExecutionListener {
-
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(LoggingTestExecutionListener.class);
-
-    /**
-     * Before each test method is run
-     * @param testContext
-     */
-    @Override
-    public void beforeTestMethod(TestContext testContext) {
-        // Log the test method being executed. Put lines around it to make it stand out.
-        log.info("---");
-        log.info("Starting execution of test method: {}()", testContext.getTestMethod().getName());
-        log.info("---");
-    }
-
-    /**
-     * After each test method is run
-     * @param testContext
-     */
-    @Override
-    public void afterTestMethod(TestContext testContext) {
-        // Log the test method just completed.
-        log.info("Finished execution of test method: {}()", testContext.getTestMethod().getName());
-    }
-}
diff --git a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/MetadataPatchSuite.java b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/MetadataPatchSuite.java
index 423a4cbe35..b22a74a33f 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/MetadataPatchSuite.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/app/rest/test/MetadataPatchSuite.java
@@ -11,10 +11,9 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import javax.ws.rs.core.MediaType;
-
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.ws.rs.core.MediaType;
 import org.junit.Assert;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.ResultActions;
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 3ff79f7805..296bef1bce 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
@@ -241,7 +241,7 @@ public class Swordv2IT extends AbstractWebClientIntegrationTest {
         String editLink = response.getHeaders().getLocation().toString();
 
         // Body should include that link as the rel="edit" URL
-        assertThat(response.getBody(), containsString("<link href=\"" + editLink + "\" rel=\"edit\"/>"));
+        assertThat(response.getBody(), containsString("<link href=\"" + editLink + "\" rel=\"edit\""));
 
         //----
         // STEP 2: Verify uploaded content can be read via SWORDv2
diff --git a/dspace-server-webapp/src/test/java/org/dspace/external/provider/impl/MockOpenAIREFundingDataProvider.java b/dspace-server-webapp/src/test/java/org/dspace/external/provider/impl/MockOpenaireFundingDataProvider.java
similarity index 85%
rename from dspace-server-webapp/src/test/java/org/dspace/external/provider/impl/MockOpenAIREFundingDataProvider.java
rename to dspace-server-webapp/src/test/java/org/dspace/external/provider/impl/MockOpenaireFundingDataProvider.java
index baf1041ab5..2e92e36b91 100644
--- a/dspace-server-webapp/src/test/java/org/dspace/external/provider/impl/MockOpenAIREFundingDataProvider.java
+++ b/dspace-server-webapp/src/test/java/org/dspace/external/provider/impl/MockOpenaireFundingDataProvider.java
@@ -10,11 +10,10 @@ package org.dspace.external.provider.impl;
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
-import javax.xml.bind.JAXBException;
 
 import eu.openaire.jaxb.helper.OpenAIREHandler;
 import eu.openaire.jaxb.model.Response;
-import org.dspace.external.OpenAIRERestConnector;
+import org.dspace.external.OpenaireRestConnector;
 import org.mockito.AdditionalMatchers;
 import org.mockito.ArgumentMatchers;
 import org.mockito.Mockito;
@@ -22,14 +21,14 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 /**
- * Mock the OpenAIRE external source using a mock rest connector so that query
+ * Mock the Openaire external source using a mock rest connector so that query
  * will be resolved against static test files
  * 
  */
-public class MockOpenAIREFundingDataProvider extends OpenAIREFundingDataProvider {
+public class MockOpenaireFundingDataProvider extends OpenaireFundingDataProvider {
     @Override
     public void init() throws IOException {
-        OpenAIRERestConnector restConnector = Mockito.mock(OpenAIRERestConnector.class);
+        OpenaireRestConnector restConnector = Mockito.mock(OpenaireRestConnector.class);
 
         when(restConnector.searchProjectByKeywords(ArgumentMatchers.anyInt(), ArgumentMatchers.anyInt(),
                 ArgumentMatchers.startsWith("mushroom"))).thenAnswer(new Answer<Response>() {
@@ -37,7 +36,7 @@ public class MockOpenAIREFundingDataProvider extends OpenAIREFundingDataProvider
                         try {
                             return OpenAIREHandler
                                     .unmarshal(this.getClass().getResourceAsStream("openaire-projects.xml"));
-                        } catch (JAXBException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                         return null;
@@ -50,7 +49,7 @@ public class MockOpenAIREFundingDataProvider extends OpenAIREFundingDataProvider
                         try {
                             return OpenAIREHandler
                                     .unmarshal(this.getClass().getResourceAsStream("openaire-no-projects.xml"));
-                        } catch (JAXBException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                         return null;
@@ -63,7 +62,7 @@ public class MockOpenAIREFundingDataProvider extends OpenAIREFundingDataProvider
                         try {
                             return OpenAIREHandler
                                     .unmarshal(this.getClass().getResourceAsStream("openaire-project.xml"));
-                        } catch (JAXBException e) {
+                        } catch (Exception e) {
                             e.printStackTrace();
                         }
                         return null;
diff --git a/dspace-server-webapp/src/test/resources/application-test.properties b/dspace-server-webapp/src/test/resources/application-test.properties
index 9a396cf8e5..bd9e2ea4a1 100644
--- a/dspace-server-webapp/src/test/resources/application-test.properties
+++ b/dspace-server-webapp/src/test/resources/application-test.properties
@@ -14,4 +14,7 @@
 
 ## 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
+
+# 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-server-webapp/src/test/resources/org/dspace/app/rest/cinii-responce-ids.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-response-ids.xml
similarity index 100%
rename from dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-responce-ids.xml
rename to dspace-server-webapp/src/test/resources/org/dspace/app/rest/cinii-response-ids.xml
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_ack_review_reject.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_ack_review_reject.json
new file mode 100644
index 0000000000..2ac1f1a15a
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_ack_review_reject.json
@@ -0,0 +1,34 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://generic-service.com",
+    "name": "Generic Service",
+    "type": "Service"
+  },
+  "context": {
+    "id": "<<object_handle>>",
+    "ietf:cite-as": "https://doi.org/10.4598/12123487",
+    "type": "Document"
+  },
+  "id": "urn:uuid:668f26e0-2c8d-4117-a0d2-ee713523bcb4",
+  "inReplyTo": "<<ldn_offer_review_uuid>>",
+  "object": {
+    "id": "<<object_handle>>",
+    "object": "https://some-organisation.org/resource/0021",
+    "type": "Offer"
+  },
+  "origin": {
+    "id": "https://generic-service.com/system",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "target": {
+    "id": "https://some-organisation.org",
+    "inbox": "hop",
+    "type": "Organization"
+  },
+  "type": ["TentativeReject", "coar-notify:ReviewAction"]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_endorsement.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_endorsement.json
new file mode 100644
index 0000000000..e266565d2c
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_endorsement.json
@@ -0,0 +1,49 @@
+{
+	"@context": [
+	   "https://www.w3.org/ns/activitystreams",
+	   "https://purl.org/coar/notify"
+	 ],
+	 "actor": {
+	   "id": "https://overlay-journal.com",
+	   "name": "Overlay Journal",
+	   "type": ["Service"]
+	 }, 
+	 "context": {
+		"id": "<<object>>",
+	   "ietf:cite-as": "https://doi.org/10.5555/12345680",
+	   "type": ["sorg:AboutPage"],
+	   "ietf:item": {
+	     "id": "https://research-organisation.org/repository/preprint/201203/421/content.pdf",
+	     "mediaType": "application/pdf",
+	     "type": [
+	       "Article",
+	       "sorg:ScholarlyArticle"
+	     ]
+	   }
+	 },
+	 "id": "urn:uuid:94ecae35-dcfd-4182-8550-22c7164fe23f",
+	 "object": {
+		"id": "<<object_handle>>",
+		"id_oai": "oai:www.openstarts.units.it:<<object_handle>>",
+	    "id_old": "https://review-service.com/review/geo/202103/0021",
+	   "ietf:cite-as": "https://overlay-journal.com/articles/00001/",
+	   "type": [
+	     "Page",
+	     "sorg:WebPage"
+	   ]
+	 },
+	 "origin": {
+	   "id": "https://overlay-journal.com/system",
+	   "inbox": "https://overlay-journal.com/inbox/",
+	   "type": ["Service"]
+	 },
+	 "target": {
+	   "id": "https://research-organisation.org/repository",
+	   "inbox": "https://research-organisation.org/inbox/",
+	   "type": ["Service"]
+	 },
+	 "type": [
+	   "Announce",
+	   "coar-notify:EndorsementAction"
+	 ]
+ }
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_release.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_release.json
new file mode 100644
index 0000000000..6c3dce8c7a
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_release.json
@@ -0,0 +1,49 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://research-organisation.org",
+    "name": "Research Organisation",
+    "type": "Organization"
+  },
+  "context": {
+	"id": "<<object>>",
+    "id_handle": "http://localhost:4000/handle/123456789/1119",
+    "ietf:cite-as": "https://doi.org/10.5555/12345680",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "https://another-research-organisation.org/repository/datasets/item/201203421/data_archive.zip",
+      "mediaType": "application/zip",
+      "type": [
+        "Article",
+        "sorg:Dataset"
+      ]
+    }
+  },
+ "id": "urn:uuid:94ecae35-dcfd-4182-8550-22c7164fe24f",
+  "object": {
+    "oldas:object": "https://another-research-organisation.org/repository/datasets/item/201203421/",
+    "as:object": "newValue",
+    "oldas:relationship": "http://purl.org/vocab/frbr/core#supplement",    
+    "as:relationship": "somethingElse",
+    "as:subject": "<<object_handle>>",    
+	"id": "<<object_handle>>",
+    "type": "Relationship"
+  },
+  "origin": {
+    "id": "https://review-service.com/inbox/about/",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "target": {
+    "id": "https://another-research-organisation.org/repository",
+    "inbox": "https://another-research-organisation.org/inbox/",
+    "type": "Service"
+  },
+  "type": [
+    "Announce",
+    "coar-notify:RelationshipAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_review.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_review.json
new file mode 100644
index 0000000000..c5203bee94
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_announce_review.json
@@ -0,0 +1,48 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://review-service.com",
+    "name": "Review Service",
+    "type": "Service"
+  },
+  "context": {
+	"id": "<<object>>",
+	"ietf:cite-as": "https://doi.org/10.5555/12345680",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "https://research-organisation.org/repository/preprint/201203/421/content.pdf",
+      "mediaType": "application/pdf",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "id": "urn:uuid:2f4ec582-109e-4952-a94a-b7d7615a8c69",
+  "inReplyTo": "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed307a509dd",
+  "object": {
+	"id": "<<object_handle>>",
+    "ietf:cite-as": "https://doi.org/10.3214/987654",
+    "type": [
+      "Document",
+      "sorg:Review"
+    ]
+  },
+  "origin": {
+    "id": "https://review-service.com/system",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "target": {
+    "id": "https://generic-service.com/system",
+    "inbox": "https://generic-service.com/system/inbox/",
+    "type": "Service"
+  },
+  "type": [
+    "Announce",
+    "coar-notify:ReviewAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement.json
new file mode 100644
index 0000000000..39f6411a55
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement.json
@@ -0,0 +1,39 @@
+{
+"@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+],
+"actor": {
+    "id": "https://orcid.org/0000-0002-1825-0097",
+    "name": "Josiah Carberry",
+    "type": ["Person"]
+},
+"id": "123456789",
+"object": {
+    "id": "https://overlay-journal.com/articles/00001/",
+    "ietf:cite-as": "https://doi.org/10.5555/12345680",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+        "id": "https://research-organisation.org/repository/preprint/201203/421/content.pdf",
+        "mediaType": "application/pdf",
+        "type": [
+          "Article",
+          "sorg:ScholarlyArticle"
+        ]
+	}
+},
+"origin": {
+    "id": "https://research-organisation.org/repository",
+    "inbox": "https://research-organisation.org/inbox/",
+    "type": "Service"
+},
+"target": {
+    "id": "https://overlay-journal.com/system",
+    "inbox": "https://overlay-journal.com/inbox/",
+    "type": "Service"
+},
+"type": [
+    "Offer",
+    "coar-notify:EndorsementAction"
+]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement_badrequest.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement_badrequest.json
new file mode 100644
index 0000000000..2371fc54c3
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement_badrequest.json
@@ -0,0 +1,39 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://orcid.org/0000-0002-1825-0097",
+    "name": "Josiah Carberry",
+    "type": ["Person"]
+  },
+    "id": "123456789",
+	"object": {
+	    "id": "https://overlay-journal.com/articles/00001/",
+	    "ietf:cite-as": "https://doi.org/10.5555/12345680",
+	    "type": ["sorg:AboutPage"],
+	    "ietf:item": {
+	        "id": "https://research-organisation.org/repository/preprint/201203/421/content.pdf",
+	        "mediaType": "application/pdf",
+	        "type": [
+		        "Article",
+		        "sorg:ScholarlyArticle"
+	      ]
+	    }
+	},
+    "origin": {
+    "id": "https://research-organisation.org/repository",
+    "inbox": "https://research-organisation.org/inbox/",
+    "type": ["Service"]
+  },
+    "target": {
+    "id": "https://overlay-journal.com/system",
+    "inbox": "https://overlay-journal.com/inbox/",
+    "type": ["Service"]
+  },
+	"type": [
+	    "Offer",
+	    "coar-notify:EndorsementAction"
+	  ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement_object.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement_object.json
new file mode 100644
index 0000000000..7af079acba
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_endorsement_object.json
@@ -0,0 +1,38 @@
+{
+    "@context": [
+    "https://www.w3.org/ns/activitystreams", "https://purl.org/coar/notify"
+   	],
+    "actor": {
+        "id": "https://orcid.org/0000-0002-1825-0097",
+        "name": "Josiah Carberry",
+        "type": ["Person"]
+   	},
+    "id": "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed307a509dd",
+    "object": {
+        "id": "<<object>>",
+        "ietf:cite-as": "https://doi.org/10.5555/12345680",
+        "type": ["sorg:AboutPage"],
+        "ietf:item": {
+            "id": "https://research-organisation.org/repository/preprint/201203/421/content.pdf",
+            "mediaType": "application/pdf",
+            "type": [
+	            "Article",
+	            "sorg:ScholarlyArticle"
+	        ]
+        }
+    },
+    "origin": {
+	    "id": "https://research-organisation.org/repository",
+	    "inbox": "https://research-organisation.org/inbox/",
+	    "type": ["Service"]
+    },
+    "target": {
+	    "id": "https://overlay-journal.com/system",
+	    "inbox": "https://overlay-journal.com/inbox/",
+	    "type": ["Service"]
+    },
+    "type": [
+        "Offer",
+        "coar-notify:EndorsementAction"
+    ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review.json
new file mode 100644
index 0000000000..9a20adcda5
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review.json
@@ -0,0 +1,39 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://orcid.org/0000-0002-1825-0097",
+    "name": "Josiah Carberry",
+    "type": "Person"
+  },
+  "id": "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed307a509de",
+  "object": {
+    "id": "<<object_handle>>",
+    "ietf:cite-as": "https://doi.org/10.5555/12345680",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "url.pdf",
+      "mediaType": "applicationpdf",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "origin": {
+    "id": "https://research-organisation.org/repository",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "target": {
+    "id": "https://review-service.com/system",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "type": [
+    "Offer",
+    "coar-notify:ReviewAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review2.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review2.json
new file mode 100644
index 0000000000..973ea946f6
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review2.json
@@ -0,0 +1,39 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://orcid.org/0000-0002-1825-0097",
+    "name": "Josiah Carberry",
+    "type": "Person"
+  },
+  "id": "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed307a509df",
+  "object": {
+    "id": "<<object_handle>>",
+    "ietf:cite-as": "https://doi.org/10.5555/12345680",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "url.pdf",
+      "mediaType": "applicationpdf",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "origin": {
+    "id": "https://research-organisation.org/repository",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "target": {
+    "id": "https://review-service.com/system",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "type": [
+    "Offer",
+    "coar-notify:ReviewAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review3.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review3.json
new file mode 100644
index 0000000000..5b857fa664
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_offer_review3.json
@@ -0,0 +1,39 @@
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "https://orcid.org/0000-0002-1825-0097",
+    "name": "Josiah Carberry",
+    "type": "Person"
+  },
+  "id": "urn:uuid:0370c0fb-bb78-4a9b-87f5-bed308a509da",
+  "object": {
+    "id": "<<object_handle>>",
+    "ietf:cite-as": "https://doi.org/10.5555/12345680",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "url.pdf",
+      "mediaType": "applicationpdf",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "origin": {
+    "id": "https://research-organisation.org/repository",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "target": {
+    "id": "https://review-service.com/system",
+    "inbox": "https://review-service.com/inbox/",
+    "type": "Service"
+  },
+  "type": [
+    "Offer",
+    "coar-notify:ReviewAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_origin_inbox_unregistered.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_origin_inbox_unregistered.json
new file mode 100644
index 0000000000..fdeb340fd2
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ldn_origin_inbox_unregistered.json
@@ -0,0 +1,49 @@
+{
+	"@context": [
+	   "https://www.w3.org/ns/activitystreams",
+	   "https://purl.org/coar/notify"
+	 ],
+	 "actor": {
+	   "id": "https://overlay-journal.com",
+	   "name": "Overlay Journal",
+	   "type": ["Service"]
+	 }, 
+	 "context": {
+		"id": "<<object>>",
+	   "ietf:cite-as": "https://doi.org/10.5555/12345680",
+	   "type": ["sorg:AboutPage"],
+	   "ietf:item": {
+	     "id": "https://research-organisation.org/repository/preprint/201203/421/content.pdf",
+	     "mediaType": "application/pdf",
+	     "type": [
+	       "Article",
+	       "sorg:ScholarlyArticle"
+	     ]
+	   }
+	 },
+	 "id": "urn:uuid:94ecae35-dcfd-4182-8550-22c7164fe23f",
+	 "object": {
+		"id": "<<object_handle>>",
+		"id_oai": "oai:www.openstarts.units.it:<<object_handle>>",
+	    "id_old": "https://review-service.com/review/geo/202103/0021",
+	   "ietf:cite-as": "https://overlay-journal.com/articles/00001/",
+	   "type": [
+	     "Page",
+	     "sorg:WebPage"
+	   ]
+	 },
+	 "origin": {
+	   "id": "https://overlay-journal.com/system",
+	   "inbox": "https://letsfake.it/inbox/",
+	   "type": ["Service"]
+	 },
+	 "target": {
+	   "id": "https://research-organisation.org/repository",
+	   "inbox": "https://research-organisation.org/inbox/",
+	   "type": ["Service"]
+	 },
+	 "type": [
+	   "Announce",
+	   "coar-notify:EndorsementAction"
+	 ]
+ }
\ No newline at end of file
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json
new file mode 100644
index 0000000000..4d0cd97fd5
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-record.json
@@ -0,0 +1,107 @@
+{
+  "id": "https://ror.org/01sps7q28",
+  "name": "The University of Texas Health Science Center at Tyler",
+  "email_address": null,
+  "ip_addresses": [
+    
+  ],
+  "established": 1947,
+  "types": [
+    "Healthcare"
+  ],
+  "relationships": [
+    {
+      "label": "The University of Texas System",
+      "type": "Parent",
+      "id": "https://ror.org/01gek1696"
+    }
+  ],
+  "addresses": [
+    {
+      "lat": 32.426014,
+      "lng": -95.212728,
+      "state": "Texas",
+      "state_code": "US-TX",
+      "city": "Tyler",
+      "geonames_city": {
+        "id": 4738214,
+        "city": "Tyler",
+        "geonames_admin1": {
+          "name": "Texas",
+          "id": 4736286,
+          "ascii_name": "Texas",
+          "code": "US.TX"
+        },
+        "geonames_admin2": {
+          "name": "Smith County",
+          "id": 4729130,
+          "ascii_name": "Smith County",
+          "code": "US.TX.423"
+        },
+        "license": {
+          "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+          "license": "https://creativecommons.org/licenses/by/4.0/"
+        },
+        "nuts_level1": {
+          "name": null,
+          "code": null
+        },
+        "nuts_level2": {
+          "name": null,
+          "code": null
+        },
+        "nuts_level3": {
+          "name": null,
+          "code": null
+        }
+      },
+      "postcode": null,
+      "primary": false,
+      "line": null,
+      "country_geonames_id": 6252001
+    }
+  ],
+  "links": [
+    "https://www.utsystem.edu/institutions/university-texas-health-science-center-tyler"
+  ],
+  "aliases": [
+    "East Texas Tuberculosis Sanitarium",
+    "UT Health Northeast"
+  ],
+  "acronyms": [
+    "UTHSCT"
+  ],
+  "status": "active",
+  "wikipedia_url": "https://en.wikipedia.org/wiki/University_of_Texas_Health_Science_Center_at_Tyler",
+  "labels": [
+    
+  ],
+  "country": {
+    "country_name": "United States",
+    "country_code": "US"
+  },
+  "external_ids": {
+    "ISNI": {
+      "preferred": null,
+      "all": [
+        "0000 0000 9704 5790"
+      ]
+    },
+    "OrgRef": {
+      "preferred": null,
+      "all": [
+        "3446655"
+      ]
+    },
+    "Wikidata": {
+      "preferred": null,
+      "all": [
+        "Q7896437"
+      ]
+    },
+    "GRID": {
+      "preferred": "grid.267310.1",
+      "all": "grid.267310.1"
+    }
+  }
+}
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json
new file mode 100644
index 0000000000..5f93bb7d07
--- /dev/null
+++ b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/ror-records.json
@@ -0,0 +1,2383 @@
+{
+  "number_of_results": 200,
+  "time_taken": 12,
+  "items": [
+    {
+      "id": "https://ror.org/02f6dcw23",
+      "name": "The University of Texas",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1959,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "Audie L. Murphy Memorial VA Hospital",
+          "type": "Related",
+          "id": "https://ror.org/035xhk118"
+        },
+        {
+          "label": "San Antonio Military Medical Center",
+          "type": "Related",
+          "id": "https://ror.org/00m1mwc36"
+        },
+        {
+          "label": "The University of Texas System",
+          "type": "Parent",
+          "id": "https://ror.org/01gek1696"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 29.508129,
+          "lng": -98.574025,
+          "state": "Texas",
+          "state_code": "US-TX",
+          "city": "San Antonio",
+          "geonames_city": {
+            "id": 4726206,
+            "city": "San Antonio",
+            "geonames_admin1": {
+              "name": "Texas",
+              "id": 4736286,
+              "ascii_name": "Texas",
+              "code": "US.TX"
+            },
+            "geonames_admin2": {
+              "name": "Bexar County",
+              "id": 4674023,
+              "ascii_name": "Bexar County",
+              "code": "US.TX.029"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uthscsa.edu/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UTHSCSA"
+      ],
+      "status": "active",
+      "wikipedia_url": "https://en.wikipedia.org/wiki/University_of_Texas_Health_Science_Center_at_San_Antonio",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 0629 5880"
+          ]
+        },
+        "FundRef": {
+          "preferred": "100008635",
+          "all": [
+            "100008635",
+            "100008636"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "1593427"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q4005868"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267309.9",
+          "all": "grid.267309.9"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/01sps7q28",
+      "name": "The University of Texas Health Science Center at Tyler",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1947,
+      "types": [
+        "Healthcare"
+      ],
+      "relationships": [
+        {
+          "label": "The University of Texas System",
+          "type": "Parent",
+          "id": "https://ror.org/01gek1696"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 32.426014,
+          "lng": -95.212728,
+          "state": "Texas",
+          "state_code": "US-TX",
+          "city": "Tyler",
+          "geonames_city": {
+            "id": 4738214,
+            "city": "Tyler",
+            "geonames_admin1": {
+              "name": "Texas",
+              "id": 4736286,
+              "ascii_name": "Texas",
+              "code": "US.TX"
+            },
+            "geonames_admin2": {
+              "name": "Smith County",
+              "id": 4729130,
+              "ascii_name": "Smith County",
+              "code": "US.TX.423"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "https://www.utsystem.edu/institutions/university-texas-health-science-center-tyler"
+      ],
+      "aliases": [
+        "East Texas Tuberculosis Sanitarium",
+        "UT Health Northeast"
+      ],
+      "acronyms": [
+        "UTHSCT"
+      ],
+      "status": "active",
+      "wikipedia_url": "https://en.wikipedia.org/wiki/University_of_Texas_Health_Science_Center_at_Tyler",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0000 9704 5790"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "3446655"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q7896437"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267310.1",
+          "all": "grid.267310.1"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/05byvp690",
+      "name": "The University of Texas Southwestern Medical Center",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1943,
+      "types": [
+        "Healthcare"
+      ],
+      "relationships": [
+        {
+          "label": "Children's Medical Center",
+          "type": "Related",
+          "id": "https://ror.org/02ndk3y82"
+        },
+        {
+          "label": "Parkland Memorial Hospital",
+          "type": "Related",
+          "id": "https://ror.org/0208r0146"
+        },
+        {
+          "label": "VA North Texas Health Care System",
+          "type": "Related",
+          "id": "https://ror.org/01nzxq896"
+        },
+        {
+          "label": "The University of Texas System",
+          "type": "Parent",
+          "id": "https://ror.org/01gek1696"
+        },
+        {
+          "label": "Institute for Exercise and Environmental Medicine",
+          "type": "Child",
+          "id": "https://ror.org/03gqc7y13"
+        },
+        {
+          "label": "Texas Health Dallas",
+          "type": "Child",
+          "id": "https://ror.org/05k07p323"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 32.812185,
+          "lng": -96.840174,
+          "state": "Texas",
+          "state_code": "US-TX",
+          "city": "Dallas",
+          "geonames_city": {
+            "id": 4684888,
+            "city": "Dallas",
+            "geonames_admin1": {
+              "name": "Texas",
+              "id": 4736286,
+              "ascii_name": "Texas",
+              "code": "US.TX"
+            },
+            "geonames_admin2": {
+              "name": "Dallas County",
+              "id": 4684904,
+              "ascii_name": "Dallas County",
+              "code": "US.TX.113"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.utsouthwestern.edu/"
+      ],
+      "aliases": [
+        "UT Southwestern"
+      ],
+      "acronyms": [
+        
+      ],
+      "status": "active",
+      "wikipedia_url": "https://en.wikipedia.org/wiki/University_of_Texas_Southwestern_Medical_Center",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0000 9482 7121"
+          ]
+        },
+        "FundRef": {
+          "preferred": "100007914",
+          "all": [
+            "100007914",
+            "100010487",
+            "100008260"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "617906"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q2725999"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267313.2",
+          "all": "grid.267313.2"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/019kgqr73",
+      "name": "The University of Texas at Arlington",
+      "email_address": "",
+      "ip_addresses": [
+        
+      ],
+      "established": 1895,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "VA North Texas Health Care System",
+          "type": "Related",
+          "id": "https://ror.org/01nzxq896"
+        },
+        {
+          "label": "The University of Texas System",
+          "type": "Parent",
+          "id": "https://ror.org/01gek1696"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 32.731,
+          "lng": -97.115,
+          "state": "Texas",
+          "state_code": "US-TX",
+          "city": "Arlington",
+          "geonames_city": {
+            "id": 4671240,
+            "city": "Arlington",
+            "geonames_admin1": {
+              "name": "Texas",
+              "id": 4736286,
+              "ascii_name": "Texas",
+              "code": "US.TX"
+            },
+            "geonames_admin2": {
+              "name": "Tarrant County",
+              "id": 4735638,
+              "ascii_name": "Tarrant County",
+              "code": "US.TX.439"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uta.edu/uta/"
+      ],
+      "aliases": [
+        "UT Arlington"
+      ],
+      "acronyms": [
+        "UTA"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Texas_at_Arlington",
+      "labels": [
+        {
+          "label": "Université du Texas à Arlington",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 2181 9515"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "100009497"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "906409"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q1230739"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267315.4",
+          "all": "grid.267315.4"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/051smbs96",
+      "name": "The University of Texas of the Permian Basin",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1973,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "The University of Texas System",
+          "type": "Parent",
+          "id": "https://ror.org/01gek1696"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 31.889444,
+          "lng": -102.329531,
+          "state": "Texas",
+          "state_code": "US-TX",
+          "city": "Odessa",
+          "geonames_city": {
+            "id": 5527554,
+            "city": "Odessa",
+            "geonames_admin1": {
+              "name": "Texas",
+              "id": 4736286,
+              "ascii_name": "Texas",
+              "code": "US.TX"
+            },
+            "geonames_admin2": {
+              "name": "Ector County",
+              "id": 5520910,
+              "ascii_name": "Ector County",
+              "code": "US.TX.135"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.utpb.edu/"
+      ],
+      "aliases": [
+        "UT Permian Basin"
+      ],
+      "acronyms": [
+        "UTPB"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Texas_of_the_Permian_Basin",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0000 9140 1491"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "1419441"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q2495935"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267328.a",
+          "all": "grid.267328.a"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/044vy1d05",
+      "name": "Tokushima University",
+      "email_address": "",
+      "ip_addresses": [
+        
+      ],
+      "established": 1949,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "Tokushima University Hospital",
+          "type": "Related",
+          "id": "https://ror.org/021ph5e41"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 34.07,
+          "lng": 134.56,
+          "state": null,
+          "state_code": null,
+          "city": "Tokushima",
+          "geonames_city": {
+            "id": 1850158,
+            "city": "Tokushima",
+            "geonames_admin1": {
+              "name": "Tokushima",
+              "id": 1850157,
+              "ascii_name": "Tokushima",
+              "code": "JP.39"
+            },
+            "geonames_admin2": {
+              "name": "Tokushima Shi",
+              "id": 1850156,
+              "ascii_name": "Tokushima Shi",
+              "code": "JP.39.1850156"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 1861060
+        }
+      ],
+      "links": [
+        "https://www.tokushima-u.ac.jp/"
+      ],
+      "aliases": [
+        "Tokushima Daigaku",
+        "University of Tokushima"
+      ],
+      "acronyms": [
+        
+      ],
+      "status": "active",
+      "wikipedia_url": "https://en.wikipedia.org/wiki/University_of_Tokushima",
+      "labels": [
+        {
+          "label": "徳島大学",
+          "iso639": "ja"
+        }
+      ],
+      "country": {
+        "country_name": "Japan",
+        "country_code": "JP"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 1092 3579"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "501100005623"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "15696836"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q1150231"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267335.6",
+          "all": "grid.267335.6"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/03np13864",
+      "name": "University of Trinidad and Tobago",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 2004,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        
+      ],
+      "addresses": [
+        {
+          "lat": 10.616667,
+          "lng": -61.216667,
+          "state": null,
+          "state_code": null,
+          "city": "Arima",
+          "geonames_city": {
+            "id": 3575051,
+            "city": "Arima",
+            "geonames_admin1": {
+              "name": "Borough of Arima",
+              "id": 3575052,
+              "ascii_name": "Borough of Arima",
+              "code": "TT.01"
+            },
+            "geonames_admin2": {
+              "name": null,
+              "id": null,
+              "ascii_name": null,
+              "code": null
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 3573591
+        }
+      ],
+      "links": [
+        "https://utt.edu.tt/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UTT"
+      ],
+      "status": "active",
+      "wikipedia_url": "https://en.wikipedia.org/wiki/University_of_Trinidad_and_Tobago",
+      "labels": [
+        {
+          "label": "Universidad de Trinidad y Tobago",
+          "iso639": "es"
+        }
+      ],
+      "country": {
+        "country_name": "Trinidad and Tobago",
+        "country_code": "TT"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0000 9490 0886"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "8706288"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q648244"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267355.0",
+          "all": "grid.267355.0"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/04wn28048",
+      "name": "University of Tulsa",
+      "email_address": "",
+      "ip_addresses": [
+        
+      ],
+      "established": 1894,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        
+      ],
+      "addresses": [
+        {
+          "lat": 36.152222,
+          "lng": -95.946389,
+          "state": "Oklahoma",
+          "state_code": "US-OK",
+          "city": "Tulsa",
+          "geonames_city": {
+            "id": 4553433,
+            "city": "Tulsa",
+            "geonames_admin1": {
+              "name": "Oklahoma",
+              "id": 4544379,
+              "ascii_name": "Oklahoma",
+              "code": "US.OK"
+            },
+            "geonames_admin2": {
+              "name": "Tulsa County",
+              "id": 4553440,
+              "ascii_name": "Tulsa County",
+              "code": "US.OK.143"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://utulsa.edu/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "TU"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Tulsa",
+      "labels": [
+        {
+          "label": "Université de tulsa",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 2160 264X"
+          ]
+        },
+        "FundRef": {
+          "preferred": "100007147",
+          "all": [
+            "100007147",
+            "100006455"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "32043"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q1848657"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267360.6",
+          "all": "grid.267360.6"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/04scfb908",
+      "name": "Alfred Health",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1871,
+      "types": [
+        "Healthcare"
+      ],
+      "relationships": [
+        {
+          "label": "Caulfield Hospital",
+          "type": "Child",
+          "id": "https://ror.org/01fcxf261"
+        },
+        {
+          "label": "Melbourne Sexual Health Centre",
+          "type": "Child",
+          "id": "https://ror.org/013fdz725"
+        },
+        {
+          "label": "National Trauma Research Institute",
+          "type": "Child",
+          "id": "https://ror.org/048t93218"
+        },
+        {
+          "label": "The Alfred Hospital",
+          "type": "Child",
+          "id": "https://ror.org/01wddqe20"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": -37.845542,
+          "lng": 144.981632,
+          "state": "Victoria",
+          "state_code": "AU-VIC",
+          "city": "Melbourne",
+          "geonames_city": {
+            "id": 2158177,
+            "city": "Melbourne",
+            "geonames_admin1": {
+              "name": "Victoria",
+              "id": 2145234,
+              "ascii_name": "Victoria",
+              "code": "AU.07"
+            },
+            "geonames_admin2": {
+              "name": "Melbourne",
+              "id": 7839805,
+              "ascii_name": "Melbourne",
+              "code": "AU.07.24600"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 2077456
+        }
+      ],
+      "links": [
+        "http://www.alfred.org.au/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        
+      ],
+      "status": "active",
+      "wikipedia_url": "",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "Australia",
+        "country_code": "AU"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0004 0432 5259"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "501100002716"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267362.4",
+          "all": "grid.267362.4"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/02c2f8975",
+      "name": "University of Ulsan",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1970,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "Ulsan University Hospital",
+          "type": "Related",
+          "id": "https://ror.org/03sab2a45"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 35.542772,
+          "lng": 129.256725,
+          "state": null,
+          "state_code": null,
+          "city": "Ulsan",
+          "geonames_city": {
+            "id": 1833747,
+            "city": "Ulsan",
+            "geonames_admin1": {
+              "name": "Ulsan",
+              "id": 1833742,
+              "ascii_name": "Ulsan",
+              "code": "KR.21"
+            },
+            "geonames_admin2": {
+              "name": null,
+              "id": null,
+              "ascii_name": null,
+              "code": null
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 1835841
+        }
+      ],
+      "links": [
+        "http://en.ulsan.ac.kr/contents/main/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UOU"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Ulsan",
+      "labels": [
+        {
+          "label": "울산대학교",
+          "iso639": "ko"
+        }
+      ],
+      "country": {
+        "country_name": "South Korea",
+        "country_code": "KR"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0004 0533 4667"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "501100002568"
+          ]
+        },
+        "OrgRef": {
+          "preferred": "10458246",
+          "all": [
+            "10458246",
+            "15162872"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q491717"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267370.7",
+          "all": "grid.267370.7"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/010acrp16",
+      "name": "University of West Alabama",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1835,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        
+      ],
+      "addresses": [
+        {
+          "lat": 32.59,
+          "lng": -88.186,
+          "state": "Alabama",
+          "state_code": "US-AL",
+          "city": "Livingston",
+          "geonames_city": {
+            "id": 4073383,
+            "city": "Livingston",
+            "geonames_admin1": {
+              "name": "Alabama",
+              "id": 4829764,
+              "ascii_name": "Alabama",
+              "code": "US.AL"
+            },
+            "geonames_admin2": {
+              "name": "Sumter County",
+              "id": 4092386,
+              "ascii_name": "Sumter County",
+              "code": "US.AL.119"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uwa.edu/"
+      ],
+      "aliases": [
+        "Livingston Female Academy"
+      ],
+      "acronyms": [
+        "UWA"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_West_Alabama",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0000 9963 9197"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "2425212"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q637346"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267434.0",
+          "all": "grid.267434.0"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/002w4zy91",
+      "name": "University of West Florida",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1963,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "State University System of Florida",
+          "type": "Parent",
+          "id": "https://ror.org/05sqd3t97"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 30.549493,
+          "lng": -87.21812,
+          "state": "Florida",
+          "state_code": "US-FL",
+          "city": "Pensacola",
+          "geonames_city": {
+            "id": 4168228,
+            "city": "Pensacola",
+            "geonames_admin1": {
+              "name": "Florida",
+              "id": 4155751,
+              "ascii_name": "Florida",
+              "code": "US.FL"
+            },
+            "geonames_admin2": {
+              "name": "Escambia County",
+              "id": 4154550,
+              "ascii_name": "Escambia County",
+              "code": "US.FL.033"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://uwf.edu/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UWF"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_West_Florida",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 2112 2427"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "100009842"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "750756"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q659255"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267436.2",
+          "all": "grid.267436.2"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/01cqxk816",
+      "name": "University of West Georgia",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1906,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "University System of Georgia",
+          "type": "Parent",
+          "id": "https://ror.org/017wcm924"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 33.573357,
+          "lng": -85.099593,
+          "state": "Georgia",
+          "state_code": "US-GA",
+          "city": "Carrollton",
+          "geonames_city": {
+            "id": 4186416,
+            "city": "Carrollton",
+            "geonames_admin1": {
+              "name": "Georgia",
+              "id": 4197000,
+              "ascii_name": "Georgia",
+              "code": "US.GA"
+            },
+            "geonames_admin2": {
+              "name": "Carroll County",
+              "id": 4186396,
+              "ascii_name": "Carroll County",
+              "code": "US.GA.045"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.westga.edu/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UWG"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_West_Georgia",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 2223 6696"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "100007922"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "595315"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q2495945"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267437.3",
+          "all": "grid.267437.3"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/03c8vvr84",
+      "name": "University of Western States",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1904,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        
+      ],
+      "addresses": [
+        {
+          "lat": 45.543351,
+          "lng": -122.523973,
+          "state": "Oregon",
+          "state_code": "US-OR",
+          "city": "Portland",
+          "geonames_city": {
+            "id": 5746545,
+            "city": "Portland",
+            "geonames_admin1": {
+              "name": "Oregon",
+              "id": 5744337,
+              "ascii_name": "Oregon",
+              "code": "US.OR"
+            },
+            "geonames_admin2": {
+              "name": "Multnomah County",
+              "id": 5742126,
+              "ascii_name": "Multnomah County",
+              "code": "US.OR.051"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uws.edu/"
+      ],
+      "aliases": [
+        "Western States Chiropractic College"
+      ],
+      "acronyms": [
+        "UWS"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Western_States",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0004 0455 9493"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "1655050"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q7896612"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267451.3",
+          "all": "grid.267451.3"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/03fmjzx88",
+      "name": "University of Winchester",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1840,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        
+      ],
+      "addresses": [
+        {
+          "lat": 51.060338,
+          "lng": -1.325418,
+          "state": null,
+          "state_code": null,
+          "city": "Winchester",
+          "geonames_city": {
+            "id": 2633858,
+            "city": "Winchester",
+            "geonames_admin1": {
+              "name": "England",
+              "id": 6269131,
+              "ascii_name": "England",
+              "code": "GB.ENG"
+            },
+            "geonames_admin2": {
+              "name": "Hampshire",
+              "id": 2647554,
+              "ascii_name": "Hampshire",
+              "code": "GB.ENG.F2"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": "SOUTH EAST (ENGLAND)",
+              "code": "UKJ"
+            },
+            "nuts_level2": {
+              "name": "Hampshire and Isle of Wight",
+              "code": "UKJ3"
+            },
+            "nuts_level3": {
+              "name": "Central Hampshire",
+              "code": "UKJ36"
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 2635167
+        }
+      ],
+      "links": [
+        "http://www.winchester.ac.uk/pages/home.aspx"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Winchester",
+      "labels": [
+        
+      ],
+      "country": {
+        "country_name": "United Kingdom",
+        "country_code": "GB"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0000 9422 2878"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "100010057"
+          ]
+        },
+        "HESA": {
+          "preferred": null,
+          "all": [
+            "0021"
+          ]
+        },
+        "UCAS": {
+          "preferred": null,
+          "all": [
+            "W76"
+          ]
+        },
+        "UKPRN": {
+          "preferred": null,
+          "all": [
+            "10003614"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "3140939"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q3551690"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267454.6",
+          "all": "grid.267454.6"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/01gw3d370",
+      "name": "University of Windsor",
+      "email_address": "",
+      "ip_addresses": [
+        
+      ],
+      "established": 1857,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        
+      ],
+      "addresses": [
+        {
+          "lat": 42.305196,
+          "lng": -83.067483,
+          "state": "Ontario",
+          "state_code": "CA-ON",
+          "city": "Windsor",
+          "geonames_city": {
+            "id": 6182962,
+            "city": "Windsor",
+            "geonames_admin1": {
+              "name": "Ontario",
+              "id": 6093943,
+              "ascii_name": "Ontario",
+              "code": "CA.08"
+            },
+            "geonames_admin2": {
+              "name": null,
+              "id": null,
+              "ascii_name": null,
+              "code": null
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6251999
+        }
+      ],
+      "links": [
+        "http://www.uwindsor.ca/"
+      ],
+      "aliases": [
+        "UWindsor",
+        "Assumption University of Windsor"
+      ],
+      "acronyms": [
+        
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Windsor",
+      "labels": [
+        {
+          "label": "Université de windsor",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "Canada",
+        "country_code": "CA"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0004 1936 9596"
+          ]
+        },
+        "FundRef": {
+          "preferred": "100009154",
+          "all": [
+            "100009154",
+            "501100000083"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "342733"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q2065769"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267455.7",
+          "all": "grid.267455.7"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/02gdzyx04",
+      "name": "University of Winnipeg",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1871,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "Winnipeg Institute for Theoretical Physics",
+          "type": "Child",
+          "id": "https://ror.org/010tw2j24"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 49.890122,
+          "lng": -97.153367,
+          "state": "Manitoba",
+          "state_code": "CA-MB",
+          "city": "Winnipeg",
+          "geonames_city": {
+            "id": 6183235,
+            "city": "Winnipeg",
+            "geonames_admin1": {
+              "name": "Manitoba",
+              "id": 6065171,
+              "ascii_name": "Manitoba",
+              "code": "CA.03"
+            },
+            "geonames_admin2": {
+              "name": null,
+              "id": null,
+              "ascii_name": null,
+              "code": null
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6251999
+        }
+      ],
+      "links": [
+        "http://www.uwinnipeg.ca/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Winnipeg",
+      "labels": [
+        {
+          "label": "Université de winnipeg",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "Canada",
+        "country_code": "CA"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 1703 4731"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "100009367"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "587404"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q472167"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267457.5",
+          "all": "grid.267457.5"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/03mnm0t94",
+      "name": "University of Wisconsin–Eau Claire",
+      "email_address": "",
+      "ip_addresses": [
+        
+      ],
+      "established": 1916,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "University of Wisconsin System",
+          "type": "Parent",
+          "id": "https://ror.org/03ydkyb10"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 44.79895,
+          "lng": -91.499346,
+          "state": "Wisconsin",
+          "state_code": "US-WI",
+          "city": "Eau Claire",
+          "geonames_city": {
+            "id": 5251436,
+            "city": "Eau Claire",
+            "geonames_admin1": {
+              "name": "Wisconsin",
+              "id": 5279468,
+              "ascii_name": "Wisconsin",
+              "code": "US.WI"
+            },
+            "geonames_admin2": {
+              "name": "Eau Claire County",
+              "id": 5251439,
+              "ascii_name": "Eau Claire County",
+              "code": "US.WI.035"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uwec.edu/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UWEC"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Wisconsin%E2%80%93Eau_Claire",
+      "labels": [
+        {
+          "label": "Université du Wisconsin à Eau Claire",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 2227 2494"
+          ]
+        },
+        "FundRef": {
+          "preferred": null,
+          "all": [
+            "100010315"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "496729"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q3551771"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267460.1",
+          "all": "grid.267460.1"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/05hbexn54",
+      "name": "University of Wisconsin–Green Bay",
+      "email_address": null,
+      "ip_addresses": [
+        
+      ],
+      "established": 1965,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "University of Wisconsin System",
+          "type": "Parent",
+          "id": "https://ror.org/03ydkyb10"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 44.533203,
+          "lng": -87.921521,
+          "state": "Wisconsin",
+          "state_code": "US-WI",
+          "city": "Green Bay",
+          "geonames_city": {
+            "id": 5254962,
+            "city": "Green Bay",
+            "geonames_admin1": {
+              "name": "Wisconsin",
+              "id": 5279468,
+              "ascii_name": "Wisconsin",
+              "code": "US.WI"
+            },
+            "geonames_admin2": {
+              "name": "Brown County",
+              "id": 5246898,
+              "ascii_name": "Brown County",
+              "code": "US.WI.009"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uwgb.edu/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UWGB"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Wisconsin%E2%80%93Green_Bay",
+      "labels": [
+        {
+          "label": "Université du Wisconsin–Green Bay",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 0559 7692"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "1513886"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q2378091"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267461.0",
+          "all": "grid.267461.0"
+        }
+      }
+    },
+    {
+      "id": "https://ror.org/00x8ccz20",
+      "name": "University of Wisconsin–La Crosse",
+      "email_address": "",
+      "ip_addresses": [
+        
+      ],
+      "established": 1909,
+      "types": [
+        "Education"
+      ],
+      "relationships": [
+        {
+          "label": "University of Wisconsin System",
+          "type": "Parent",
+          "id": "https://ror.org/03ydkyb10"
+        }
+      ],
+      "addresses": [
+        {
+          "lat": 43.815576,
+          "lng": -91.233517,
+          "state": "Wisconsin",
+          "state_code": "US-WI",
+          "city": "La Crosse",
+          "geonames_city": {
+            "id": 5258957,
+            "city": "La Crosse",
+            "geonames_admin1": {
+              "name": "Wisconsin",
+              "id": 5279468,
+              "ascii_name": "Wisconsin",
+              "code": "US.WI"
+            },
+            "geonames_admin2": {
+              "name": "La Crosse County",
+              "id": 5258961,
+              "ascii_name": "La Crosse County",
+              "code": "US.WI.063"
+            },
+            "license": {
+              "attribution": "Data from geonames.org under a CC-BY 4.0 license",
+              "license": "https://creativecommons.org/licenses/by/4.0/"
+            },
+            "nuts_level1": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level2": {
+              "name": null,
+              "code": null
+            },
+            "nuts_level3": {
+              "name": null,
+              "code": null
+            }
+          },
+          "postcode": null,
+          "primary": false,
+          "line": null,
+          "country_geonames_id": 6252001
+        }
+      ],
+      "links": [
+        "http://www.uwlax.edu/Home/Future-Students/"
+      ],
+      "aliases": [
+        
+      ],
+      "acronyms": [
+        "UW–L"
+      ],
+      "status": "active",
+      "wikipedia_url": "http://en.wikipedia.org/wiki/University_of_Wisconsin%E2%80%93La_Crosse",
+      "labels": [
+        {
+          "label": "Université du Wisconsin–La Crosse",
+          "iso639": "fr"
+        }
+      ],
+      "country": {
+        "country_name": "United States",
+        "country_code": "US"
+      },
+      "external_ids": {
+        "ISNI": {
+          "preferred": null,
+          "all": [
+            "0000 0001 2169 5137"
+          ]
+        },
+        "OrgRef": {
+          "preferred": null,
+          "all": [
+            "2422287"
+          ]
+        },
+        "Wikidata": {
+          "preferred": null,
+          "all": [
+            "Q2688358"
+          ]
+        },
+        "GRID": {
+          "preferred": "grid.267462.3",
+          "all": "grid.267462.3"
+        }
+      }
+    }
+  ],
+  "meta": {
+    "types": [
+      {
+        "id": "company",
+        "title": "Company",
+        "count": 29790
+      },
+      {
+        "id": "education",
+        "title": "Education",
+        "count": 20325
+      },
+      {
+        "id": "nonprofit",
+        "title": "Nonprofit",
+        "count": 14187
+      },
+      {
+        "id": "healthcare",
+        "title": "Healthcare",
+        "count": 13107
+      },
+      {
+        "id": "facility",
+        "title": "Facility",
+        "count": 10080
+      },
+      {
+        "id": "other",
+        "title": "Other",
+        "count": 8369
+      },
+      {
+        "id": "government",
+        "title": "Government",
+        "count": 6511
+      },
+      {
+        "id": "archive",
+        "title": "Archive",
+        "count": 2967
+      }
+    ],
+    "countries": [
+      {
+        "id": "us",
+        "title": "United States",
+        "count": 31196
+      },
+      {
+        "id": "gb",
+        "title": "United Kingdom",
+        "count": 7410
+      },
+      {
+        "id": "de",
+        "title": "Germany",
+        "count": 5189
+      },
+      {
+        "id": "cn",
+        "title": "China",
+        "count": 4846
+      },
+      {
+        "id": "fr",
+        "title": "France",
+        "count": 4344
+      },
+      {
+        "id": "jp",
+        "title": "Japan",
+        "count": 3940
+      },
+      {
+        "id": "ca",
+        "title": "Canada",
+        "count": 3392
+      },
+      {
+        "id": "in",
+        "title": "India",
+        "count": 3075
+      },
+      {
+        "id": "cz",
+        "title": "Czech Republic",
+        "count": 2780
+      },
+      {
+        "id": "ru",
+        "title": "Russia",
+        "count": 2109
+      }
+    ],
+    "statuses": [
+      {
+        "id": "active",
+        "title": "active",
+        "count": 105336
+      }
+    ]
+  }
+}
diff --git a/dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-responce.xml b/dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-response.xml
similarity index 100%
rename from dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-responce.xml
rename to dspace-server-webapp/src/test/resources/org/dspace/app/rest/wos-response.xml
diff --git a/dspace-services/pom.xml b/dspace-services/pom.xml
index 98e0253a49..52e975b5af 100644
--- a/dspace-services/pom.xml
+++ b/dspace-services/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
     </parent>
 
     <properties>
@@ -69,7 +69,7 @@
                                 <!-- ${agnostic.build.dir} is set dynamically by groovy-maven-plugin above -->
                                 <!-- For "dspace-services" we don't need a full test environment, we just need
                                      a valid "config-definition.xml" which exists in target/test-classes/ -->
-                                <dspace.dir>${agnostic.build.dir}/test-classes/</dspace.dir>
+                                <dspace.dir>${agnostic.build.dir}/test-classes</dspace.dir>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
@@ -79,6 +79,11 @@
     </profiles>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>${log4j.version}</version>
+        </dependency>
         <!-- spring service manager -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -92,13 +97,18 @@
         </dependency>
         <!-- for filters -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.angus</groupId>
+            <artifactId>jakarta.mail</artifactId>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -143,8 +153,8 @@
             <artifactId>commons-io</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
         </dependency>
 
         <dependency>
diff --git a/dspace-services/src/main/java/org/dspace/kernel/DSpaceKernelManager.java b/dspace-services/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
index 1f86c16b29..c85df9ee6c 100644
--- a/dspace-services/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
+++ b/dspace-services/src/main/java/org/dspace/kernel/DSpaceKernelManager.java
@@ -22,8 +22,8 @@ import javax.management.ObjectName;
 import javax.management.ReflectionException;
 
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 
 /**
@@ -32,11 +32,11 @@ import org.slf4j.LoggerFactory;
  * @author Aaron Zeckoski (azeckoski @ gmail.com)
  */
 public final class DSpaceKernelManager {
-    private static Logger log = LoggerFactory.getLogger(DSpaceKernelManager.class);
+    private static final Logger log = LogManager.getLogger();
 
     private static DSpaceKernel defaultKernel = null;
 
-    private static Map<String, DSpaceKernel> namedKernelMap = new HashMap<String, DSpaceKernel>();
+    private static final Map<String, DSpaceKernel> namedKernelMap = new HashMap<>();
 
 
     public static DSpaceKernel getDefaultKernel() {
@@ -50,7 +50,7 @@ public final class DSpaceKernelManager {
     /**
      * A lock on the kernel to handle multiple threads getting the first item.
      */
-    private Object lock = new Object();
+    private final Object lock = new Object();
 
     /**
      * Get the kernel.  This will be a single instance for the JVM, but
@@ -126,7 +126,7 @@ public final class DSpaceKernelManager {
     /**
      * Static initialized random default Kernel name
      */
-    private static String defaultKernelName = UUID.randomUUID().toString();
+    private static final String defaultKernelName = UUID.randomUUID().toString();
 
     /**
      * Ensure that we have a name suitable for an mbean.
@@ -162,7 +162,8 @@ public final class DSpaceKernelManager {
                 if (!mbs.isRegistered(name)) {
                     // register the MBean
                     mbs.registerMBean(kernel, name);
-                    log.info("Registered new Kernel MBEAN: " + checkedMBeanName + " [" + kernel + "]");
+                    log.info("Registered new Kernel MBEAN: {} [{}]",
+                            checkedMBeanName, kernel);
                 }
             } catch (MalformedObjectNameException e) {
                 throw new IllegalStateException(e);
@@ -197,7 +198,7 @@ public final class DSpaceKernelManager {
                 return true;
             } catch (Exception e) {
                 //log this issue as a System Warning. Also log the underlying error message.
-                log.warn("Failed to unregister the MBean: " + checkedMBeanName, e);
+                log.warn("Failed to unregister the MBean: {}", checkedMBeanName, e);
                 return false;
             }
         }
diff --git a/dspace-services/src/main/java/org/dspace/kernel/ServiceManager.java b/dspace-services/src/main/java/org/dspace/kernel/ServiceManager.java
index e4cca677c7..c37b5d9b40 100644
--- a/dspace-services/src/main/java/org/dspace/kernel/ServiceManager.java
+++ b/dspace-services/src/main/java/org/dspace/kernel/ServiceManager.java
@@ -76,6 +76,18 @@ public interface ServiceManager {
      */
     public List<String> getServicesNames();
 
+    /**
+     * Allows developers to get the desired service singleton by the provided type. <br>
+     * This should return all instantiated objects of the type specified with their names
+     * (may not all be singletons).
+     *
+     * @param <T>  Class type
+     * @param type the type for the requested service (this will typically be the interface class but can be concrete
+     *            as well)
+     * @return map with service's name and service singletons
+     */
+    public <T> Map<String, T> getServicesWithNamesByType(Class<T> type);
+
     /**
      * Allows adding singleton services and providers in at runtime or
      * after the service manager has started up.
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java b/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
index 461e3fbf0f..e07e573ace 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelImpl.java
@@ -23,6 +23,8 @@ import javax.management.modelmbean.ModelMBeanAttributeInfo;
 import javax.management.modelmbean.ModelMBeanInfoSupport;
 import javax.management.modelmbean.ModelMBeanOperationInfo;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.kernel.DSpaceKernel;
 import org.dspace.kernel.DSpaceKernelManager;
 import org.dspace.kernel.ServiceManager;
@@ -30,15 +32,13 @@ import org.dspace.servicemanager.config.DSpaceConfigurationService;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.KernelStartupCallbackService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This is the kernel implementation which starts up the core of DSpace,
  * registers the mbean, and initializes the DSpace object.
  * It also loads up the configuration.  Sets a JRE shutdown hook.
  * <p>
- * Note that this does not start itself and calling the constuctor does
+ * Note that this does not start itself and calling the constructor does
  * not actually start it up either. It has to be explicitly started by
  * calling the start method so something in the system needs to do that.
  * If the bean is already started then calling start on it again has no
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  */
 public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
 
-    private static Logger log = LoggerFactory.getLogger(DSpaceKernelImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Creates a DSpace Kernel, does not do any checks though.
@@ -75,7 +75,7 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
             synchronized (lock) {
                 // No shutdown hook registered yet
                 this.shutdownHook = new Thread() {
-                    public void run() {
+                    @Override public void run() {
                         doDestroy();
                     }
                 };
@@ -86,12 +86,14 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
 
     private ConfigurationService configurationService;
 
+    @Override
     public ConfigurationService getConfigurationService() {
         return configurationService;
     }
 
     private ServiceManagerSystem serviceManagerSystem;
 
+    @Override
     public ServiceManager getServiceManager() {
         return serviceManagerSystem;
     }
@@ -99,6 +101,7 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
     /* (non-Javadoc)
      * @see org.dspace.kernel.DSpaceKernel#getMBeanName()
      */
+    @Override
     public String getMBeanName() {
         return mBeanName;
     }
@@ -106,6 +109,7 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
     /* (non-Javadoc)
      * @see org.dspace.kernel.DSpaceKernel#isRunning()
      */
+    @Override
     public boolean isRunning() {
         synchronized (lock) {
             return running;
@@ -115,6 +119,7 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
     /* (non-Javadoc)
      * @see org.dspace.kernel.CommonLifecycle#getManagedBean()
      */
+    @Override
     public DSpaceKernel getManagedBean() {
         synchronized (lock) {
             return kernel;
@@ -124,6 +129,7 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
     /* (non-Javadoc)
      * @see org.dspace.kernel.CommonLifecycle#start()
      */
+    @Override
     public void start() {
         start(null);
     }
@@ -170,12 +176,14 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
             // add in the shutdown hook
             registerShutdownHook();
         }
-        log.info("DSpace kernel startup completed in " + loadTime + " ms and registered as MBean: " + mBeanName);
+        log.info("DSpace kernel startup completed in {} ms and registered as MBean: {}",
+                loadTime, mBeanName);
     }
 
     /* (non-Javadoc)
      * @see org.dspace.kernel.CommonLifecycle#stop()
      */
+    @Override
     public void stop() {
         if (!running) {
             //log.warn("Kernel ("+this+") is already stopped");
@@ -251,7 +259,8 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
         try {
             doDestroy();
         } catch (Exception e) {
-            log.error("WARN Failure attempting to cleanup the DSpace kernel: " + e.getMessage(), e);
+            log.error("WARN Failure attempting to cleanup the DSpace kernel: {}",
+                    e.getMessage(), e);
         }
         super.finalize();
     }
@@ -287,11 +296,13 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
         return loadTime;
     }
 
+    @Override
     public Object invoke(String actionName, Object[] params, String[] signature)
         throws MBeanException, ReflectionException {
         return this;
     }
 
+    @Override
     public MBeanInfo getMBeanInfo() {
         Descriptor lastLoadDateDesc = new DescriptorSupport(new String[] {"name=LastLoadDate",
             "descriptorType=attribute", "default=0", "displayName=Last Load Date",
@@ -319,6 +330,7 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
         return new ModelMBeanInfoSupport(this.getClass().getName(), "DSpace Kernel", mmbai, null, mmboi, null);
     }
 
+    @Override
     public Object getAttribute(String attribute)
         throws AttributeNotFoundException, MBeanException, ReflectionException {
         if ("LastLoadDate".equals(attribute)) {
@@ -329,16 +341,19 @@ public final class DSpaceKernelImpl implements DSpaceKernel, DynamicMBean {
         throw new AttributeNotFoundException("invalid attribute: " + attribute);
     }
 
+    @Override
     public AttributeList getAttributes(String[] attributes) {
         // TODO Auto-generated method stub
         return null;
     }
 
+    @Override
     public void setAttribute(Attribute attribute) throws AttributeNotFoundException,
         InvalidAttributeValueException, MBeanException, ReflectionException {
         throw new InvalidAttributeValueException("Cannot set attribute: " + attribute);
     }
 
+    @Override
     public AttributeList setAttributes(AttributeList attributes) {
         // TODO Auto-generated method stub
         return null;
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java b/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
index f8df74d34c..5a56da3474 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceKernelInit.java
@@ -7,10 +7,10 @@
  */
 package org.dspace.servicemanager;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.kernel.DSpaceKernel;
 import org.dspace.kernel.DSpaceKernelManager;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class simplifies the handling of lookup, registration, and
@@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DSpaceKernelInit {
 
-    private static Logger log = LoggerFactory.getLogger(DSpaceKernelInit.class);
+    private static final Logger log = LogManager.getLogger(DSpaceKernelInit.class);
 
     private static final Object staticLock = new Object();
 
@@ -57,7 +57,7 @@ public class DSpaceKernelInit {
 
         synchronized (staticLock) {
             DSpaceKernelImpl kernelImpl = new DSpaceKernelImpl(name);
-            log.info("Created new kernel: " + kernelImpl);
+            log.info("Created new kernel: {}", kernelImpl);
 
             if (name != null) {
                 DSpaceKernelManager.registerMBean(kernelImpl.getMBeanName(), kernelImpl);
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java b/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
index 6cffa7ee66..ce5e91576f 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/DSpaceServiceManager.java
@@ -20,8 +20,8 @@ import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PreDestroy;
 
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -226,17 +226,12 @@ public final class DSpaceServiceManager implements ServiceManagerSystem {
 
         if (applicationContext != null) {
             try {
+                // This both closes the context and destroys all beans related to it
                 applicationContext.close();
             } catch (Exception e) {
                 // keep going anyway
                 log.warn("Exception closing ApplicationContext:  {}", e.getMessage(), e);
             }
-            try {
-                applicationContext.destroy();
-            } catch (Exception e) {
-                // keep going anyway
-                log.warn("Exception destroying ApplicationContext:  {}", e.getMessage(), e);
-            }
             applicationContext = null;
         }
 
@@ -504,6 +499,21 @@ public final class DSpaceServiceManager implements ServiceManagerSystem {
         return beanNames;
     }
 
+    @Override
+    public <T> Map<String, T> getServicesWithNamesByType(Class<T> type) {
+        checkRunning();
+
+        if (type == null) {
+            throw new IllegalArgumentException("type cannot be null");
+        }
+
+        try {
+            return applicationContext.getBeansOfType(type, true, true);
+        } catch (BeansException e) {
+            throw new RuntimeException("Failed to get beans of type (" + type + "): " + e.getMessage(), e);
+        }
+    }
+
     @Override
     public boolean isServiceExists(String name) {
         checkRunning();
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java b/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
index c20ee19628..9789deb845 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceConfigurationService.java
@@ -30,9 +30,9 @@ import org.apache.commons.configuration2.builder.fluent.Parameters;
 import org.apache.commons.configuration2.convert.DefaultListDelimiterHandler;
 import org.apache.commons.configuration2.event.Event;
 import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.services.ConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.SimpleTypeConverter;
 import org.springframework.core.io.ClassPathResource;
 
@@ -47,7 +47,7 @@ import org.springframework.core.io.ClassPathResource;
  */
 public final class DSpaceConfigurationService implements ConfigurationService {
 
-    private static final Logger log = LoggerFactory.getLogger(DSpaceConfigurationService.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String DSPACE = "dspace";
     public static final String EXT_CONFIG = "cfg";
@@ -153,7 +153,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
         try {
             return this.configurationBuilder.getConfiguration();
         } catch (ConfigurationException ce) {
-            log.error("Unable to get configuration object based on definition at " + this.configDefinition);
+            log.error("Unable to get configuration object based on definition at {}", this.configDefinition);
             System.err.println("Unable to get configuration object based on definition at " + this.configDefinition);
             throw new RuntimeException(ce);
         }
@@ -385,7 +385,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
             if (value == null && oldValue != null) {
                 changed = true;
                 getConfiguration().clearProperty(name);
-                log.info("Cleared the configuration setting for name (" + name + ")");
+                log.info("Cleared the configuration setting for name ({})", name);
             } else if (value != null && !value.equals(oldValue)) {
                 changed = true;
                 getConfiguration().setProperty(name, value);
@@ -522,12 +522,13 @@ public final class DSpaceConfigurationService implements ConfigurationService {
             // NOTE: This MUST be added *after* the first call to getConfiguration(), as getReloadingController() is
             // not initialized until the configuration is first parsed/read.
             this.configurationBuilder.addEventListener(ConfigurationBuilderEvent.CONFIGURATION_REQUEST,
-                // Lamba which checks reloadable configurations for any updates.
+                // Lambda which checks reloadable configurations for any updates.
                 // Auto-reloadable configs are ONLY those flagged config-reload="true" in the configuration definition
                 (Event e) -> this.configurationBuilder.getReloadingController()
                                                       .checkForReloading(null));
         } catch (ConfigurationException ce) {
-            log.error("Unable to load configurations based on definition at " + this.configDefinition);
+            log.error("Unable to load configurations based on definition at {}",
+                    this.configDefinition);
             System.err.println("Unable to load configurations based on definition at " + this.configDefinition);
             throw new RuntimeException(ce);
         }
@@ -535,7 +536,7 @@ public final class DSpaceConfigurationService implements ConfigurationService {
         // Finally, set any dynamic, default properties
         setDynamicProperties();
 
-        log.info("Started up configuration service and loaded settings: " + toString());
+        log.info("Started up configuration service and loaded settings: {}", this::toString);
     }
 
     /**
@@ -557,9 +558,10 @@ public final class DSpaceConfigurationService implements ConfigurationService {
             // Finally, (re)set any dynamic, default properties
             setDynamicProperties();
         } catch (ConfigurationException ce) {
-            log.error("Unable to reload configurations based on definition at " + this.configDefinition, ce);
+            log.error("Unable to reload configurations based on definition at {}",
+                    this.configDefinition, ce);
         }
-        log.info("Reloaded configuration service: " + toString());
+        log.info("Reloaded configuration service: {}", this::toString);
     }
 
     /**
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceEnvironmentConfiguration.java b/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceEnvironmentConfiguration.java
index fcfe1ccbe1..14189f622b 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceEnvironmentConfiguration.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/config/DSpaceEnvironmentConfiguration.java
@@ -12,8 +12,8 @@ import java.util.Map;
 
 import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  * Bash does not allow environment variables that contain dots in their name.
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
  */
 public class DSpaceEnvironmentConfiguration extends MapConfiguration {
 
-    private static Logger log = LoggerFactory.getLogger(DSpaceEnvironmentConfiguration.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Create a Configuration based on the environment variables.
@@ -52,12 +52,13 @@ public class DSpaceEnvironmentConfiguration extends MapConfiguration {
             // replace "__D__" with a single dash.
             String lookup = StringUtils.replace(key, "__P__", ".");
             lookup = StringUtils.replace(lookup, "__D__", "-");
-            if (System.getenv(key) != null) {
+            String value = System.getenv(key);
+            if (value != null) {
                 // store the new key with the old value in our new properties map.
-                env.put(lookup, System.getenv(key));
-                log.debug("Found env " + lookup + " = " + System.getenv(key) + ".");
+                env.put(lookup, value);
+                log.debug("Found env {} = {}.", lookup, value);
             } else {
-                log.debug("Didn't found env " + lookup + ".");
+                log.debug("Didn't find env {}.", lookup);
             }
         }
         return env;
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java b/dspace-services/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
index eb82476bee..c171735057 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/example/RequestInterceptorExample.java
@@ -7,21 +7,20 @@
  */
 package org.dspace.servicemanager.example;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.RequestInterceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * A sample RequestInterceptor which simply logs request start and end
  * calls.
  *
  * @author Mark Diggory (mdiggory at atmire.com)
- * @version $Revision$
  */
 public final class RequestInterceptorExample implements RequestInterceptor {
 
-    private static Logger log = LoggerFactory.getLogger(RequestInterceptorExample.class);
+    private static final Logger log = LogManager.getLogger();
 
     /**
      * Constructor which will inject the instantiated
@@ -36,12 +35,12 @@ public final class RequestInterceptorExample implements RequestInterceptor {
     @Override
     public void onEnd(String requestId, boolean succeeded,
                       Exception failure) {
-        log.info("Intercepting End of Request: id=" + requestId + ", succeeded=" + succeeded);
+        log.info("Intercepting End of Request: id={}, succeeded={}", requestId, succeeded);
     }
 
     @Override
     public void onStart(String requestId) {
-        log.info("Intercepting Start of Request: id=" + requestId);
+        log.info("Intercepting Start of Request: id={}", requestId);
     }
 
     @Override
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java b/dspace-services/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
deleted file mode 100644
index 6bd9751b0a..0000000000
--- a/dspace-services/src/main/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListener.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.servicemanager.servlet;
-
-import java.io.File;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.dspace.servicemanager.DSpaceKernelImpl;
-import org.dspace.servicemanager.DSpaceKernelInit;
-import org.dspace.servicemanager.config.DSpaceConfigurationService;
-
-
-/**
- * This servlet context listener will handle startup of the kernel if it
- * is not there.
- * Shutdown of the context listener does not shutdown the kernel though;
- * that is tied to the shutdown of the JVM.
- * <p>
- * This is implemented in the web application web.xml using:
- * <pre>
- * {@code <listener>}
- * {@code   <listener-class>}
- * {@code     org.dspace.servicemanager.servlet.DSpaceKernelServletContextListener}
- * {@code   </listener-class>}
- * {@code </listener>}
- * </pre>
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- * @author Mark Diggory (mdiggory @ gmail.com)
- * @deprecated The DSpace Kernel initialisation is now done by org.dspace.app.rest.Application
- */
-@Deprecated
-public final class DSpaceKernelServletContextListener implements ServletContextListener {
-
-    private transient DSpaceKernelImpl kernelImpl;
-
-    /*
-     * Find DSpace's "home" directory.
-     * Initially look for JNDI Resource called "java:/comp/env/dspace.dir".
-     * If not found, look for "dspace.dir" initial context parameter.
-     */
-    private String getProvidedHome(ServletContextEvent arg0) {
-        String providedHome = null;
-        try {
-            Context ctx = new InitialContext();
-            providedHome = (String) ctx.lookup("java:/comp/env/" + DSpaceConfigurationService.DSPACE_HOME);
-        } catch (Exception e) {
-            // do nothing
-        }
-
-        if (providedHome == null) {
-            String dspaceHome = arg0.getServletContext().getInitParameter(DSpaceConfigurationService.DSPACE_HOME);
-            if (dspaceHome != null && !dspaceHome.equals("") &&
-                !dspaceHome.equals("${" + DSpaceConfigurationService.DSPACE_HOME + "}")) {
-                File test = new File(dspaceHome);
-                if (test.exists() && new File(test, DSpaceConfigurationService.DSPACE_CONFIG_PATH).exists()) {
-                    providedHome = dspaceHome;
-                }
-            }
-        }
-        return providedHome;
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent)
-     */
-    public void contextInitialized(ServletContextEvent arg0) {
-        // start the kernel when the webapp starts
-        try {
-            this.kernelImpl = DSpaceKernelInit.getKernel(null);
-            if (!this.kernelImpl.isRunning()) {
-                this.kernelImpl.start(getProvidedHome(arg0)); // init the kernel
-            }
-        } catch (Exception e) {
-            // failed to start so destroy it and log and throw an exception
-            try {
-                this.kernelImpl.destroy();
-            } catch (Exception e1) {
-                // nothing
-            }
-            String message = "Failure during filter init: " + e.getMessage();
-            System.err.println(message + ":" + e);
-            throw new RuntimeException(message, e);
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent)
-     */
-    public void contextDestroyed(ServletContextEvent arg0) {
-        // currently we are stopping the kernel when the webapp stops
-        if (this.kernelImpl != null) {
-            this.kernelImpl.destroy();
-            this.kernelImpl = null;
-        }
-        // No longer going to use JCL
-//        // clean up the logger for this webapp
-//        LogFactory.release(Thread.currentThread().getContextClassLoader());
-        // No longer cleaning this up here since it causes failures
-//        // cleanup the datasource
-//        try {
-//            for (Enumeration<?> e = DriverManager.getDrivers(); e.hasMoreElements(); ) {
-//                Driver driver = (Driver) e.nextElement();
-//                if (driver.getClass().getClassLoader() == getClass().getClassLoader()) {
-//                    DriverManager.deregisterDriver(driver);
-//                }
-//            }
-//        } catch (Throwable e) {
-//            System.err.println("Unable to clean up JDBC driver: " + e.getMessage());
-//        }
-    }
-
-}
diff --git a/dspace-services/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java b/dspace-services/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
index a440d08806..b48ec6b169 100644
--- a/dspace-services/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
+++ b/dspace-services/src/main/java/org/dspace/servicemanager/spring/ResourceFinder.java
@@ -14,9 +14,9 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.servicemanager.config.DSpaceConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -26,13 +26,13 @@ import org.springframework.core.io.Resource;
  * things (file/IS/resource).
  * This also allows us to look on a relative or absolute path and will
  * automatically check the typical places one might expect to put DSpace
- * config files.
+ * configuration files.
  *
  * @author Aaron Zeckoski (aaron@caret.cam.ac.uk)
  */
 public class ResourceFinder {
 
-    private static Logger log = LoggerFactory.getLogger(ResourceFinder.class);
+    private static final Logger log = LogManager.getLogger();
 
     public static final String relativePath = DSpaceConfigurationService.DSPACE + "/";
     public static final String environmentPathVariable = DSpaceConfigurationService.DSPACE_HOME;
@@ -43,7 +43,7 @@ public class ResourceFinder {
     private ResourceFinder() { }
 
     private static List<Resource> makeResources(List<String> paths) {
-        List<Resource> rs = new ArrayList<Resource>();
+        List<Resource> rs = new ArrayList<>();
         if (paths != null && !paths.isEmpty()) {
             for (String path : paths) {
                 try {
@@ -51,7 +51,7 @@ public class ResourceFinder {
                     rs.add(r);
                 } catch (IllegalArgumentException e) {
                     // do not add if not found, just skip
-                    log.error(e.getMessage() + ", continuing...");
+                    log.error("{}, continuing...", e::getMessage);
                 }
             }
         }
diff --git a/dspace-services/src/main/java/org/dspace/services/EmailService.java b/dspace-services/src/main/java/org/dspace/services/EmailService.java
index 1d09f06c13..08dfd52815 100644
--- a/dspace-services/src/main/java/org/dspace/services/EmailService.java
+++ b/dspace-services/src/main/java/org/dspace/services/EmailService.java
@@ -8,7 +8,7 @@
 
 package org.dspace.services;
 
-import javax.mail.Session;
+import jakarta.mail.Session;
 
 /**
  * @author mwood
diff --git a/dspace-services/src/main/java/org/dspace/services/KernelStartupCallbackService.java b/dspace-services/src/main/java/org/dspace/services/KernelStartupCallbackService.java
index 7b40e735c9..d6c0a7010b 100644
--- a/dspace-services/src/main/java/org/dspace/services/KernelStartupCallbackService.java
+++ b/dspace-services/src/main/java/org/dspace/services/KernelStartupCallbackService.java
@@ -8,7 +8,7 @@
 package org.dspace.services;
 
 /**
- * Interface whos implementations will be called when the kernel startup is completed.
+ * Interface whose implementations will be called when the kernel startup is completed.
  *
  * @author kevinvandevelde at atmire.com
  */
diff --git a/dspace-services/src/main/java/org/dspace/services/RequestService.java b/dspace-services/src/main/java/org/dspace/services/RequestService.java
index d28a04ecf6..78233f9bdb 100644
--- a/dspace-services/src/main/java/org/dspace/services/RequestService.java
+++ b/dspace-services/src/main/java/org/dspace/services/RequestService.java
@@ -8,9 +8,9 @@
 package org.dspace.services;
 
 import java.util.UUID;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.dspace.services.model.Request;
 import org.dspace.services.model.RequestInterceptor;
 
diff --git a/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java b/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java
index 2a822c7c6e..b8de1c7999 100644
--- a/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java
+++ b/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java
@@ -8,25 +8,25 @@
 package org.dspace.services.email;
 
 import java.util.Properties;
-import javax.annotation.PostConstruct;
-import javax.mail.Authenticator;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
 import javax.naming.InitialContext;
 import javax.naming.NameNotFoundException;
 import javax.naming.NamingException;
 import javax.naming.NoInitialContextException;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.mail.Authenticator;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.EmailService;
 import org.dspace.services.factory.DSpaceServicesFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
- * Provides mail sending services through JavaMail.  If a {@link javax.mail.Session}
+ * Provides mail sending services through JavaMail.  If a {@link jakarta.mail.Session}
  * instance is provided through JNDI, it will be used.  If not, then a session
  * will be created from DSpace configuration data ({@code mail.server} etc.)
  *
@@ -35,7 +35,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 public class EmailServiceImpl
     extends Authenticator
     implements EmailService {
-    private static final Logger logger = LoggerFactory.getLogger(EmailServiceImpl.class);
+    private static final Logger logger = LogManager.getLogger();
 
     private Session session = null;
 
@@ -62,6 +62,7 @@ public class EmailServiceImpl
     }
 
     @PostConstruct
+    @SuppressWarnings("BanJNDI")
     public void init() {
         // See if there is already a Session in our environment
         String sessionName = cfg.getProperty("mail.session.name");
diff --git a/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java b/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java
index 1787c688f6..401e0c7fc1 100644
--- a/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java
+++ b/dspace-services/src/main/java/org/dspace/services/events/SystemEventService.java
@@ -10,17 +10,17 @@ package org.dspace.services.events;
 import java.util.Map;
 import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PreDestroy;
 
+import jakarta.annotation.PreDestroy;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.services.EventService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Event;
 import org.dspace.services.model.Event.Scope;
 import org.dspace.services.model.EventListener;
 import org.dspace.services.model.RequestInterceptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public final class SystemEventService implements EventService {
 
-    private final Logger log = LoggerFactory.getLogger(SystemEventService.class);
+    private final Logger log = LogManager.getLogger();
 
     /**
      * Map for holding onto the listeners which is ClassLoader safe.
@@ -127,8 +127,8 @@ public final class SystemEventService implements EventService {
      */
     private void fireClusterEvent(Event event) {
         log.debug(
-            "fireClusterEvent is not implemented yet, no support for cluster events yet, could not fire event to the " +
-                "cluster: " + event);
+            "fireClusterEvent is not implemented yet, no support for cluster"
+                + " events yet, could not fire event to the cluster: {}", event);
     }
 
     /**
@@ -139,8 +139,9 @@ public final class SystemEventService implements EventService {
      */
     private void fireExternalEvent(Event event) {
         log.debug(
-            "fireExternalEvent is not implemented yet, no support for external events yet, could not fire event to " +
-                "external listeners: " + event);
+            "fireExternalEvent is not implemented yet, no support for external"
+                    + " events yet, could not fire event to external listeners: {}",
+                event);
     }
 
     /**
diff --git a/dspace-services/src/main/java/org/dspace/services/model/Event.java b/dspace-services/src/main/java/org/dspace/services/model/Event.java
index dbd06c7e80..f16eefaa89 100644
--- a/dspace-services/src/main/java/org/dspace/services/model/Event.java
+++ b/dspace-services/src/main/java/org/dspace/services/model/Event.java
@@ -161,7 +161,7 @@ public class Event implements Serializable {
     /**
      * Did this event modify something in the system?
      *
-     * @return true if this event modified soemthing in the system, false if it was read only
+     * @return true if this event modified something in the system, false if it was read only
      */
     public boolean isModify() {
         return modify;
diff --git a/dspace-services/src/main/java/org/dspace/services/model/Request.java b/dspace-services/src/main/java/org/dspace/services/model/Request.java
index ed9fb298b8..14a8207ca6 100644
--- a/dspace-services/src/main/java/org/dspace/services/model/Request.java
+++ b/dspace-services/src/main/java/org/dspace/services/model/Request.java
@@ -7,10 +7,10 @@
  */
 package org.dspace.services.model;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 public interface Request {
     public String getRequestId();
diff --git a/dspace-services/src/main/java/org/dspace/services/model/Session.java b/dspace-services/src/main/java/org/dspace/services/model/Session.java
index 78b5f5c586..ad6f6f032b 100644
--- a/dspace-services/src/main/java/org/dspace/services/model/Session.java
+++ b/dspace-services/src/main/java/org/dspace/services/model/Session.java
@@ -8,7 +8,8 @@
 package org.dspace.services.model;
 
 import java.util.Map;
-import javax.servlet.http.HttpSession;
+
+import jakarta.servlet.http.HttpSession;
 
 /**
  * Represents a user's session (login session) in the system.  Can hold
diff --git a/dspace-services/src/main/java/org/dspace/services/sessions/StatelessRequestServiceImpl.java b/dspace-services/src/main/java/org/dspace/services/sessions/StatelessRequestServiceImpl.java
index dd66a2e852..9910b05dfa 100644
--- a/dspace-services/src/main/java/org/dspace/services/sessions/StatelessRequestServiceImpl.java
+++ b/dspace-services/src/main/java/org/dspace/services/sessions/StatelessRequestServiceImpl.java
@@ -15,12 +15,14 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.RequestService;
 import org.dspace.services.model.Request;
@@ -29,8 +31,6 @@ import org.dspace.services.model.RequestInterceptor.RequestInterruptionException
 import org.dspace.services.sessions.model.HttpRequestImpl;
 import org.dspace.services.sessions.model.InternalRequestImpl;
 import org.dspace.utils.servicemanager.OrderedServiceComparator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
 /**
@@ -45,7 +45,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public final class StatelessRequestServiceImpl implements RequestService {
 
-    private static final Logger log = LoggerFactory.getLogger(StatelessRequestServiceImpl.class);
+    private static final Logger log = LogManager.getLogger();
 
     private ConfigurationService configurationService;
 
@@ -110,8 +110,8 @@ public final class StatelessRequestServiceImpl implements RequestService {
                     log.warn(message);
                     throw new RequestInterruptionException(message, e);
                 } catch (Exception e) {
-                    log.warn("Request interceptor (" + requestInterceptor + ") failed to execute on start (" + req
-                        .getRequestId() + "): " + e.getMessage());
+                    log.warn("Request interceptor ({}) failed to execute on start ({}): {}",
+                        () -> requestInterceptor, req::getRequestId, e::getMessage);
                 }
             }
         }
@@ -149,15 +149,14 @@ public final class StatelessRequestServiceImpl implements RequestService {
                         requestInterceptor.onEnd(requestId, (failure == null), failure);
                     } catch (RequestInterruptionException e) {
                         log.warn(
-                            "Attempt to stop request from ending by an exception from the interceptor (" +
-                                requestInterceptor + "), cannot stop requests from ending though so request end " +
-                                "continues, this may be an error: " + e
-                                .getMessage());
+                            "Attempt to stop request from ending by an exception from the interceptor ({}),"
+                                + " cannot stop requests from ending though so request end"
+                                + " continues, this may be an error: {}",
+                            () -> requestInterceptor, e::getMessage);
                     } catch (Exception e) {
                         log.warn(
-                            "Request interceptor (" + requestInterceptor + ") failed to execute on end (" + requestId
-                                + "): " + e
-                                .getMessage());
+                            "Request interceptor ({}) failed to execute on end ({}): {}",
+                            () -> requestInterceptor, () -> requestId, e::getMessage);
                     }
                 }
             }
diff --git a/dspace-services/src/main/java/org/dspace/services/sessions/model/HttpRequestImpl.java b/dspace-services/src/main/java/org/dspace/services/sessions/model/HttpRequestImpl.java
index 1842857042..e2b79c5b3e 100644
--- a/dspace-services/src/main/java/org/dspace/services/sessions/model/HttpRequestImpl.java
+++ b/dspace-services/src/main/java/org/dspace/services/sessions/model/HttpRequestImpl.java
@@ -7,11 +7,10 @@
  */
 package org.dspace.services.sessions.model;
 
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.services.model.Request;
 
 public final class HttpRequestImpl extends AbstractRequestImpl implements Request {
diff --git a/dspace-services/src/main/java/org/dspace/services/sessions/model/InternalRequestImpl.java b/dspace-services/src/main/java/org/dspace/services/sessions/model/InternalRequestImpl.java
index ffc78daa0a..9b5b065991 100644
--- a/dspace-services/src/main/java/org/dspace/services/sessions/model/InternalRequestImpl.java
+++ b/dspace-services/src/main/java/org/dspace/services/sessions/model/InternalRequestImpl.java
@@ -9,11 +9,11 @@ package org.dspace.services.sessions.model;
 
 import java.util.HashMap;
 import java.util.Map;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.dspace.services.model.Request;
 
 public final class InternalRequestImpl extends AbstractRequestImpl implements Request {
diff --git a/dspace-services/src/main/java/org/dspace/utils/DSpace.java b/dspace-services/src/main/java/org/dspace/utils/DSpace.java
index 0a7ce941be..a687bc9c8e 100644
--- a/dspace-services/src/main/java/org/dspace/utils/DSpace.java
+++ b/dspace-services/src/main/java/org/dspace/utils/DSpace.java
@@ -79,6 +79,14 @@ public final class DSpace {
         return getServiceManager().getServiceByName(RequestService.class.getName(), RequestService.class);
     }
 
+    /**
+     * Convenience to look up a service in the service manager.
+     * @see(ServiceManager#getServiceByName).
+     *
+     * @param <T> Type of the service to be found.
+     * @param type Type of the service to be found.
+     * @return an instance of the service, or null if not found.
+     */
     public <T> T getSingletonService(Class<T> type) {
         return getServiceManager().getServiceByName(type.getName(), type);
     }
diff --git a/dspace-services/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java b/dspace-services/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
index 69acee0496..47ab567a27 100644
--- a/dspace-services/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
+++ b/dspace-services/src/main/java/org/dspace/utils/servicemanager/ProviderStack.java
@@ -35,7 +35,7 @@ public final class ProviderStack<T> {
      * Default empty constructor.
      * <p>
      * This is mostly only useful if you are planning to add new
-     * providers later.  You should probably use the other contructors.
+     * providers later.  You should probably use the other constructors.
      */
     public ProviderStack() {
         providers = Collections.synchronizedList(new ArrayList<ProviderHolder<T>>());
diff --git a/dspace-services/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java b/dspace-services/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
index 122581ebaa..f5126fbb6c 100644
--- a/dspace-services/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
+++ b/dspace-services/src/main/java/org/dspace/utils/servlet/DSpaceWebappServletFilter.java
@@ -8,14 +8,14 @@
 package org.dspace.utils.servlet;
 
 import java.io.IOException;
-import javax.annotation.Priority;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 
+import jakarta.annotation.Priority;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.dspace.kernel.DSpaceKernel;
 import org.dspace.kernel.DSpaceKernelManager;
 import org.dspace.services.RequestService;
@@ -35,8 +35,9 @@ import org.dspace.services.RequestService;
 public final class DSpaceWebappServletFilter implements Filter {
 
     /* (non-Javadoc)
-     * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
+     * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig)
      */
+    @Override
     public void init(FilterConfig filterConfig) throws ServletException {
         // ensure the kernel is running, if not then we have to die here
         try {
@@ -52,18 +53,20 @@ public final class DSpaceWebappServletFilter implements Filter {
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.Filter#destroy()
+     * @see jakarta.servlet.Filter#destroy()
      */
+    @Override
     public void destroy() {
         // clean up the logger for this webapp
-        // No longer using commons-logging (JCL), use slf4j instead
+        // No longer using commons-logging (JCL), use Log4J instead
         //LogFactory.release(Thread.currentThread().getContextClassLoader());
     }
 
     /* (non-Javadoc)
-     * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, javax.servlet.ServletResponse, javax.servlet
-     * .FilterChain)
+     * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, jakarta.servlet.ServletResponse,
+     * jakarta.servlet.FilterChain)
      */
+    @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
         throws IOException, ServletException {
         // now do some DSpace stuff
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java b/dspace-services/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
index f66d32bb3b..3c0c8610f1 100644
--- a/dspace-services/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
+++ b/dspace-services/src/test/java/org/dspace/servicemanager/DSpaceServiceManagerTest.java
@@ -16,9 +16,9 @@ import static org.junit.Assert.fail;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.dspace.servicemanager.config.DSpaceConfigurationService;
 import org.dspace.servicemanager.example.ConcreteExample;
 import org.dspace.servicemanager.fakeservices.FakeService1;
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java b/dspace-services/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
index aecadcdf02..dc7cd26b51 100644
--- a/dspace-services/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
+++ b/dspace-services/src/test/java/org/dspace/servicemanager/MockServiceManagerSystem.java
@@ -80,6 +80,11 @@ public class MockServiceManagerSystem implements ServiceManagerSystem {
         return this.sms.getServicesNames();
     }
 
+    @Override
+    public <T> Map<String, T> getServicesWithNamesByType(Class<T> type) {
+        return this.sms.getServicesWithNamesByType(type);
+    }
+
     /* (non-Javadoc)
      * @see org.dspace.kernel.ServiceManager#isServiceExists(java.lang.String)
      */
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java b/dspace-services/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
index e3d08100a4..f72d8b9c34 100644
--- a/dspace-services/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
+++ b/dspace-services/src/test/java/org/dspace/servicemanager/SampleAnnotationBean.java
@@ -7,9 +7,8 @@
  */
 package org.dspace.servicemanager;
 
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.dspace.servicemanager.example.ConcreteExample;
 import org.dspace.servicemanager.example.ServiceExample;
 import org.springframework.beans.factory.annotation.Autowired;
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java b/dspace-services/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
index b56b990b56..4002e5e433 100644
--- a/dspace-services/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
+++ b/dspace-services/src/test/java/org/dspace/servicemanager/config/DSpaceConfigurationServiceTest.java
@@ -56,7 +56,7 @@ public class DSpaceConfigurationServiceTest {
         configurationService.clear();
 
         // Start fresh with out own set of configs
-        Map<String, Object> l = new HashMap<String, Object>();
+        Map<String, Object> l = new HashMap<>();
         l.put("service.name", "DSpace");
         l.put("sample.array", "itemA,itemB,itemC");
         l.put("sample.number", "123");
@@ -86,7 +86,7 @@ public class DSpaceConfigurationServiceTest {
     @Test
     public void testVariableReplacement() {
 
-        Map<String, Object> l = new HashMap<String, Object>();
+        Map<String, Object> l = new HashMap<>();
         l.put("service.name", "DSpace");
         l.put("aaronz", "Aaron Zeckoski");
         l.put("current.user", "${aaronz}");
@@ -295,7 +295,7 @@ public class DSpaceConfigurationServiceTest {
         assertEquals("itemC", array[2]);
         Integer number = configurationService.getPropertyAsType("sample.number", Integer.class);
         assertNotNull(number);
-        assertEquals(new Integer(123), number);
+        assertEquals(Integer.valueOf(123), number);
 
         Boolean bool = configurationService.getPropertyAsType("sample.boolean", Boolean.class);
         assertNotNull(bool);
@@ -306,7 +306,6 @@ public class DSpaceConfigurationServiceTest {
         assertEquals(Boolean.FALSE, bool2);
 
         boolean bool3 = configurationService.getPropertyAsType("INVALID.PROPERTY", boolean.class);
-        assertNotNull(bool3);
         assertEquals(false, bool3);
 
         assertEquals(123, (int) configurationService.getPropertyAsType("sample.number", int.class));
@@ -333,9 +332,9 @@ public class DSpaceConfigurationServiceTest {
         assertEquals("itemB", array[1]);
         assertEquals("itemC", array[2]);
 
-        Integer number = configurationService.getPropertyAsType("sample.number", new Integer(12345));
+        Integer number = configurationService.getPropertyAsType("sample.number", 12345);
         assertNotNull(number);
-        assertEquals(new Integer(123), number);
+        assertEquals(Integer.valueOf(123), number);
 
         Boolean bool = configurationService.getPropertyAsType("sample.boolean", Boolean.FALSE);
         assertNotNull(bool);
@@ -482,7 +481,7 @@ public class DSpaceConfigurationServiceTest {
         DSpaceConfigurationService dscs = new DSpaceConfigurationService();
         int size = dscs.getProperties().size();
 
-        // Add two new Sytem properties
+        // Add two new System properties
         System.setProperty("Hello", "World");
         System.setProperty("Tim", "Donohue");
 
@@ -522,8 +521,11 @@ public class DSpaceConfigurationServiceTest {
     }
 
     /**
-     * Tests the ability of our ConfigurationService to automatically reload properties after a set period
-     * of time.
+     * Tests the ability of our ConfigurationService to automatically reload
+     * properties after a set period of time.
+     * @throws ConfigurationException passed through.
+     * @throws IOException if test properties file cannot be created or copied.
+     * @throws InterruptedException if sleep is interrupted.
      */
     @Test
     public void testAutomaticReload() throws ConfigurationException, IOException, InterruptedException {
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java b/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
index eafbd8ac8b..ba580f2085 100644
--- a/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
+++ b/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService1.java
@@ -10,9 +10,9 @@ package org.dspace.servicemanager.fakeservices;
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 import org.dspace.kernel.mixins.ConfigChangeListener;
 import org.dspace.kernel.mixins.ServiceChangeListener;
 import org.dspace.services.ConfigurationService;
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java b/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
index 5a9024b9a7..399029ad9b 100644
--- a/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
+++ b/dspace-services/src/test/java/org/dspace/servicemanager/fakeservices/FakeService2.java
@@ -8,7 +8,8 @@
 package org.dspace.servicemanager.fakeservices;
 
 import java.io.Serializable;
-import javax.annotation.PostConstruct;
+
+import jakarta.annotation.PostConstruct;
 
 /**
  * Simple fake service 2
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java b/dspace-services/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
deleted file mode 100644
index 52e5f9390c..0000000000
--- a/dspace-services/src/test/java/org/dspace/servicemanager/servlet/DSpaceKernelServletContextListenerTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.servicemanager.servlet;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.dspace.kernel.DSpaceKernelManager;
-import org.dspace.utils.servlet.DSpaceWebappServletFilter;
-import org.junit.Test;
-import org.mortbay.jetty.Handler;
-import org.mortbay.jetty.testing.HttpTester;
-import org.mortbay.jetty.testing.ServletTester;
-
-
-/**
- * This starts up a jetty server and tests the ability for the servlet filter to start a kernel
- * and correctly shut it down
- *
- * @author Aaron Zeckoski (azeckoski @ gmail.com)
- */
-public class DSpaceKernelServletContextListenerTest {
-
-    @Test
-    public void testSampleRequest() {
-        // make sure no kernel yet
-        try {
-            new DSpaceKernelManager().getKernel();
-            fail("Should have thrown exception");
-        } catch (IllegalStateException e) {
-            assertNotNull(e.getMessage());
-        }
-
-        ServletTester tester = new ServletTester();
-        tester.setContextPath("/");
-        tester.getContext().addEventListener(new DSpaceKernelServletContextListener());
-        tester.addFilter(DSpaceWebappServletFilter.class, "/*", Handler.REQUEST);
-        tester.addServlet(SampleServlet.class, "/dspace");
-        try {
-            tester.start();
-        } catch (Exception e) {
-            fail("Could not start the jetty server: " + e.getMessage());
-        }
-
-        // now there should be a kernel
-        assertNotNull(new DSpaceKernelManager().getKernel());
-
-        // now fire the request
-        String jettyRequest =
-            "GET /dspace HTTP/1.1\r\n" +
-                "Host: tester\r\n" +
-                "\r\n";
-        try {
-            String content = tester.getResponses(jettyRequest);
-            assertNotNull(content);
-            assertTrue(content.contains("DSpaceTest"));
-//            assertFalse(content.contains("session=null"));
-//            assertFalse(content.contains("request=null"));
-        } catch (Exception e) {
-            fail("Could not fire request: " + e.getMessage());
-        }
-
-        // now there should be a kernel
-        assertNotNull(new DSpaceKernelManager().getKernel());
-
-        // try a request a different way
-        HttpTester request = new HttpTester();
-        HttpTester response = new HttpTester();
-        request.setMethod("GET");
-        request.setHeader("Host", "tester");
-        request.setVersion("HTTP/1.0");
-        request.setURI("/dspace");
-
-        try {
-            response.parse(tester.getResponses(request.generate()));
-        } catch (IOException e1) {
-            fail("Could not parse response: " + e1.getMessage());
-        } catch (Exception e1) {
-            fail("Could not parse response: " + e1.getMessage());
-        }
-
-        assertTrue(response.getMethod() == null);
-        assertEquals(200, response.getStatus());
-        String content = response.getContent();
-        assertNotNull(content);
-        assertTrue(content.contains("DSpaceTest"));
-//        assertFalse(content.contains("session=null"));
-//        assertFalse(content.contains("request=null"));
-
-        // now there should be a kernel
-        assertNotNull(new DSpaceKernelManager().getKernel());
-
-        try {
-            tester.stop();
-        } catch (Exception e) {
-            fail("Could not stop the jetty server: " + e.getMessage());
-        }
-
-        // back to no kernel again
-        try {
-            new DSpaceKernelManager().getKernel();
-            fail("Should have thrown exception");
-        } catch (IllegalStateException e) {
-            assertNotNull(e.getMessage());
-        }
-
-        tester = null;
-        request = null;
-        response = null;
-    }
-
-    @Test
-    public void testSampleRequestDouble() {
-        try {
-            Thread.sleep(500);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        testSampleRequest();
-    }
-
-
-}
diff --git a/dspace-services/src/test/java/org/dspace/servicemanager/servlet/SampleServlet.java b/dspace-services/src/test/java/org/dspace/servicemanager/servlet/SampleServlet.java
deleted file mode 100644
index 8b3d290361..0000000000
--- a/dspace-services/src/test/java/org/dspace/servicemanager/servlet/SampleServlet.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * The contents of this file are subject to the license and copyright
- * detailed in the LICENSE and NOTICE files at the root of the source
- * tree and available online at
- *
- * http://www.dspace.org/license/
- */
-package org.dspace.servicemanager.servlet;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.dspace.kernel.DSpaceKernel;
-import org.dspace.kernel.DSpaceKernelManager;
-import org.dspace.kernel.ServiceManager;
-import org.dspace.services.RequestService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Test servlet for trying out the jetty server
- *
- * @author Aaron Zeckoski (aaron@caret.cam.ac.uk)
- */
-public class SampleServlet extends HttpServlet {
-
-    private static final long serialVersionUID = 1L;
-
-    private static Logger log = LoggerFactory.getLogger(SampleServlet.class);
-
-    private transient RequestService requestService;
-
-    @Override
-    public void init() throws ServletException {
-        super.init();
-        try {
-            DSpaceKernel kernel = new DSpaceKernelManager().getKernel();
-            if (kernel == null) {
-                throw new IllegalStateException("Could not get the DSpace Kernel");
-            }
-            if (!kernel.isRunning()) {
-                throw new IllegalStateException("DSpace Kernel is not running, cannot startup the DirectServlet");
-            }
-            ServiceManager serviceManager = kernel.getServiceManager();
-            requestService = serviceManager.getServiceByName(RequestService.class.getName(), RequestService.class);
-            if (requestService == null) {
-                throw new IllegalStateException("Could not get the DSpace RequestService");
-            }
-            log.info("Servlet initialized");
-        } catch (Exception e) {
-            throw new IllegalStateException("FAILURE during init of direct servlet: " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Now this will handle all kinds of requests and not just post and get
-     */
-    @Override
-    protected void service(HttpServletRequest req, HttpServletResponse res)
-        throws ServletException, IOException {
-        // force all response encoding to UTF-8 / html by default
-        res.setContentType("text/html");
-        res.setCharacterEncoding("UTF-8");
-
-        // now handle the request
-        PrintWriter writer = res.getWriter();
-        writer.print(XML_HEADER);
-        writer.print(XHTML_HEADER);
-        writer.print("DSpaceTest: request=" + requestService.getCurrentRequestId());
-        writer.print(XHTML_FOOTER);
-        res.setStatus(HttpServletResponse.SC_OK);
-
-        log.info("Serviced request:  DSpace");
-    }
-
-    protected static final String XML_HEADER = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n";
-    protected static final String XHTML_HEADER = "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" " +
-        "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n" +
-        "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n" +
-        "<head>\n" +
-        "  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n" +
-        "  <title>DSpace title</title>\n" +
-        "</head>\n" +
-        "<body>\n";
-    // include versions info in the footer now
-    protected static final String XHTML_FOOTER = "\n</body>\n</html>\n";
-
-}
diff --git a/dspace-services/src/test/java/org/dspace/services/email/EmailServiceImplTest.java b/dspace-services/src/test/java/org/dspace/services/email/EmailServiceImplTest.java
index 958e4f8106..97656af2f4 100644
--- a/dspace-services/src/test/java/org/dspace/services/email/EmailServiceImplTest.java
+++ b/dspace-services/src/test/java/org/dspace/services/email/EmailServiceImplTest.java
@@ -12,10 +12,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
-import javax.mail.MessagingException;
-import javax.mail.PasswordAuthentication;
-import javax.mail.Session;
-
+import jakarta.mail.MessagingException;
+import jakarta.mail.PasswordAuthentication;
+import jakarta.mail.Session;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.EmailService;
 import org.dspace.test.DSpaceAbstractKernelTest;
diff --git a/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java b/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
index 995d3ba624..5ff526983e 100644
--- a/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
+++ b/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderHolderTest.java
@@ -8,7 +8,6 @@
 package org.dspace.utils.servicemanager;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
@@ -16,7 +15,7 @@ import static org.junit.Assert.fail;
 import org.junit.Test;
 
 /**
- * Tests the ability of a provider holder to release a reference correctly
+ * Tests the ability of a provider holder to release a reference correctly.
  *
  * @author Aaron Zeckoski (azeckoski @ gmail.com)
  */
@@ -28,7 +27,7 @@ public class ProviderHolderTest {
 
     @Test
     public void testHolder() {
-        ProviderHolder<Thing> holder = new ProviderHolder<Thing>();
+        ProviderHolder<Thing> holder = new ProviderHolder<>();
         assertNull(holder.getProvider());
 
         Thing t = new Thing();
@@ -44,7 +43,7 @@ public class ProviderHolderTest {
 
     @Test
     public void testHolderRelease() {
-        ProviderHolder<Thing> holder = new ProviderHolder<Thing>();
+        ProviderHolder<Thing> holder = new ProviderHolder<>();
         Thing t = new Thing();
         holder.setProvider(t);
 
@@ -66,7 +65,7 @@ public class ProviderHolderTest {
 
     @Test
     public void testHolderException() {
-        ProviderHolder<Thing> holder = new ProviderHolder<Thing>();
+        ProviderHolder<Thing> holder = new ProviderHolder<>();
         try {
             holder.getProviderOrFail();
             fail("Should have died");
@@ -87,14 +86,10 @@ public class ProviderHolderTest {
 
     @Test
     public void testHolderHashEqualsString() {
-        ProviderHolder<Thing> holder = new ProviderHolder<Thing>();
-        assertNotNull(holder.hashCode());
-        assertFalse(holder.equals(null));
+        ProviderHolder<Thing> holder = new ProviderHolder<>();
         assertNotNull(holder.toString());
 
         holder.setProvider(new Thing());
-        assertNotNull(holder.hashCode());
-        assertFalse(holder.equals(null));
         assertNotNull(holder.toString());
 
         holder = null;
diff --git a/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java b/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
index 300411c053..6641adb3b3 100644
--- a/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
+++ b/dspace-services/src/test/java/org/dspace/utils/servicemanager/ProviderStackTest.java
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -42,6 +43,7 @@ public class ProviderStackTest {
             this.prefix = prefix;
         }
 
+        @Override
         public String getPrefix() {
             return prefix;
         }
@@ -55,6 +57,7 @@ public class ProviderStackTest {
             this.order = order;
         }
 
+        @Override
         public int getOrder() {
             return order;
         }
@@ -77,11 +80,15 @@ public class ProviderStackTest {
             }
 
             public <T> List<T> getServicesByType(Class<T> type) {
-                return new ArrayList<T>();
+                return new ArrayList<>();
             }
 
             public List<String> getServicesNames() {
-                return new ArrayList<String>();
+                return new ArrayList<>();
+            }
+
+            public <T> Map<String, T> getServicesWithNamesByType(Class<T> type) {
+                return new HashMap<>();
             }
 
             public boolean isServiceExists(String name) {
@@ -106,11 +113,10 @@ public class ProviderStackTest {
             public void unregisterService(String name) {
             }
         };
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(sm, Provider.class);
-        assertNotNull(providers.hashCode());
+        ProviderStack<Provider> providers = new ProviderStack<>(sm, Provider.class);
         assertNotNull(providers.toString());
         assertEquals(0, providers.size());
-        assertTrue(providers.getProviders().size() == 0);
+        assertTrue(providers.getProviders().isEmpty());
 
         providers.clear();
         providers = null;
@@ -121,13 +127,12 @@ public class ProviderStackTest {
      */
     @Test
     public void testProviderStackTArray() {
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
         // check the order
@@ -148,13 +153,12 @@ public class ProviderStackTest {
     @Test
     public void testAddProvider() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
         // check the order
@@ -213,13 +217,12 @@ public class ProviderStackTest {
     @Test
     public void testRemoveProvider() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
@@ -244,13 +247,12 @@ public class ProviderStackTest {
     @Test
     public void testGetProviders() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
@@ -259,7 +261,7 @@ public class ProviderStackTest {
         assertEquals(4, l.size());
         l = null;
 
-        providers = new ProviderStack<Provider>();
+        providers = new ProviderStack<>();
         l = providers.getProviders();
         assertNotNull(l);
         assertEquals(0, l.size());
@@ -275,13 +277,12 @@ public class ProviderStackTest {
     @Test
     public void testGetIterator() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
@@ -297,7 +298,7 @@ public class ProviderStackTest {
         assertNotNull(it.next());
         assertFalse(it.hasNext());
 
-        providers = new ProviderStack<Provider>();
+        providers = new ProviderStack<>();
         it = providers.getIterator();
         assertNotNull(it);
         assertFalse(it.hasNext());
@@ -313,13 +314,12 @@ public class ProviderStackTest {
     @Test
     public void testGetProvider() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
@@ -342,13 +342,12 @@ public class ProviderStackTest {
     @Test
     public void testSize() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
@@ -362,18 +361,16 @@ public class ProviderStackTest {
     @Test
     public void testClear() {
         // preload
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             new UnorderedProvider("ccc"),
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             new OrderedProvider("aaa", 2)
         });
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
         providers.clear();
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(0, providers.size());
 
@@ -388,14 +385,13 @@ public class ProviderStackTest {
     public void testRefresh() {
         Provider p1 = new OrderedProvider("aaa", 2);
         Provider p2 = new UnorderedProvider("ccc");
-        ProviderStack<Provider> providers = new ProviderStack<Provider>(new Provider[] {
+        ProviderStack<Provider> providers = new ProviderStack<>(new Provider[] {
             p2,
             new UnorderedProvider("ddd"),
             new OrderedProvider("bbb", 5),
             p1
         });
 
-        assertNotNull(providers.hashCode());
         assertNotNull(providers.toString());
         assertEquals(4, providers.size());
 
diff --git a/dspace-sword/pom.xml b/dspace-sword/pom.xml
index 52783e3ec5..60f7a53274 100644
--- a/dspace-sword/pom.xml
+++ b/dspace-sword/pom.xml
@@ -15,7 +15,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -45,11 +45,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-api-lang</artifactId>
-        </dependency>
-
         <!-- Needed to support Spring @Configuration classes (to register servlets/beans with Spring Boot webapp) -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -68,18 +63,13 @@
             <artifactId>jaxen</artifactId>
         </dependency>
 
-        <!-- additional dependencies for the sword-common code -->
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -96,10 +86,10 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
         </dependency>
-	<dependency>
+        <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-web</artifactId>
-	</dependency>
+        </dependency>
 
         <dependency>
             <groupId>xom</groupId>
diff --git a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
index 3fe47cfaa6..d4abaf6a0a 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/CollectionDepositor.java
@@ -138,7 +138,7 @@ public class CollectionDepositor extends Depositor {
         DepositResult result = si.ingest(swordService, deposit, collection);
         swordService.message("Archive ingest completed successfully");
 
-        // if there's an item availalble, and we want to keep the original
+        // if there's an item available, and we want to keep the original
         // then do that
         try {
             if (swordConfig.isKeepOriginal()) {
diff --git a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
index bcde6c42f6..666ac56006 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/ItemDepositor.java
@@ -101,7 +101,7 @@ public class ItemDepositor extends Depositor {
         DepositResult result = si.ingest(swordService, deposit, item);
         swordService.message("Archive ingest completed successfully");
 
-        // if there's an item availalble, and we want to keep the original
+        // if there's an item available, and we want to keep the original
         // then do that
         try {
             if (swordConfig.isKeepOriginal()) {
diff --git a/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java b/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
index d0cd9ee2ad..b02728955a 100644
--- a/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
+++ b/dspace-sword/src/main/java/org/dspace/sword/SWORDMETSIngester.java
@@ -126,7 +126,7 @@ public class SWORDMETSIngester implements SWORDIngester {
             // get reference to item so that we can report on it
             Item installedItem = (Item) ingestedObject;
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, installedItem);
 
diff --git a/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java b/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java
index 69997eee8a..9b274306a3 100644
--- a/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java
+++ b/dspace-sword/src/main/java/org/purl/sword/atom/Entry.java
@@ -162,7 +162,7 @@ public class Entry extends XmlElement implements SwordElementInterface {
     }
 
     /**
-     * Create a new instance of the class an initalise it, setting the
+     * Create a new instance of the class an initialise it, setting the
      * element namespace and name.
      *
      * @param prefix  The namespace prefix of the element
diff --git a/dspace-sword/src/main/java/org/purl/sword/base/Deposit.java b/dspace-sword/src/main/java/org/purl/sword/base/Deposit.java
index 2473d28e4a..b771ffc5af 100644
--- a/dspace-sword/src/main/java/org/purl/sword/base/Deposit.java
+++ b/dspace-sword/src/main/java/org/purl/sword/base/Deposit.java
@@ -10,8 +10,8 @@ package org.purl.sword.base;
 import java.io.File;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.Logger;
 
 /**
diff --git a/dspace-sword/src/main/java/org/purl/sword/base/DepositResponse.java b/dspace-sword/src/main/java/org/purl/sword/base/DepositResponse.java
index 453af3df35..af62d9ed4a 100644
--- a/dspace-sword/src/main/java/org/purl/sword/base/DepositResponse.java
+++ b/dspace-sword/src/main/java/org/purl/sword/base/DepositResponse.java
@@ -173,7 +173,7 @@ public class DepositResponse {
         } catch (ParsingException ex) {
             throw new UnmarshallException("Unable to parse the XML", ex);
         } catch (IOException ex) {
-            throw new UnmarshallException("Error acessing the file?", ex);
+            throw new UnmarshallException("Error accessing the file?", ex);
         }
     }
 
@@ -205,7 +205,7 @@ public class DepositResponse {
         } catch (ParsingException ex) {
             throw new UnmarshallException("Unable to parse the XML", ex);
         } catch (IOException ex) {
-            throw new UnmarshallException("Error acessing the file?", ex);
+            throw new UnmarshallException("Error accessing the file?", ex);
         }
     }
 
diff --git a/dspace-sword/src/main/java/org/purl/sword/base/HttpHeaders.java b/dspace-sword/src/main/java/org/purl/sword/base/HttpHeaders.java
index 9a5aacc5a3..79003701ff 100644
--- a/dspace-sword/src/main/java/org/purl/sword/base/HttpHeaders.java
+++ b/dspace-sword/src/main/java/org/purl/sword/base/HttpHeaders.java
@@ -7,7 +7,7 @@
  */
 package org.purl.sword.base;
 
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * Definition of the additional HTTP Header tags that will be used in
@@ -48,7 +48,7 @@ public interface HttpHeaders {
     public static final String X_NO_OP = "X-No-Op";
 
     /**
-     * An HTTP Header label that the server should not epect, and thus
+     * An HTTP Header label that the server should not expect, and thus
      * created a corrupt header.
      */
     public static final String X_CORRUPT = "X-wibble";
diff --git a/dspace-sword/src/main/java/org/purl/sword/base/ServiceDocument.java b/dspace-sword/src/main/java/org/purl/sword/base/ServiceDocument.java
index b88787c825..aefc7a964d 100644
--- a/dspace-sword/src/main/java/org/purl/sword/base/ServiceDocument.java
+++ b/dspace-sword/src/main/java/org/purl/sword/base/ServiceDocument.java
@@ -144,7 +144,7 @@ public class ServiceDocument {
         } catch (ParsingException ex) {
             throw new UnmarshallException("Unable to parse the XML", ex);
         } catch (IOException ex) {
-            throw new UnmarshallException("Error acessing the file?", ex);
+            throw new UnmarshallException("Error accessing the file?", ex);
         }
     }
 
diff --git a/dspace-sword/src/main/java/org/purl/sword/base/XmlElement.java b/dspace-sword/src/main/java/org/purl/sword/base/XmlElement.java
index 80217738d2..d90b7b779f 100644
--- a/dspace-sword/src/main/java/org/purl/sword/base/XmlElement.java
+++ b/dspace-sword/src/main/java/org/purl/sword/base/XmlElement.java
@@ -71,7 +71,7 @@ public abstract class XmlElement {
     }
 
     /**
-     * Create a new insatnce. Set the prefix, local name and the namespace URI.
+     * Create a new instance. Set the prefix, local name and the namespace URI.
      *
      * @param prefix       The prefix.
      * @param localName    The element's local name.
diff --git a/dspace-sword/src/main/java/org/purl/sword/client/PropertiesDialog.java b/dspace-sword/src/main/java/org/purl/sword/client/PropertiesDialog.java
index 6d43cb68ef..e91b5c39ef 100644
--- a/dspace-sword/src/main/java/org/purl/sword/client/PropertiesDialog.java
+++ b/dspace-sword/src/main/java/org/purl/sword/client/PropertiesDialog.java
@@ -94,7 +94,7 @@ public class PropertiesDialog {
                                                   null);
 
         // cancel any edit in the table. If there is a cell editing, the getEditingColumn will
-        // return a non-negative column number. This can be used to retreive the cell editor.
+        // return a non-negative column number. This can be used to retrieve the cell editor.
         // The code then gets the default editor and calls the stopCellEditing. If custom
         // editors are used, an additional check must be made to get the cell editor
         // for a specific cell.
diff --git a/dspace-sword/src/main/java/org/purl/sword/client/ServicePanel.java b/dspace-sword/src/main/java/org/purl/sword/client/ServicePanel.java
index bc3031c333..d5b3158f18 100644
--- a/dspace-sword/src/main/java/org/purl/sword/client/ServicePanel.java
+++ b/dspace-sword/src/main/java/org/purl/sword/client/ServicePanel.java
@@ -429,7 +429,7 @@ public class ServicePanel extends JPanel
         String maxSize = "";
 
         // Commented out the following code as the client code is out of step with the
-        // Sword 'base' library and wont compile. - Robin Taylor.
+        // Sword 'base' library and won't compile. - Robin Taylor.
         //if ( service.maxUploadIsDefined() )
         //{
         //    maxSize = "" + service.getMaxUploadSize() + "kB";
diff --git a/dspace-sword/src/main/java/org/purl/sword/client/ServletClient.java b/dspace-sword/src/main/java/org/purl/sword/client/ServletClient.java
deleted file mode 100644
index 963e9637dd..0000000000
--- a/dspace-sword/src/main/java/org/purl/sword/client/ServletClient.java
+++ /dev/null
@@ -1,455 +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/
- */
-
-/**
- * Copyright (c) 2008, Aberystwyth University
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  - Redistributions of source code must retain the above
- *    copyright notice, this list of conditions and the
- *    following disclaimer.
- *
- *  - Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- *  - Neither the name of the Centre for Advanced Software and
- *    Intelligent Systems (CASIS) nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
- * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-package org.purl.sword.client;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileItemFactory;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.purl.sword.base.DepositResponse;
-import org.purl.sword.base.SWORDEntry;
-import org.purl.sword.base.ServiceDocument;
-
-/**
- * Example client that runs as a Servlet.
- *
- * @author Stuart Lewis
- */
-public class ServletClient extends HttpServlet {
-
-    /**
-     * The user agent name of this library
-     */
-    public static final String userAgent = "SWORDAPP Java Client: SWORD version 1.3 compatible (http://sourceforge" +
-        ".net/projects/sword-app/)";
-
-    /**
-     * Temporary directory.
-     */
-    private String tempDirectory;
-
-    /**
-     * List of urls for the destination services to access.
-     */
-    private String[] urls;
-
-    /**
-     * Used to determine if a proxy value should be set.
-     */
-    private boolean useProxy = false;
-
-    /**
-     * The proxy host name.
-     */
-    private String pHost;
-
-    /**
-     * The proxy port name.
-     */
-    private int pPort;
-
-    /** Counter used during Deposit information. */
-    private static int counter = 0;
-
-    /**
-     * Initialise the servlet.
-     */
-    public void init() {
-        tempDirectory = getServletContext().getInitParameter(
-            "upload-temp-directory");
-        if ((tempDirectory == null) || (tempDirectory.equals(""))) {
-            tempDirectory = System.getProperty("java.io.tmpdir");
-        }
-        String lots = getServletContext().getInitParameter("client-urls");
-        urls = lots.split(",");
-
-        pHost = getServletContext().getInitParameter("proxy-host");
-        String pPortstr = getServletContext().getInitParameter("proxy-port");
-        if (((pHost != null) && (!pHost.equals("")))
-            && ((pPortstr != null) && (!pPortstr.equals("")))) {
-            try {
-                pPort = Integer.parseInt(pPortstr);
-                useProxy = true;
-            } catch (Exception e) {
-                // Port number not numeric
-            }
-        }
-    }
-
-    /**
-     * Handle a get request. Simply show the default form (form.jsp)
-     *
-     * @param request The request details
-     * @param response The response to write to.
-     *
-     * @throws ServletException
-     *     An exception that provides information on a database access error or other errors.
-     * @throws IOException
-     *     A general class of exceptions produced by failed or interrupted I/O operations.
-     */
-    protected void doGet(HttpServletRequest request,
-                         HttpServletResponse response) throws ServletException, IOException {
-        // Get request, so show the default page
-        request.setAttribute("urls", urls);
-        request.getRequestDispatcher("form.jsp").forward(request, response);
-    }
-
-    /**
-     * Process the post. Determine if the request is for a post or service
-     * document. Then, dispatch the request to the appropriate handler.
-     *
-     * @param request The request details.
-     * @param response The response to write to.
-     *
-     * @throws ServletException
-     *     An exception that provides information on a database access error or other errors.
-     * @throws IOException
-     *     A general class of exceptions produced by failed or interrupted I/O operations.
-     */
-
-    protected void doPost(HttpServletRequest request,
-                          HttpServletResponse response) throws ServletException, IOException {
-        if (request.getParameter("servicedocument") != null) {
-            this.doServiceDocument(request, response);
-        } else if (request.getParameter("deposit") != null) {
-            request.setAttribute("url", request.getParameter("url"));
-            request.setAttribute("u", request.getParameter("u"));
-            request.setAttribute("p", request.getParameter("p"));
-            request.setAttribute("obo", request.getParameter("obo"));
-            request.setAttribute("abstract", request.getParameter("abstract"));
-            request.setAttribute("policy", request.getParameter("policy"));
-            request.setAttribute("treatment", request.getParameter("treatment"));
-            request.setAttribute("mediation", request.getParameter("mediation"));
-            request.setAttribute("accepts", request.getParameter("accepts"));
-            request.setAttribute("acceptsp", request.getParameter("acceptsp"));
-            request.setAttribute("maxuploadsize", request.getParameter("maxuploadsize"));
-            request.getRequestDispatcher("depositform.jsp").forward(request, response);
-        } else if (ServletFileUpload.isMultipartContent(request)) {
-            this.doDeposit(request, response);
-        } else {
-            request.setAttribute("urls", urls);
-            request.getRequestDispatcher("form.jsp").forward(request, response);
-        }
-    }
-
-    /**
-     * Process the request for a service document.
-     *
-     * @param request The request details.
-     * @param response The response to write to.
-     *
-     * @throws ServletException
-     *     An exception that provides information on a database access error or other errors.
-     * @throws IOException
-     *     A general class of exceptions produced by failed or interrupted I/O operations.
-     */
-
-    private void doServiceDocument(HttpServletRequest request,
-                                   HttpServletResponse response) throws ServletException, IOException {
-        // Get the service document
-        Client client = new Client();
-        // Which URL do we want?
-        URL url = new URL(request.getParameter("url"));
-        String theUrl = request.getParameter("url");
-
-        if ((request.getParameter("ownurl") != null)
-            && (!request.getParameter("ownurl").equals(""))) {
-            url = new URL(request.getParameter("ownurl"));
-            theUrl = request.getParameter("ownurl");
-        }
-
-        int port = url.getPort();
-        if (port == -1) {
-            port = 80;
-        }
-
-        // Set up the server
-        client.setServer(url.getHost(), port);
-        client.setCredentials(request.getParameter("u"), request.getParameter("p"));
-        if (useProxy) {
-            client.setProxy(pHost, pPort);
-        }
-
-        try {
-            ServiceDocument sd = client.getServiceDocument(theUrl,
-                                                           request.getParameter("obo"));
-
-            // Set the status
-            Status status = client.getStatus();
-            request.setAttribute("status", status.toString());
-            if (status.getCode() == 200) {
-                // Set the debug response
-                String xml = sd.marshall();
-
-                String validateXml = xml;
-                validateXml = validateXml.replaceAll("&", "&amp;");
-                validateXml = validateXml.replaceAll("<", "&lt;");
-                validateXml = validateXml.replaceAll(">", "&gt;");
-                validateXml = validateXml.replaceAll("\"", "&quot;");
-                validateXml = validateXml.replaceAll("'", "&apos;");
-                request.setAttribute("xmlValidate", validateXml); // for passing to validation
-
-                xml = xml.replaceAll("<", "&lt;");
-                xml = xml.replaceAll(">", "&gt;");
-                request.setAttribute("xml", xml);
-
-                // Set the ServiceDocument and associated values
-                request.setAttribute("sd", sd);
-                request.setAttribute("sdURL", theUrl);
-                request.setAttribute("u", request.getParameter("u"));
-                request.setAttribute("p", request.getParameter("p"));
-                request.setAttribute("sdOBO", request.getParameter("obo"));
-                request.getRequestDispatcher("servicedocument.jsp").forward(
-                    request, response);
-                return;
-            } else {
-                request.setAttribute("error", status.getCode() + " "
-                    + status.getMessage());
-                request.setAttribute("urls", urls);
-                request.getRequestDispatcher("form.jsp").forward(request,
-                                                                 response);
-                return;
-            }
-        } catch (SWORDClientException e) {
-            e.printStackTrace();
-            request.setAttribute("error", e.toString());
-            request.setAttribute("urls", urls);
-            request.getRequestDispatcher("form.jsp").forward(request, response);
-        }
-    }
-
-    /**
-     * Process a deposit.
-     *
-     * @param request The request details.
-     * @param response The response to output to.
-     *
-     * @throws ServletException
-     *     An exception that provides information on a database access error or other errors.
-     * @throws IOException
-     *     A general class of exceptions produced by failed or interrupted I/O operations.
-     */
-    private void doDeposit(HttpServletRequest request,
-                           HttpServletResponse response) throws ServletException, IOException {
-        // Do the deposit
-        Client client = new Client();
-        try {
-            PostMessage message = new PostMessage();
-            message.setUserAgent(ClientConstants.SERVICE_NAME);
-
-            // Get the file
-            FileItemFactory factory = new DiskFileItemFactory();
-
-            // Create a new file upload handler
-            ServletFileUpload upload = new ServletFileUpload(factory);
-
-            // Parse the request
-            List<FileItem> items = upload.parseRequest(request);
-            Iterator<FileItem> iter = items.iterator();
-            String u = null;
-            String p = null;
-            String contentDisposition = null;
-            String filetype = null;
-            boolean useMD5 = false;
-            boolean errorMD5 = false;
-            boolean verbose = false;
-            boolean noOp = false;
-            boolean login = false;
-            while (iter.hasNext()) {
-                FileItem item = iter.next();
-                if (item.isFormField()) {
-                    String name = item.getFieldName();
-                    String value = item.getString();
-                    if (name.equals("url")) {
-                        message.setDestination(value);
-                        URL url = new URL(value);
-                        int port = url.getPort();
-                        if (port == -1) {
-                            port = 80;
-                        }
-                        client.setServer(url.getHost(), port);
-                    } else if (name.equals("usemd5")) {
-                        useMD5 = true;
-                    } else if (name.equals("errormd5")) {
-                        errorMD5 = true;
-                    } else if (name.equals("verbose")) {
-                        verbose = true;
-                    } else if (name.equals("noop")) {
-                        noOp = true;
-                    } else if (name.equals("obo")) {
-                        message.setOnBehalfOf(value);
-                    } else if (name.equals("slug")) {
-                        if ((value != null) && (!value.trim().equals(""))) {
-                            message.setSlug(value);
-                        }
-                    } else if (name.equals("cd")) {
-                        contentDisposition = value;
-                    } else if (name.equals("filetype")) {
-                        filetype = value;
-                    } else if (name.equals("formatnamespace")) {
-                        if ((value != null) && (!value.trim().equals(""))) {
-                            message.setFormatNamespace(value);
-                        }
-                    } else if (name.equals("u")) {
-                        u = value;
-                        login = true;
-                        request.setAttribute("u", value);
-                    } else if (name.equals("p")) {
-                        p = value;
-                        login = true;
-                    }
-                    request.setAttribute(name, value);
-                } else {
-                    String fname = tempDirectory + File.separator +
-                        "ServletClient-" + counter++;
-                    if ((contentDisposition != null) && (!contentDisposition.equals(""))) {
-                        fname = tempDirectory + File.separator + contentDisposition;
-                    }
-
-                    File uploadedFile = new File(fname);
-                    item.write(uploadedFile);
-                    message.setFilepath(fname);
-
-                    if ((filetype == null) || (filetype.trim().equals(""))) {
-                        message.setFiletype(item.getContentType());
-                    } else {
-                        message.setFiletype(filetype);
-                    }
-                }
-            }
-
-            if (login) {
-                client.setCredentials(u, p);
-            }
-
-            if (useProxy) {
-                client.setProxy(pHost, pPort);
-            }
-
-            message.setUseMD5(useMD5);
-            message.setChecksumError(errorMD5);
-            message.setVerbose(verbose);
-            message.setNoOp(noOp);
-
-            // Post the file
-            DepositResponse resp = client.postFile(message);
-
-            // Set the status
-            Status status = client.getStatus();
-            request.setAttribute("status", status.toString());
-            if ((status.getCode() == 201) || (status.getCode() == 202)) {
-                // Set the debug response
-                String xml = resp.marshall();
-
-                String validateXml = xml;
-                validateXml = validateXml.replaceAll("&", "&amp;");
-                validateXml = validateXml.replaceAll("<", "&lt;");
-                validateXml = validateXml.replaceAll(">", "&gt;");
-                validateXml = validateXml.replaceAll("\"", "&quot;");
-                validateXml = validateXml.replaceAll("'", "&apos;");
-                request.setAttribute("xmlValidate", validateXml); // for passing to validation
-
-                xml = xml.replaceAll("<", "&lt;");
-                xml = xml.replaceAll(">", "&gt;");
-                request.setAttribute("xml", xml);
-                SWORDEntry se = resp.getEntry();
-                request.setAttribute("id", se.getId());
-                request.setAttribute("authors", se.getAuthors());
-                request.setAttribute("contributors", se.getContributors());
-                request.setAttribute("title", se.getTitle().getContent());
-                request.setAttribute("updated", se.getUpdated());
-                request.setAttribute("categories", se.getCategories());
-                request.setAttribute("treatment", se.getTreatment());
-                request.setAttribute("summary", se.getSummary().getContent());
-                request.setAttribute("generator", se.getGenerator().getContent());
-                request.setAttribute("userAgent", se.getUserAgent());
-                request.setAttribute("packaging", se.getPackaging());
-                request.setAttribute("links", se.getLinks());
-                request.setAttribute("location", resp.getLocation());
-
-                // Set the ServiceDocument and associated values
-                request.getRequestDispatcher("deposit.jsp").forward(request, response);
-                return;
-            } else {
-                String error = status.getCode() + " " + status.getMessage() + " - ";
-                try {
-                    error += resp.getEntry().getSummary().getContent();
-                } catch (Exception e) {
-                    // Do nothing - we have default error message
-                    e.printStackTrace();
-                }
-                request.setAttribute("error", error);
-
-                // Try and get an error document in xml
-                String xml = resp.marshall();
-                xml = xml.replaceAll("<", "&lt;");
-                xml = xml.replaceAll(">", "&gt;");
-                request.setAttribute("xml", xml);
-
-                request.getRequestDispatcher("depositform.jsp").forward(request, response);
-                return;
-            }
-        } catch (RuntimeException e) {
-            e.printStackTrace();
-            request.setAttribute("error", "value: " + e.toString());
-            request.setAttribute("urls", urls);
-            request.getRequestDispatcher("depositform.jsp").forward(request, response);
-        } catch (Exception e) {
-            e.printStackTrace();
-            request.setAttribute("error", "value: " + e.toString());
-            request.setAttribute("urls", urls);
-            request.getRequestDispatcher("depositform.jsp").forward(request, response);
-        }
-    }
-}
diff --git a/dspace-sword/src/main/java/org/purl/sword/server/AtomDocumentServlet.java b/dspace-sword/src/main/java/org/purl/sword/server/AtomDocumentServlet.java
index 0b2a675efd..0c7cb3aab1 100644
--- a/dspace-sword/src/main/java/org/purl/sword/server/AtomDocumentServlet.java
+++ b/dspace-sword/src/main/java/org/purl/sword/server/AtomDocumentServlet.java
@@ -9,10 +9,10 @@ package org.purl.sword.server;
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.purl.sword.base.AtomDocumentRequest;
 import org.purl.sword.base.AtomDocumentResponse;
 import org.purl.sword.base.SWORDAuthenticationException;
diff --git a/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java b/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java
index d7c01a3f04..ce63615eda 100644
--- a/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java
+++ b/dspace-sword/src/main/java/org/purl/sword/server/DepositServlet.java
@@ -19,11 +19,11 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.StringTokenizer;
 import java.util.concurrent.atomic.AtomicInteger;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.logging.log4j.Logger;
 import org.purl.sword.atom.Summary;
@@ -159,7 +159,7 @@ public class DepositServlet extends HttpServlet {
      *
      * @param request  the request.
      * @param response the response.
-     * @throws javax.servlet.ServletException passed through.
+     * @throws jakarta.servlet.ServletException passed through.
      * @throws java.io.IOException            passed through.
      */
     @Override
@@ -174,7 +174,7 @@ public class DepositServlet extends HttpServlet {
      *
      * @param request  the request.
      * @param response the response.
-     * @throws javax.servlet.ServletException passed through.
+     * @throws jakarta.servlet.ServletException passed through.
      * @throws java.io.IOException            passed through.
      */
     @Override
diff --git a/dspace-sword/src/main/java/org/purl/sword/server/DummyServer.java b/dspace-sword/src/main/java/org/purl/sword/server/DummyServer.java
index 2dc9b3b7e2..96551af2d2 100644
--- a/dspace-sword/src/main/java/org/purl/sword/server/DummyServer.java
+++ b/dspace-sword/src/main/java/org/purl/sword/server/DummyServer.java
@@ -15,8 +15,8 @@ import java.util.Date;
 import java.util.TimeZone;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.logging.log4j.Logger;
 import org.purl.sword.atom.Author;
 import org.purl.sword.atom.Content;
diff --git a/dspace-sword/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java b/dspace-sword/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java
index 494cbc9db4..842726a951 100644
--- a/dspace-sword/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java
+++ b/dspace-sword/src/main/java/org/purl/sword/server/ServiceDocumentServlet.java
@@ -10,11 +10,11 @@ package org.purl.sword.server;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.StringTokenizer;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.logging.log4j.Logger;
 import org.purl.sword.base.HttpHeaders;
@@ -107,7 +107,7 @@ public class ServiceDocumentServlet extends HttpServlet {
      *
      * @param request  the request.
      * @param response the response.
-     * @throws javax.servlet.ServletException passed through.
+     * @throws jakarta.servlet.ServletException passed through.
      * @throws java.io.IOException            passed through.
      */
     @Override
@@ -174,7 +174,7 @@ public class ServiceDocumentServlet extends HttpServlet {
      *
      * @param request  the request.
      * @param response the response.
-     * @throws javax.servlet.ServletException passed through.
+     * @throws jakarta.servlet.ServletException passed through.
      * @throws java.io.IOException            passed through.
      */
     @Override
diff --git a/dspace-swordv2/pom.xml b/dspace-swordv2/pom.xml
index 8d618bdf5f..2ed6aa1680 100644
--- a/dspace-swordv2/pom.xml
+++ b/dspace-swordv2/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
@@ -24,42 +24,40 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <!-- SWORDv2 Java implementation -->
         <dependency>
-            <groupId>org.swordapp</groupId>
+            <groupId>io.gdcc</groupId>
             <artifactId>sword2-server</artifactId>
-            <version>1.0</version>
-            <type>jar</type>
-            <classifier>classes</classifier>
+            <version>2.0.0</version>
             <exclusions>
-                <!-- Abdera is unmaintained/obsolete. But, 'fom-impl' is a new Abdera compatible library for Axiom.
-                     Therefore, we are using 'fom-impl' instead (see below) -->
+                <!-- Exclude Woodstox, as later version provided by Solr dependencies -->
                 <exclusion>
-                    <groupId>org.apache.abdera</groupId>
-                    <artifactId>abdera-client</artifactId>
+                    <groupId>org.codehaus.woodstox</groupId>
+                    <artifactId>woodstox-core-asl</artifactId>
+                </exclusion>
+                <!-- Exclude Jersey, as later version used in dspace-api -->
+                <exclusion>
+                    <groupId>org.glassfish.jersey.core</groupId>
+                    <artifactId>jersey-common</artifactId>
+                </exclusion>
+                <!-- Exclude older Apache Geronimo dependencies as these are not Jakarta EE compatible
+                     and can cause runtime errors with newer Jakarta EE compatible dependencies -->
+                <exclusion>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-activation_1.1_spec</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <!-- Newer version of log4j provided below -->
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-javamail_1.4_spec</artifactId>
                 </exclusion>
                 <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <!-- Exclude an old version of Jena in favor of new Apache Jena, which is pulled in by dspace-parent -->
-                <exclusion>
-                    <groupId>com.hp.hpl.jena</groupId>
-                    <artifactId>jena</artifactId>
+                    <groupId>org.apache.geronimo.specs</groupId>
+                    <artifactId>geronimo-stax-api_1.0_spec</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -96,29 +94,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-web</artifactId>
         </dependency>
-
-        <!-- Replacement for Abdera (required by sword2-server dependency). Abdera is no longer maintained
-             (https://abdera.apache.org/). But Axiom FOM is backwards compatible with Abdera.
-             See https://ws.apache.org/axiom/implementations/fom-impl/index.html -->
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>fom-impl</artifactId>
-            <!-- CANNOT UPGRADE WITHOUT BREAKING sword2-server (see above) -->
-            <version>1.2.22</version>
-            <exclusions>
-                <!-- Exclude Geronimo as it is NOT necessary when using javax.activation (which we use)
-                     See: https://ws.apache.org/axiom/userguide/ch04.html#d0e732 -->
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-                <!-- Exclude Woodstox, as later version provided by Solr dependencies -->
-                <exclusion>
-                    <groupId>org.codehaus.woodstox</groupId>
-                    <artifactId>woodstox-core-asl</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java b/dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java
index f238ad87e7..992d671b77 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/BinaryContentIngester.java
@@ -75,7 +75,7 @@ public class BinaryContentIngester extends AbstractSwordContentIngester {
                 context, item, "dc", "description", null, null,
                 "Zip file deposted by SWORD without accompanying metadata");
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, item, verboseDescription);
 
@@ -139,7 +139,7 @@ public class BinaryContentIngester extends AbstractSwordContentIngester {
             bs.setName(context, deposit.getFilename());
             bitstreamService.update(context, bs);
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, item, verboseDescription);
 
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
index ce8fbc20ff..f1eb2a7e0e 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/DSpaceSwordAPI.java
@@ -247,7 +247,7 @@ public class DSpaceSwordAPI {
                                Context context, VerboseDescription verboseDescription,
                                Deposit deposit, DepositResult result)
         throws DSpaceSwordException, SwordServerException {
-        // if there's an item availalble, and we want to keep the original
+        // if there's an item available, and we want to keep the original
         // then do that
         try {
             if (swordConfig.isKeepOriginal()) {
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/GenericStatementDisseminator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/GenericStatementDisseminator.java
index f06deb61fd..98bd209572 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/GenericStatementDisseminator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/GenericStatementDisseminator.java
@@ -17,7 +17,11 @@ import java.util.Map;
 import org.apache.commons.lang3.ArrayUtils;
 import org.dspace.content.Bitstream;
 import org.dspace.content.Bundle;
+import org.dspace.content.DCDate;
 import org.dspace.content.Item;
+import org.dspace.content.MetadataValue;
+import org.dspace.content.factory.ContentServiceFactory;
+import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.swordapp.server.OriginalDeposit;
@@ -28,6 +32,9 @@ public abstract class GenericStatementDisseminator
     implements SwordStatementDisseminator {
     protected SwordUrlManager urlManager;
 
+    protected ItemService itemService = ContentServiceFactory.getInstance()
+                                                             .getItemService();
+
     protected void populateStatement(Context context, Item item,
                                      Statement statement)
         throws DSpaceSwordException {
@@ -78,6 +85,7 @@ public abstract class GenericStatementDisseminator
                                 bitstream));
                         deposit.setMediaType(bitstream
                                                  .getFormat(context).getMIMEType());
+                        deposit.setDepositedOn(this.getDateOfDeposit(item));
                         originalDeposits.add(deposit);
                     }
                 }
@@ -173,4 +181,14 @@ public abstract class GenericStatementDisseminator
         }
         return swordBundle;
     }
+
+    private Date getDateOfDeposit(Item item) {
+        List<MetadataValue> values = itemService.getMetadata(item, "dc", "date", "accessioned", Item.ANY);
+        Date date = new Date();
+        if (values != null && values.size() > 0) {
+            String strDate = values.get(0).getValue();
+            date = new DCDate(strDate).toDate();
+        }
+        return date;
+    }
 }
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java b/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
index b452698514..725ae5e734 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/ReceiptGenerator.java
@@ -8,8 +8,6 @@
 package org.dspace.sword2;
 
 import java.sql.SQLException;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -28,6 +26,7 @@ import org.dspace.core.Constants;
 import org.dspace.core.Context;
 import org.dspace.services.ConfigurationService;
 import org.dspace.services.factory.DSpaceServicesFactory;
+import org.dspace.util.MultiFormatDateParser;
 import org.swordapp.server.DepositReceipt;
 import org.swordapp.server.SwordError;
 import org.swordapp.server.SwordServerException;
@@ -284,14 +283,8 @@ public class ReceiptGenerator {
         List<MetadataValue> dcv = itemService.getMetadataByMetadataString(
             result.getItem(), "dc.date.issued");
         if (dcv != null && !dcv.isEmpty()) {
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                Date published = sdf.parse(dcv.get(0).getValue());
-                receipt.getWrappedEntry().setPublished(published);
-            } catch (ParseException e) {
-                // we tried, but never mind
-                log.warn("Couldn't add published date", e);
-            }
+            Date published = MultiFormatDateParser.parse(dcv.get(0).getValue());
+            receipt.getWrappedEntry().setPublished(published);
         }
     }
 
@@ -305,14 +298,8 @@ public class ReceiptGenerator {
         List<MetadataValue> dcv = itemService.getMetadataByMetadataString(
             item, "dc.date.issued");
         if (dcv != null && dcv.size() == 1) {
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                Date published = sdf.parse(dcv.get(0).getValue());
-                receipt.getWrappedEntry().setPublished(published);
-            } catch (ParseException e) {
-                // we tried, but never mind
-                log.warn("Couldn't add published date", e);
-            }
+            Date published = MultiFormatDateParser.parse(dcv.get(0).getValue());
+            receipt.getWrappedEntry().setPublished(published);
         }
     }
 
@@ -329,14 +316,8 @@ public class ReceiptGenerator {
         List<MetadataValue> dcv = itemService.getMetadataByMetadataString(
             result.getItem(), config);
         if (dcv != null && dcv.size() == 1) {
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                Date updated = sdf.parse(dcv.get(0).getValue());
-                receipt.getWrappedEntry().setUpdated(updated);
-            } catch (ParseException e) {
-                // we tried, but never mind
-                log.warn("Couldn't add last updated date", e);
-            }
+            Date updated = MultiFormatDateParser.parse(dcv.get(0).getValue());
+            receipt.getWrappedEntry().setUpdated(updated);
         }
     }
 
@@ -352,14 +333,8 @@ public class ReceiptGenerator {
         List<MetadataValue> dcv = itemService.getMetadataByMetadataString(
             item, config);
         if (dcv != null && dcv.size() == 1) {
-            try {
-                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-                Date updated = sdf.parse(dcv.get(0).getValue());
-                receipt.getWrappedEntry().setUpdated(updated);
-            } catch (ParseException e) {
-                // we tried, but never mind
-                log.warn("Couldn't add last updated date", e);
-            }
+            Date updated = MultiFormatDateParser.parse(dcv.get(0).getValue());
+            receipt.getWrappedEntry().setUpdated(updated);
         }
     }
 }
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java
index 60ddce0189..091d3447f1 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleDCEntryIngester.java
@@ -90,7 +90,7 @@ public class SimpleDCEntryIngester extends AbstractSimpleDC
             // add the metadata to the item
             this.addMetadataToItem(context, deposit, item);
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, item, verboseDescription);
 
@@ -237,7 +237,7 @@ public class SimpleDCEntryIngester extends AbstractSimpleDC
             // add the metadata to the item
             this.addMetadataToItem(context, deposit, item);
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, item, verboseDescription);
 
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java
index bd8301617b..02b6a2fe4f 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SimpleZipContentIngester.java
@@ -94,7 +94,7 @@ public class SimpleZipContentIngester extends AbstractSwordContentIngester {
                 .addMetadata(context, item, "dc", "description", null, null,
                              "Zip file deposted by SWORD without accompanying metadata");
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, item, verboseDescription);
 
@@ -190,7 +190,7 @@ public class SimpleZipContentIngester extends AbstractSwordContentIngester {
             List<Bitstream> derivedResources = this
                 .unzipToBundle(context, depositFile, original);
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, item, verboseDescription);
 
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
index a77caa655b..9efbb1f670 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordMETSContentIngester.java
@@ -60,7 +60,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
         throws DSpaceSwordException, SwordError, SwordAuthException,
         SwordServerException {
         try {
-            // if we are actuall given an item in the deposit result of a previous operation
+            // if we are actually given an item in the deposit result of a previous operation
             // then we do an ingestToItem
             if (result != null) {
                 Item item = result.getItem();
@@ -140,7 +140,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
             // get reference to item so that we can report on it
             Item installedItem = (Item) ingestedObject;
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, installedItem, verboseDescription);
 
@@ -250,7 +250,7 @@ public class SwordMETSContentIngester extends AbstractSwordContentIngester {
             // get reference to item so that we can report on it
             Item installedItem = (Item) ingestedObject;
 
-            // update the item metadata to inclue the current time as
+            // update the item metadata to include the current time as
             // the updated date
             this.setUpdatedDate(context, installedItem, verboseDescription);
 
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
index eee3627c40..950a9e8c63 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/SwordUrlManager.java
@@ -133,7 +133,7 @@ public class SwordUrlManager {
 
             String iid = location.substring(cBaseUrl.length());
             if (iid.endsWith(".atom")) {
-                // this is the atom url, so we need to strip that to ge tthe item id
+                // this is the atom url, so we need to strip that to ge the item id
                 iid = iid.substring(0, iid.length() - ".atom".length());
             } else if (iid.endsWith(".rdf")) {
                 // this is the rdf url so we need to strip that to get the item id
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
index ea5a52091f..abebe9baeb 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerDefault.java
@@ -264,7 +264,7 @@ public class WorkflowManagerDefault implements WorkflowManager {
                              boolean containerOperation)
         throws DSpaceSwordException {
         // the containerOperation flag tells us whether this method was called by an operation which happened on the
-        // container.  This workflow implementation only changes workflow states on contaner operations, not media
+        // container.  This workflow implementation only changes workflow states on container operations, not media
         // resource operations, so we just bounce this right back.
         if (!containerOperation) {
             return;
diff --git a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerUnrestricted.java b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerUnrestricted.java
index 21f79c7450..18b6d495db 100644
--- a/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerUnrestricted.java
+++ b/dspace-swordv2/src/main/java/org/dspace/sword2/WorkflowManagerUnrestricted.java
@@ -150,7 +150,7 @@ public class WorkflowManagerUnrestricted implements WorkflowManager {
                              boolean containerOperation)
         throws DSpaceSwordException {
         // the containerOperation flag tells us whether this method was called by an operation which happened on the
-        // container.  This workflow implementation only changes workflow states on contaner operations, not media
+        // container.  This workflow implementation only changes workflow states on container operations, not media
         // resource operations, so we just bounce this right back.
         if (!containerOperation) {
             return;
diff --git a/dspace/config/crosswalks/DIM2DataCite.xsl b/dspace/config/crosswalks/DIM2DataCite.xsl
index a97d127694..935b3dc403 100644
--- a/dspace/config/crosswalks/DIM2DataCite.xsl
+++ b/dspace/config/crosswalks/DIM2DataCite.xsl
@@ -25,6 +25,10 @@
          to register DOIs anymore. Please follow and reuse the examples
          included in this file. For more information on the DataCite
          Schema, see https://schema.datacite.org. -->
+    <!-- Note regarding language codes: xml:lang regional language codes require a hyphen, whereas many
+         repositories use underscores when storing these language codes (e.g. en_GB, de_CH).
+         This template translates all underscores to hyphens when selecting value of @lang in an attribute
+         so the output will be e.g. xml:lang="en-GB", xml:lang="de-CH". -->
     
     <!-- We need the prefix to determine DOIs that were minted by ourself. -->
     <xsl:param name="prefix">10.5072/dspace-</xsl:param>
@@ -36,6 +40,10 @@
     <xsl:param name="hostinginstitution"><xsl:value-of select="$publisher" /></xsl:param>
     <!-- Please take a look into the DataCite schema documentation if you want to know how to use these elements.
          http://schema.datacite.org -->
+    <!-- Metadata-field to retrieve DOI from items -->
+    <xsl:param name="mdSchema">dc</xsl:param>
+    <xsl:param name="mdElement">identifier</xsl:param>
+    <xsl:param name="mdQualifier">uri</xsl:param>
 
     <xsl:output method="xml" indent="yes" encoding="utf-8" />
 
@@ -333,15 +341,17 @@
         company as well. We have to ensure to use URIs of our prefix
         as primary identifiers only.
     -->
-    <xsl:template match="dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and (contains(., $prefix))]">
-        <identifier identifierType="DOI">
-            <xsl:if test="starts-with(string(text()), 'https://doi.org/')">
-                <xsl:value-of select="substring(., 17)"/>
-            </xsl:if>
-            <xsl:if test="starts-with(string(text()), 'http://dx.doi.org/')">
-                <xsl:value-of select="substring(., 19)"/>
-            </xsl:if>
-        </identifier>
+    <xsl:template match="dspace:field[@mdschema=$mdSchema and @element=$mdElement and (contains(., $prefix))]">
+        <xsl:if test="(($mdQualifier and $mdQualifier != '') and @qualifier=$mdQualifier) or ((not($mdQualifier) or $mdQualifier = '') and not(@qualifier))">
+            <identifier identifierType="DOI">
+                <xsl:if test="starts-with(string(text()), 'https://doi.org/')">
+                    <xsl:value-of select="substring(., 17)"/>
+                </xsl:if>
+                <xsl:if test="starts-with(string(text()), 'http://dx.doi.org/')">
+                    <xsl:value-of select="substring(., 19)"/>
+                </xsl:if>
+            </identifier>
+        </xsl:if>
     </xsl:template>
 
     <!-- DataCite (2) :: Creator -->
@@ -356,20 +366,20 @@
     <!-- DataCite (3) :: Title -->
     <xsl:template match="dspace:field[@mdschema='dc' and @element='title']">
         <xsl:element name="title">
-            <xsl:attribute name="xml:lang"><xsl:value-of select="@lang" /></xsl:attribute>
+            <xsl:attribute name="xml:lang"><xsl:value-of select="translate(@lang, '_', '-')" /></xsl:attribute>
             <xsl:if test="@qualifier='alternative'">
-                <xsl:attribute name="xml:lang"><xsl:value-of select="@lang" /></xsl:attribute>
+                <xsl:attribute name="xml:lang"><xsl:value-of select="translate(@lang, '_', '-')" /></xsl:attribute>
                 <xsl:attribute name="titleType">AlternativeTitle</xsl:attribute>
             </xsl:if>
-            <!-- DSpace does include niehter a dc.title.subtitle nor a 
+            <!-- DSpace doesn't include a dc.title.subtitle nor a
                  dc.title.translated. If necessary, please create those in the 
                  metadata field registry. -->
             <xsl:if test="@qualifier='subtitle'">
-                <xsl:attribute name="xml:lang"><xsl:value-of select="@lang" /></xsl:attribute>
+                <xsl:attribute name="xml:lang"><xsl:value-of select="translate(@lang, '_', '-')" /></xsl:attribute>
                 <xsl:attribute name="titleType">Subtitle</xsl:attribute>
             </xsl:if>
             <xsl:if test="@qualifier='translated'">
-                <xsl:attribute name="xml:lang"><xsl:value-of select="@lang" /></xsl:attribute>
+                <xsl:attribute name="xml:lang"><xsl:value-of select="translate(@lang, '_', '-')" /></xsl:attribute>
                 <xsl:attribute name="titleType">TranslatedTitle</xsl:attribute>
             </xsl:if>
             <xsl:value-of select="." />
@@ -388,7 +398,7 @@
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='subject']">
         <xsl:element name="subject">
-            <xsl:attribute name="xml:lang"><xsl:value-of select="@lang" /></xsl:attribute>
+            <xsl:attribute name="xml:lang"><xsl:value-of select="translate(@lang, '_', '-')" /></xsl:attribute>
             <xsl:if test="@qualifier">
                 <xsl:attribute name="subjectScheme"><xsl:value-of select="@qualifier" /></xsl:attribute>
             </xsl:if>
@@ -620,7 +630,7 @@
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='description' and (@qualifier='abstract' or @qualifier='tableofcontents' or not(@qualifier))]">
         <xsl:element name="description">
-            <xsl:attribute name="xml:lang"><xsl:value-of select="@lang" /></xsl:attribute>
+            <xsl:attribute name="xml:lang"><xsl:value-of select="translate(@lang, '_', '-')" /></xsl:attribute>
             <xsl:attribute name="descriptionType">
            	<xsl:choose>
                     <xsl:when test="@qualifier='abstract'">Abstract</xsl:when>
diff --git a/dspace/config/crosswalks/google-metadata.properties b/dspace/config/crosswalks/google-metadata.properties
index 157ee9c0b1..263ab3b183 100644
--- a/dspace/config/crosswalks/google-metadata.properties
+++ b/dspace/config/crosswalks/google-metadata.properties
@@ -6,7 +6,7 @@
 
 # Field Identifiers
 
-# Pairs of field/value matches indended to uniquely identify an
+# Pairs of field/value matches intended to uniquely identify an
 # item of a particular type for unique metadata field assignment,
 # e.g. a dissertation item that contains values for the
 # dissertation-specific metadata elements.
diff --git a/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl b/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl
index 16c63c9c1a..7acc3378d6 100644
--- a/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl
+++ b/dspace/config/crosswalks/oai/metadataFormats/oai_openaire.xsl
@@ -457,6 +457,13 @@
         </oaire:funderIdentifier>
     </xsl:template>
 
+    <!-- This template creates the sub-element <oaire:funderIdentifier> from a Funded Project built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'project.funder.rorIdentifier')]" mode="entity_funding">
+        <oaire:funderIdentifier funderIdentifierType="ROR" schemeURI="http://ror.org/">
+            <xsl:value-of select="./text()"/>
+        </oaire:funderIdentifier>
+    </xsl:template>
+
     <!-- This template creates the sub-element <oaire:fundingStream> from a Funded Project built entity -->
     <xsl:template match="doc:field[starts-with(@name,'oaire.fundingStream')]" mode="entity_funding">
         <oaire:fundingStream>
@@ -883,7 +890,32 @@
     <xsl:template match="doc:element[@name='bitstreams']/doc:element[@name='bitstream']" mode="oaire">
         <oaire:file>
             <xsl:attribute name="accessRightsURI">
-                <xsl:call-template name="getRightsURI"/>
+                <!-- get the coar access rights at the individual file level -->
+                <!-- Look at resource policies to infer access level information, defaults to item-level status -->
+                <xsl:choose>
+                    <xsl:when test="doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Anonymous' and doc:field[@name='start-date']]">
+                        <xsl:call-template name="resolveRightsURI">
+                            <xsl:with-param name="field"
+                                            select="'embargo'"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:when test="doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Anonymous' and not(doc:field[@name='start-date'])]">
+                        <xsl:call-template name="resolveRightsURI">
+                            <xsl:with-param name="field"
+                                            select="'open.access'"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:when test="doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Administrator']">
+                        <xsl:call-template name="resolveRightsURI">
+                            <xsl:with-param name="field"
+                                            select="'restricted'"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <!-- Default to item-level access status information -->
+                        <xsl:call-template name="getRightsURI"/>
+                    </xsl:otherwise>
+                </xsl:choose>
          </xsl:attribute>
             <xsl:attribute name="mimeType">
             <xsl:value-of select="doc:field[@name='format']"/>
diff --git a/dspace/config/crosswalks/oai/metadataFormats/rioxx.xsl b/dspace/config/crosswalks/oai/metadataFormats/rioxx.xsl
new file mode 100644
index 0000000000..20b5d22f2c
--- /dev/null
+++ b/dspace/config/crosswalks/oai/metadataFormats/rioxx.xsl
@@ -0,0 +1,1236 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+
+
+    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/
+	Developed by DSpace @ Lyncode <dspace@lyncode.com>
+
+ -->
+<xsl:stylesheet
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:dcterms="http://purl.org/dc/terms/"
+        xmlns:rioxxterms="http://docs.rioxx.net/schema/v3.0/rioxxterms/"
+        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+        xmlns:doc="http://www.lyncode.com/xoai"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        version="1.0" xmlns:xls="http://www.w3.org/1999/XSL/Transform">
+    <xsl:output omit-xml-declaration="yes" method="xml" indent="yes"/>
+    <!-- First author global variable -->
+    <xsl:variable name="firstAuthor">
+        <xsl:call-template name="getFirstAuthor"/>
+    </xsl:variable>
+    <xsl:template match="/">
+        <rioxx xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://www.rioxx.net/schema/v3.0/rioxx/ http://www.rioxx.net/schema/v3.0/rioxx/rioxx.xsd">
+
+            <!-- RIOXX :: dc:coverage -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:coverage -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='coverage']" mode="dc"/>
+
+            <!-- RIOXX :: dc:description -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:description -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='description']/doc:element[@name='abstract']"
+                    mode="dc"/>
+
+            <!-- RIOXX :: dc:identifier
+               Persistent identifier for the resource. In repositories, this is typically a webpage which includes links to other related resources (splash page)
+            -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:identifier -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='uri']"
+                    mode="dc"/>
+
+            <!-- RIOXX :: dc:language -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:language -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='language']/doc:element[@name='iso']"
+                    mode="dc"/>
+
+            <!-- RIOXX :: dc.relation -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:relation -->
+            <!-- Declare the local repository PID for the corresponding resource, either a local DOI or a handle -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='uri']"
+                    mode="local_pid"/>
+
+            <!-- dc.relation: iterate through bundles (all files in bundle ORIGINAL) -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='bundles']/doc:element[@name='bundle']" mode="dc"/>
+
+            <!-- RIOXX :: dc:source -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:source -->
+            <xsl:variable name="isbn">
+                <xsl:call-template name="getISBN"/>
+            </xsl:variable>
+            <xsl:variable name="issn">
+                <xsl:call-template name="getISSN"/>
+            </xsl:variable>
+            <xsl:if test="not($isbn='') or not($issn='')">
+                <dc:source>
+                    <xsl:choose>
+                        <xsl:when test="not($isbn='')">
+                            <xsl:value-of select="$isbn"/>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:value-of select="$issn"/>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </dc:source>
+            </xsl:if>
+
+            <!-- RIOXX :: dc:subject -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:source -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='subject']" mode="dc"/>
+
+            <!-- RIOXX :: dc:title -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:title -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='title']" mode="dc"/>
+
+            <!-- RIOXX :: dc:type -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dc:type -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='type']" mode="dc"/>
+
+            <!-- RIOXX :: dcterms:dateAccepted -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#dcterms:dateAccepted -->
+            <xsl:variable name="acceptedDate">
+                <xsl:call-template name="getAcceptedDate"/>
+            </xsl:variable>
+            <xsl:if test="$acceptedDate!=''">
+                <dcterms:dateAccepted>
+                    <xls:value-of select="$acceptedDate"/>
+                </dcterms:dateAccepted>
+            </xsl:if>
+
+            <!-- RIOXX :: rioxxterms:contributor -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:contributor -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='contributor']/doc:element[@name!='author']"
+                    mode="rioxx"/>
+
+            <!-- RIOXX :: rioxxterms:creator -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:creator -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='contributor']/doc:element[@name='author']"
+                    mode="rioxx"/>
+
+            <!-- RIOXX :: rioxxterms:ext_relation -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:ext_relation -->
+            <!-- Include related published article if available -->
+            <xsl:if test="doc:metadata/doc:element[@name='rioxxterms']/doc:element[@name='versionofrecord']/doc:element/doc:field[@name='value']">
+                <rioxxterms:ext_relation
+                        rel="cite-as"
+                        coar_type="https://purl.org/coar/resource_type/c_6501"
+                        coar_version="https://purl.org/coar/version/c_970fb48d4fbd8a85">
+                    <xsl:value-of
+                            select="doc:metadata/doc:element[@name='rioxxterms']/doc:element[@name='versionofrecord']/doc:element/doc:field[@name='value']"/>
+                </rioxxterms:ext_relation>
+            </xsl:if>
+
+            <!-- RIOXX :: rioxxterms:grant -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:grant -->
+            <!-- AND -->
+            <!-- RIOXX :: rioxxterms:project -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:project -->
+            <!-- Construct rioxxterms:project and rioxxterms:grant from project and funding entities -->
+            <xsl:apply-templates
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='relation']" mode="rioxx"/>
+
+            <!-- RIOXX :: rioxxterms:publication_date -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:publication_date -->
+            <rioxxterms:publication_date>
+                <xsl:choose>
+                    <xsl:when
+                            test="doc:metadata/doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='issued']/doc:element/doc:field[@name='value']">
+                        <xls:value-of
+                                select="doc:metadata/doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='issued']/doc:element/doc:field[@name='value']"/>
+                    </xsl:when>
+                    <xsl:when
+                            test="doc:metadata/doc:element[@name='dcterms']/doc:element[@name='issuedOnline']/doc:element/doc:field[@name='value']">
+                        <xls:value-of
+                                select="doc:metadata/doc:element[@name='dcterms']/doc:element[@name='issuedOnline']/doc:element/doc:field[@name='value']"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <!-- Accessioned date in form 2023-07-26T14:53:19Z; we need YYYY-MM-dd -->
+                        <xsl:call-template name="getDateAccessioned"></xsl:call-template>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </rioxxterms:publication_date>
+
+            <!-- RIOXX :: rioxxterms:publisher -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:publisher -->
+            <xsl:for-each
+                    select="doc:metadata/doc:element[@name='dc']/doc:element[@name='publisher']/doc:element/doc:field[@name='value']">
+                <dc:publisher>
+                    <rioxxterms:name>
+                        <xls:value-of select="."/>
+                    </rioxxterms:name>
+                </dc:publisher>
+            </xsl:for-each>
+
+            <!-- RIOXX :: rioxxterms:record_public_release_date -->
+            <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:record_public_release_date -->
+            <rioxxterms:record_public_release_date>
+                <xsl:call-template name="getDateAccessioned"></xsl:call-template>
+            </rioxxterms:record_public_release_date>
+        </rioxx>
+    </xsl:template>
+
+    <!-- XML Element templates -->
+    <!-- dc.coverage -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:coverage -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='coverage']" mode="dc">
+        <!-- dc.coverage -->
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <dc:coverage>
+                <xsl:value-of select="."/>
+            </dc:coverage>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- dc.description -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:coverage -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='description']/doc:element[@name='abstract']"
+                  mode="dc">
+        <!-- dc.description -->
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <dc:description>
+                <xsl:value-of select="."/>
+            </dc:description>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- dc.identifier -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:identifier -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='uri']"
+                  mode="dc">
+        <xsl:variable name="uris">
+            <xsl:for-each select="./doc:element/doc:field[@name='value']">
+                <xsl:variable name="isDOI">
+                    <xsl:call-template name="isDOI">
+                        <xsl:with-param name="field">
+                            <xsl:value-of select="text()"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+                <xsl:variable name="isHandle">
+                    <xsl:call-template name="isHandle">
+                        <xsl:with-param name="field">
+                            <xsl:value-of select="text()"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+                <!-- URI that is not a DOI or a Handle -->
+                <xsl:if test="$isDOI='false' and $isHandle='false'">
+                    <dc:identifier>
+                        <xsl:value-of select="."/>
+                    </dc:identifier>
+                </xsl:if>
+            </xsl:for-each>
+        </xsl:variable>
+        <!-- Retrieve only first URI value that is not a DOI or a Handle -->
+        <xsl:copy-of select="$uris[position()=1]"/>
+
+    </xsl:template>
+    <!-- dc.relation type cite-as for local pids -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='uri']"
+                  mode="local_pid">
+        <xsl:variable name="uris">
+            <xsl:for-each select="./doc:element/doc:field[@name='value']">
+                <xsl:variable name="isDOI">
+                    <xsl:call-template name="isDOI">
+                        <xsl:with-param name="field">
+                            <xsl:value-of select="text()"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+                <xsl:variable name="isHandle">
+                    <xsl:call-template name="isHandle">
+                        <xsl:with-param name="field">
+                            <xsl:value-of select="text()"/>
+                        </xsl:with-param>
+                    </xsl:call-template>
+                </xsl:variable>
+                <!-- URI that is either a DOI or a Handle -->
+                <xsl:if test="$isDOI='true' or $isHandle='true'">
+                    <dc:relation>
+                        <xsl:attribute name="rel">
+                            <xsl:value-of select="'cite-as'"/>
+                        </xsl:attribute>
+                        <xsl:value-of select="."/>
+                    </dc:relation>
+                </xsl:if>
+            </xsl:for-each>
+        </xsl:variable>
+        <!-- Retrieve only first URI value that is either a DOI or a Handle -->
+        <xsl:copy-of select="$uris[position()=1]"/>
+    </xsl:template>
+
+    <!-- dc.title -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:title -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='title'][position() = 1]" mode="dc">
+        <dc:title>
+            <xsl:value-of select="./doc:element/doc:field[@name='value']"/>
+        </dc:title>
+    </xsl:template>
+
+    <!-- dc.language -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:language -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='language']/doc:element[@name='iso']" mode="dc">
+        <!-- dc.language -->
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <dc:language>
+                <xsl:value-of select="."/>
+            </dc:language>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- dc.subject -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:subject -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='subject']" mode="dc">
+        <!-- dc.subject -->
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <dc:subject>
+                <xsl:value-of select="."/>
+            </dc:subject>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- dc.type -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:type -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='type']" mode="dc">
+        <!-- dc.type -->
+        <dc:type>
+            <xsl:call-template name="resolveResourceTypeURI">
+                <xsl:with-param name="field">
+                    <xsl:value-of select="./doc:element/doc:field[@name='value']/text()"/>
+                </xsl:with-param>
+            </xsl:call-template>
+        </dc:type>
+    </xsl:template>
+
+    <!-- dc.relation -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#dc:relation -->
+    <xsl:template match="doc:element[@name='bundles']/doc:element[@name='bundle']" mode="dc">
+        <xsl:if test="doc:field[@name='name' and text()='ORIGINAL']">
+            <xsl:for-each select="doc:element[@name='bitstreams']/doc:element[@name='bitstream']">
+                <xsl:apply-templates select="." mode="dc"/>
+            </xsl:for-each>
+        </xsl:if>
+    </xsl:template>
+
+    <!-- dc.relation -->
+    <xsl:template match="doc:element[@name='bitstreams']/doc:element[@name='bitstream']" mode="dc">
+        <dc:relation>
+            <xsl:attribute name="rel">
+                <xsl:value-of select="'item'"/>
+            </xsl:attribute>
+            <xsl:attribute name="type">
+                <xsl:value-of select="doc:field[@name='format']"/>
+            </xsl:attribute>
+            <xsl:attribute name="coar_type">
+                <xsl:variable name="dcTypeMetadata">
+                    <xsl:call-template name="getTypeMetadata"/>
+                </xsl:variable>
+                <xsl:call-template name="resolveResourceTypeURI">
+                    <xsl:with-param name="field" select="$dcTypeMetadata"/>
+                </xsl:call-template>
+            </xsl:attribute>
+            <!-- coar_version
+            When used, the coar_version attribute MUST contain a value which is an identifier
+            from the COAR Version Types Vocabulary: http://purl.org/coar/version/.
+            -->
+            <xsl:attribute name="coar_version">
+                <xsl:call-template name="resolveResourceVersionURI">
+                    <xsl:with-param name="version">
+                        <xsl:call-template name="getRioxxVersion"/>
+                    </xsl:with-param>
+                    <xsl:with-param name="description">
+                        <xsl:value-of select="doc:field[@name='description']"/>
+                    </xsl:with-param>
+                </xsl:call-template>
+            </xsl:attribute>
+            <!-- access_rights -->
+            <xsl:variable name="bitstreamAccessStatusText">
+                <xsl:call-template name="getBitstreamAccessStatus">
+                    <xsl:with-param name="bitstream" select="."/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:attribute name="access_rights">
+                <!-- get the coar access rights at the individual file level -->
+                <!-- Look at resource policies to infer access level information, defaults to item-level status -->
+                <xsl:choose>
+                    <xsl:when test="$bitstreamAccessStatusText='embargo' or $bitstreamAccessStatusText='open.access' or $bitstreamAccessStatusText='restricted'">
+                        <xsl:call-template name="resolveRightsURI">
+                            <xsl:with-param name="field"
+                                            select="$bitstreamAccessStatusText"/>
+                        </xsl:call-template>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <!-- Default to item-level access status information -->
+                        <xsl:call-template name="getRightsURI"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:attribute>
+            <!-- Add deposit date -->
+            <xsl:variable name="depositDate">
+                <xsl:call-template name="getDepositDate"/>
+            </xsl:variable>
+            <xsl:choose>
+                <xsl:when test="$depositDate!=''">
+                    <xsl:attribute name="deposit_date">
+                        <xsl:value-of select="$depositDate"/>
+                    </xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:attribute name="deposit_date">
+                        <xsl:call-template name="getDateAccessioned"/>
+                    </xsl:attribute>
+                </xsl:otherwise>
+            </xsl:choose>
+            <!-- Add embargo information: resource_exposed_date -->
+            <!-- Only set resource_exposed_Date if access status != 'restricted' -->
+            <xsl:if test="$bitstreamAccessStatusText!='restricted'">
+                <!-- First policy found with action=READ; group=Anonymous and start-date attribute is not null -->
+                <xsl:variable name="startDate">
+                    <xsl:value-of
+                            select="doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Anonymous' and doc:field[@name='start-date']/text()][position()=1]/doc:field[@name='start-date']/text()"/>
+                </xsl:variable>
+                <xsl:variable name="dateAvailable">
+                    <xsl:call-template name="getDateAvailable"/>
+                </xsl:variable>
+                <xsl:choose>
+                    <xsl:when test="$startDate!=''">
+                        <xsl:attribute name="resource_exposed_date">
+                            <xsl:value-of select="$startDate"/>
+                        </xsl:attribute>
+                    </xsl:when>
+                    <xsl:when test="$dateAvailable!=''">
+                        <xsl:attribute name="resource_exposed_date">
+                            <xsl:value-of select="$dateAvailable"/>
+                        </xsl:attribute>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:attribute name="resource_exposed_date">
+                            <xsl:call-template name="getDateAccessioned"/>
+                        </xsl:attribute>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </xsl:if>
+            <xsl:value-of select="doc:field[@name='url']/text()"/>
+        </dc:relation>
+    </xsl:template>
+
+    <!-- rioxxterms:ext_relation -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:ext_relation -->
+    <!-- Related dataset(s) -->
+    <!-- Related published article(s) -->
+    <!-- TODO Add crosswalk to related datasets and articles -->
+
+    <!-- rioxxterms:creator -->
+    <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:creator -->
+    <xsl:template
+            match="doc:element[@name='dc']/doc:element[@name='contributor']/doc:element[@name='author']" mode="rioxx">
+        <!-- rioxxterms:creator -->
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <xsl:variable name="isRelatedEntity">
+                <xsl:call-template name="isRelatedEntity">
+                    <xsl:with-param name="element" select="."/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+                <!-- if next sibling is authority and starts with virtual:: -->
+                <xsl:when test="$isRelatedEntity = 'true'">
+                    <xsl:variable name="entity">
+                        <xsl:call-template name="buildEntityNode">
+                            <xsl:with-param name="element" select="."/>
+                        </xsl:call-template>
+                    </xsl:variable>
+                    <xsl:apply-templates select="$entity" mode="entity_creator"/>
+                </xsl:when>
+                <!-- simple text metadata -->
+                <xsl:otherwise>
+                    <rioxxterms:creator>
+                        <xsl:if test="$firstAuthor=.">
+                            <xsl:attribute name="first-named-author">
+                                <xsl:text>true</xsl:text>
+                            </xsl:attribute>
+                        </xsl:if>
+                        <rioxxterms:name>
+                            <xsl:value-of select="./text()"/>
+                        </rioxxterms:name>
+                    </rioxxterms:creator>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- rioxxterms:creator -->
+    <xsl:template match="doc:element" mode="entity_creator">
+        <xsl:variable name="isOrgUnitEntity">
+            <xsl:call-template name="hasOrganizationLegalNameField">
+                <xsl:with-param name="element" select="."/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="author_name">
+            <xsl:choose>
+                <xsl:when test="$isOrgUnitEntity = 'true'">
+                    <xsl:value-of select="doc:field[starts-with(@name,'organization.legalName')]"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="doc:field[starts-with(@name,'dc.contributor.author')]"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:variable>
+        <rioxxterms:creator>
+            <xsl:if test="$firstAuthor=$author_name">
+                <xsl:attribute name="first-named-author">
+                    <xsl:text>true</xsl:text>
+                </xsl:attribute>
+            </xsl:if>
+            <rioxxterms:name>
+                <xsl:value-of select="$author_name"/>
+            </rioxxterms:name>
+            <xsl:apply-templates select="doc:field" mode="entity_author"/>
+        </rioxxterms:creator>
+    </xsl:template>
+
+    <!-- rioxxterms:contributor -->
+    <!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:contributor -->
+    <xsl:template
+            match="doc:element[@name='dc']/doc:element[@name='contributor']/doc:element[@name!='author']" mode="rioxx">
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <xsl:variable name="isRelatedEntity">
+                <xsl:call-template name="isRelatedEntity">
+                    <xsl:with-param name="element" select="."/>
+                </xsl:call-template>
+            </xsl:variable>
+            <xsl:choose>
+                <!-- if next sibling is authority and starts with virtual:: -->
+                <xsl:when test="$isRelatedEntity = 'true'">
+                    <xsl:variable name="entity">
+                        <xsl:call-template name="buildEntityNode">
+                            <xsl:with-param name="element" select="."/>
+                        </xsl:call-template>
+                    </xsl:variable>
+                    <xsl:apply-templates select="$entity" mode="entity_contributor"/>
+                </xsl:when>
+                <!-- simple text metadata -->
+                <xsl:otherwise>
+                    <rioxxterms:contributor>
+                        <rioxxterms:name>
+                            <xsl:value-of select="./text()"/>
+                        </rioxxterms:name>
+                    </rioxxterms:contributor>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- rioxxterms:contributor -->
+    <xsl:template match="doc:element" mode="entity_contributor">
+        <xsl:variable name="isOrgUnitEntity">
+            <xsl:call-template name="hasOrganizationLegalNameField">
+                <xsl:with-param name="element" select="."/>
+            </xsl:call-template>
+        </xsl:variable>
+        <rioxxterms:contributor>
+            <rioxxterms:name>
+                <xsl:choose>
+                    <xsl:when test="$isOrgUnitEntity = 'true'">
+                        <xsl:value-of select="doc:field[starts-with(@name,'organization.legalName')]"/>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="doc:field[starts-with(@name,'dc.contributor')]"/>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </rioxxterms:name>
+            <xsl:apply-templates select="doc:field" mode="entity_author"/>
+        </rioxxterms:contributor>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.*')]" mode="entity_author">
+        <!-- TODO resolve the scheme based on the value -->
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type ORCID from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.orcid')]" mode="entity_author">
+        <rioxxterms:id>
+            <xsl:choose>
+                <!-- Prepend ORCID URI if field only contains the ORCID ID number -->
+                <xsl:when test="not(starts-with(./text(), 'http'))">
+                    <xsl:value-of select="concat('https://orcid.org/', ./text())"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:value-of select="./text()"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type Scopus Author ID from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.scopus-author-id')]"
+                  mode="entity_author">
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type Ciencia ID from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.ciencia-id')]" mode="entity_author">
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type Researcher ID from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.rid')]" mode="entity_author">
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type Google Scholar ID from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.gsid')]" mode="entity_author">
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type ISNI from a Person built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'person.identifier.isni')]" mode="entity_author">
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> for an organization from a built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'organization.identifier.*')]" mode="entity_author">
+        <!-- TODO resolve the scheme based on the value -->
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <rioxxterms:id> of type ISNI for an organization from a built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'organization.identifier.isni')]" mode="entity_author">
+        <rioxxterms:id>
+            <xsl:value-of select="./text()"/>
+        </rioxxterms:id>
+    </xsl:template>
+
+    <!-- rioxxterms:grant -->
+    <!--  https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:grant -->
+    <xsl:template match="doc:element[@name='dc']/doc:element[@name='relation']" mode="rioxx">
+        <xsl:for-each select="./doc:element/doc:field[@name='value']">
+            <xsl:variable name="isRelatedEntity">
+                <xsl:call-template name="isRelatedEntity">
+                    <xsl:with-param name="element" select="."/>
+                </xsl:call-template>
+            </xsl:variable>
+            <!-- if next sibling is authority and starts with virtual:: -->
+            <xsl:if test="$isRelatedEntity = 'true'">
+                <xsl:variable name="entity">
+                    <xsl:call-template name="buildEntityNode">
+                        <xsl:with-param name="element" select="."/>
+                    </xsl:call-template>
+                </xsl:variable>
+                <xsl:apply-templates select="$entity" mode="entity_project"/>
+                <xsl:apply-templates select="$entity" mode="entity_funding"/>
+            </xsl:if>
+        </xsl:for-each>
+    </xsl:template>
+
+    <!-- rioxxterms:project -->
+    <xsl:template match="doc:element" mode="entity_project">
+        <rioxxterms:project>
+            <xsl:apply-templates select="doc:field" mode="entity_project"/>
+        </rioxxterms:project>
+    </xsl:template>
+
+    <!-- This template creates the property awardURI from a Funded Project built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'oaire.awardURI')]" mode="entity_project">
+        <xsl:value-of select="./text()"/>
+    </xsl:template>
+
+    <!-- rioxxterms:grant -->
+    <xsl:template match="doc:element" mode="entity_funding">
+        <rioxxterms:grant>
+            <xsl:apply-templates select="doc:field" mode="entity_funding"/>
+        </rioxxterms:grant>
+    </xsl:template>
+
+    <!-- This template creates the attribute funderName from a Funded Project built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'project.funder.name')]" mode="entity_funding">
+        <xsl:attribute name="funderName">
+            <xsl:value-of select="./text()"/>
+        </xsl:attribute>
+    </xsl:template>
+
+    <!-- This template creates the sub-element funder_id from a Funded Project built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'project.funder.identifier')]" mode="entity_funding">
+        <!-- TODO: recognize the type ISNI / GRID / Crossref Funder -->
+        <xsl:attribute name="funder_id">
+            <xsl:value-of select="./text()"/>
+        </xsl:attribute>
+    </xsl:template>
+
+    <!-- This template creates the sub-element <oaire:awardNumber> from a Funded Project built entity -->
+    <xsl:template match="doc:field[starts-with(@name,'oaire.awardNumber')]" mode="entity_funding">
+        <xsl:value-of select="./text()"/>
+    </xsl:template>
+
+    <!--  -->
+    <!-- Auxiliary templates - get global values -->
+    <!--  -->
+
+    <!-- get first author globally -->
+    <xsl:template name="getFirstAuthor">
+        <xsl:value-of
+                select="//doc:element[@name='dc']/doc:element[@name='contributor']/doc:element[@name='author']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+    <!-- get first deposit date globally -->
+    <xsl:template name="getDepositDate">
+        <xsl:value-of
+                select="//doc:element[@name='cam']/doc:element[@name='depositDate']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first accessioned date globally -->
+    <xsl:template name="getDateAccessioned">
+        <xsl:value-of
+                select="//doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='accessioned']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first date available globally -->
+    <xsl:template name="getDateAvailable">
+        <xsl:value-of
+                select="//doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='available']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first accepted date globally -->
+    <xsl:template name="getAcceptedDate">
+        <xsl:value-of
+                select="//doc:element[@name='dcterms']/doc:element[@name='dateAccepted']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first dc type globally -->
+    <xsl:template name="getTypeMetadata">
+        <xsl:value-of
+                select="//doc:element[@name='dc']/doc:element[@name='type']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first ISBN globally -->
+    <xsl:template name="getISBN">
+        <xsl:value-of
+                select="//doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='isbn']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first ISSN globally -->
+    <xsl:template name="getISSN">
+        <xsl:value-of
+                select="//doc:element[@name='dc']/doc:element[@name='identifier']/doc:element[@name='issn']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get first rioxxterms:version globally -->
+    <xsl:template name="getRioxxVersion">
+        <xsl:value-of
+                select="//doc:element[@name='rioxxterms']/doc:element[@name='version']/doc:element/doc:field[@name='value'][position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- get the coar access rights globally from access status mechanism -->
+    <xsl:template name="getRightsURI">
+        <xsl:call-template name="resolveRightsURI">
+            <xsl:with-param name="field"
+                            select="/doc:metadata/doc:element[@name='others']/doc:element[@name='access-status']/doc:field[@name='value']/text()"/>
+        </xsl:call-template>
+    </xsl:template>
+
+    <!-- get the coar access rights globally from access status mechanism -->
+    <xsl:template name="getRightsText">
+        <xsl:value-of select="/doc:metadata/doc:element[@name='others']/doc:element[@name='access-status']/doc:field[@name='value']/text()"/>
+    </xsl:template>
+
+    <!--
+       This template will return the COAR Version Type Vocabulary URI (https://vocabularies.coar-repositories.org/version_types/)
+       like http://purl.org/coar/version/c_71e4c1898caa6e32
+       based on a valued text like 'smur'
+    -->
+    <xsl:template name="resolveResourceVersionURI">
+        <xsl:param name="description"/>
+        <xsl:param name="version"/>
+        <xsl:variable name="lc_description">
+            <xsl:call-template name="lowercase">
+                <xsl:with-param name="value" select="$description"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:variable name="lc_version">
+            <xsl:call-template name="lowercase">
+                <xsl:with-param name="value" select="$version"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$lc_description = 'accepted version' or $lc_version='am'">
+                <xsl:text>http://purl.org/coar/version/c_ab4af688f83e57aa</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_description = 'published version' or $lc_version='vor'">
+                <xsl:text>http://purl.org/coar/version/c_970fb48d4fbd8a85</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_description = 'submitted version' or $lc_version='ao'">
+                <xsl:text>http://purl.org/coar/version/c_b1a7d7d4d402bcce</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_version='cvor'">
+                <xsl:text>http://purl.org/coar/version/c_e19f295774971610</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_version='p'">
+                <xsl:text>http://purl.org/coar/version/c_fa2ee174bc00049f</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_version='evor'">
+                <xsl:text>http://purl.org/coar/version/c_dc82b40f9837b551</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_version='smur'">
+                <xsl:text>http://purl.org/coar/version/c_71e4c1898caa6e32</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>http://purl.org/coar/version/c_be7fb7dd8ff6fe43</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!--
+       This template will return the COAR Resource Type Vocabulary URI
+       like http://purl.org/coar/resource_type/c_6501
+       based on a valued text like 'article'
+       https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/field_publicationtype.html#attribute-uri-m
+    -->
+    <xsl:template name="resolveResourceTypeURI">
+        <xsl:param name="field"/>
+        <xsl:variable name="lc_dc_type">
+            <xsl:call-template name="lowercase">
+                <xsl:with-param name="value" select="$field"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$lc_dc_type = 'annotation'">
+                <xsl:text>http://purl.org/coar/resource_type/c_1162</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'journal'">
+                <xsl:text>http://purl.org/coar/resource_type/c_0640</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'article'">
+                <xsl:text>http://purl.org/coar/resource_type/c_6501</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'journal article'">
+                <xsl:text>http://purl.org/coar/resource_type/c_6501</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'editorial'">
+                <xsl:text>http://purl.org/coar/resource_type/c_b239</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'bachelor thesis'">
+                <xsl:text>http://purl.org/coar/resource_type/c_7a1f</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'bibliography'">
+                <xsl:text>http://purl.org/coar/resource_type/c_86bc</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'book'">
+                <xsl:text>http://purl.org/coar/resource_type/c_2f33</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'book part'">
+                <xsl:text>http://purl.org/coar/resource_type/c_3248</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'book review'">
+                <xsl:text>http://purl.org/coar/resource_type/c_ba08</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'website'">
+                <xsl:text>http://purl.org/coar/resource_type/c_7ad9</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'interactive resource'">
+                <xsl:text>http://purl.org/coar/resource_type/c_e9a0</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'conference proceedings'">
+                <xsl:text>http://purl.org/coar/resource_type/c_f744</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'conference object'">
+                <xsl:text>http://purl.org/coar/resource_type/c_c94f</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'conference paper'">
+                <xsl:text>http://purl.org/coar/resource_type/c_5794</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'conference poster'">
+                <xsl:text>http://purl.org/coar/resource_type/c_6670</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'contribution to journal'">
+                <xsl:text>http://purl.org/coar/resource_type/c_3e5a</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'data paper'">
+                <xsl:text>http://purl.org/coar/resource_type/c_beb9</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'dataset'">
+                <xsl:text>http://purl.org/coar/resource_type/c_ddb1</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'doctoral thesis'">
+                <xsl:text>http://purl.org/coar/resource_type/c_db06</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'image'">
+                <xsl:text>http://purl.org/coar/resource_type/c_c513</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'lecture'">
+                <xsl:text>http://purl.org/coar/resource_type/c_8544</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'letter'">
+                <xsl:text>http://purl.org/coar/resource_type/c_0857</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'master thesis'">
+                <xsl:text>http://purl.org/coar/resource_type/c_bdcc</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'moving image'">
+                <xsl:text>http://purl.org/coar/resource_type/c_8a7e</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'periodical'">
+                <xsl:text>http://purl.org/coar/resource_type/c_2659</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'letter to the editor'">
+                <xsl:text>http://purl.org/coar/resource_type/c_545b</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'patent'">
+                <xsl:text>http://purl.org/coar/resource_type/c_15cd</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'preprint'">
+                <xsl:text>http://purl.org/coar/resource_type/c_816b</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'report'">
+                <xsl:text>http://purl.org/coar/resource_type/c_93fc</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'report part'">
+                <xsl:text>http://purl.org/coar/resource_type/c_ba1f</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'research proposal'">
+                <xsl:text>http://purl.org/coar/resource_type/c_baaf</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'review'">
+                <xsl:text>http://purl.org/coar/resource_type/c_efa0</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'software'">
+                <xsl:text>http://purl.org/coar/resource_type/c_5ce6</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'still image'">
+                <xsl:text>http://purl.org/coar/resource_type/c_ecc8</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'technical documentation'">
+                <xsl:text>http://purl.org/coar/resource_type/c_71bd</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'workflow'">
+                <xsl:text>http://purl.org/coar/resource_type/c_393c</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'working paper'">
+                <xsl:text>http://purl.org/coar/resource_type/c_8042</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'thesis'">
+                <xsl:text>http://purl.org/coar/resource_type/c_46ec</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'cartographic material'">
+                <xsl:text>http://purl.org/coar/resource_type/c_12cc</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'map'">
+                <xsl:text>http://purl.org/coar/resource_type/c_12cd</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'video'">
+                <xsl:text>http://purl.org/coar/resource_type/c_12ce</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'sound'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18cc</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'musical composition'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18cd</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'text'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18cf</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'conference paper not in proceedings'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18cp</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'conference poster not in proceedings'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18co</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'musical notation'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18cw</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'internal report'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18ww</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'memorandum'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18wz</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'other type of report'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18wq</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'policy report'">
+                <xsl:text>http://purl.org/coar/resource_type/c_186u</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'project deliverable'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18op</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'report to funding agency'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18hj</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'research report'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18ws</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'technical report'">
+                <xsl:text>http://purl.org/coar/resource_type/c_18gh</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'review article'">
+                <xsl:text>http://purl.org/coar/resource_type/c_dcae04bc</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'research article'">
+                <xsl:text>http://purl.org/coar/resource_type/c_2df8fbb1</xsl:text>
+            </xsl:when>
+            <!-- other -->
+            <xsl:otherwise>
+                <xsl:text>http://purl.org/coar/resource_type/c_1843</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- This template will return the access.status at the bitstream level -->
+    <xsl:template name="getBitstreamAccessStatus">
+        <xsl:param name="bitstream"/>
+        <!-- get the coar access rights at the individual file level -->
+        <!-- Look at resource policies to infer access level information, defaults to item-level status -->
+        <xsl:choose>
+            <xsl:when test="$bitstream/doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Anonymous' and doc:field[@name='start-date']]">
+                <xsl:value-of select="'embargo'"/>
+            </xsl:when>
+            <xsl:when test="doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Anonymous' and not(doc:field[@name='start-date'])]">
+                <xsl:value-of select="'open.access'"/>
+            </xsl:when>
+            <xsl:when test="$bitstream/doc:element[@name='resourcePolicies']/doc:element[doc:field[@name='action']/text()='READ' and doc:field[@name='group']/text()='Administrator']">
+                <xsl:value-of select="'restricted'"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <!-- Default to item-level access status information - in text form -->
+                <xsl:call-template name="getRightsText"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!--
+        This template will return the COAR Access Right Vocabulary URI
+        like http://purl.org/coar/access_right/c_abf2
+        based on a value text like 'open access'
+        https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/field_accessrights.html#definition-and-usage-instruction
+     -->
+    <xsl:template name="resolveRightsURI">
+        <xsl:param name="field"/>
+        <xsl:variable name="lc_value">
+            <xsl:call-template name="lowercase">
+                <xsl:with-param name="value" select="$field"/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$lc_value = 'open access' or $lc_value = 'open.access'">
+                <xsl:text>http://purl.org/coar/access_right/c_abf2</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'embargoed access' or $lc_value = 'embargo'">
+                <xsl:text>http://purl.org/coar/access_right/c_f1cf</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'restricted access' or $lc_value = 'restricted'">
+                <xsl:text>http://purl.org/coar/access_right/c_16ec</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'metadata only access' or $lc_value = 'metadata.only'">
+                <xsl:text>http://purl.org/coar/access_right/c_14cb</xsl:text>
+            </xsl:when>
+            <xsl:otherwise/>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- get first issued date globally -->
+    <xsl:template name="getIssuedDate">
+        <xsl:value-of
+                select="//doc:element[@name='date']/doc:element[@name='issued']/doc:element/doc:field[@name='value' and position()=1]/text()"/>
+    </xsl:template>
+
+    <!-- Utils and auxiliary templates -->
+    <xsl:template name="substring-before-last">
+        <xsl:param name="string1" select="''"/>
+        <xsl:param name="string2" select="''"/>
+        <xsl:if test="$string1 != '' and $string2 != ''">
+            <xsl:variable name="head" select="substring-before($string1, $string2)"/>
+            <xsl:variable name="tail" select="substring-after($string1, $string2)"/>
+            <xsl:value-of select="$head"/>
+            <xsl:if test="contains($tail, $string2)">
+                <xsl:value-of select="$string2"/>
+                <xsl:call-template name="substring-before-last">
+                    <xsl:with-param name="string1" select="$tail"/>
+                    <xsl:with-param name="string2" select="$string2"/>
+                </xsl:call-template>
+            </xsl:if>
+        </xsl:if>
+    </xsl:template>
+
+    <!--  -->
+    <!-- Auxiliary templates - dealing with Entities -->
+    <!--  -->
+
+    <!--
+        this template will verify if a field name with "authority"
+        is present and if it starts with "virtual::"
+        if it occurs, then we are in a presence of a related entity
+     -->
+    <xsl:template name="isRelatedEntity">
+        <xsl:param name="element"/>
+        <xsl:variable name="sibling1" select="$element/following-sibling::*[1]"/>
+        <!-- if next sibling is authority and starts with virtual:: -->
+        <xsl:choose>
+            <xsl:when test="$sibling1[@name='authority' and starts-with(text(),'virtual::')]">
+                <xsl:value-of select="true()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="false()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!--
+        this template will try to look for all "virtual::"
+        and rebuild an "Entity" based on all virtual fields
+        in the source data.
+        This will retrieve something like:
+        <element name="virtual::226">
+           <field name="dc.contributor.author.none">Doe, John</field>
+           <field name="person.givenName.none">John</field>
+           <field name="person.familyName.none">Doe</field>
+           <field name="relation.isAuthorOfPublication.none">3f685bbd-07d9-403e-9de2-b8f0fabe27a7</field>
+        </element>
+     -->
+    <xsl:template name="buildEntityNode">
+        <xsl:param name="element"/>
+        <!-- authority? -->
+        <xsl:variable name="sibling1" select="$element/following-sibling::*[1]"/>
+        <!-- confidence? -->
+        <xsl:variable name="sibling2" select="$element/following-sibling::*[2]"/>
+        <!-- if next sibling is authority and starts with virtual:: -->
+        <xsl:if test="$sibling1[@name='authority' and starts-with(text(),'virtual::')]">
+            <xsl:variable name="relation_id" select="$sibling1[1]/text()"/>
+            <xsl:element name="element" namespace="http://www.lyncode.com/xoai">
+                <xsl:attribute name="name">
+                    <xsl:value-of select="$relation_id"/>
+                </xsl:attribute>
+                <!-- search for all virtual relations elements in XML -->
+                <xsl:for-each select="//doc:field[text()=$relation_id]/preceding-sibling::*[1]">
+                    <xsl:element name="field" namespace="http://www.lyncode.com/xoai">
+                        <xsl:attribute name="name">
+                            <xsl:call-template name="buildEntityFieldName">
+                                <xsl:with-param name="element" select="."/>
+                            </xsl:call-template>
+                        </xsl:attribute>
+                        <!-- field value -->
+                        <xsl:value-of select="./text()"/>
+                    </xsl:element>
+                </xsl:for-each>
+            </xsl:element>
+        </xsl:if>
+    </xsl:template>
+
+    <!--
+         This template will recursively create the field name based on parent node names
+         to be something like this:
+         person.familyName.*
+     -->
+    <xsl:template name="buildEntityFieldName">
+        <xsl:param name="element"/>
+        <xsl:choose>
+            <xsl:when test="$element/..">
+                <xsl:call-template name="buildEntityFieldName">
+                    <xsl:with-param name="element" select="$element/.."/>
+                </xsl:call-template>
+                <!-- if parent isn't an element then don't include '.' -->
+                <xsl:if test="local-name($element/../..) = 'element'">
+                    <xsl:text>.</xsl:text>
+                </xsl:if>
+                <xsl:value-of select="$element/../@name"/>
+            </xsl:when>
+            <xsl:otherwise/>
+        </xsl:choose>
+    </xsl:template>
+
+
+    <!--  -->
+    <!-- Other Auxiliary templates -->
+    <!--  -->
+    <xsl:param name="smallcase" select="'abcdefghijklmnopqrstuvwxyzàèìòùáéíóúýâêîôûãñõäëïöüÿåæœçðø'"/>
+    <xsl:param name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÈÌÒÙÁÉÍÓÚÝÂÊÎÔÛÃÑÕÄËÏÖÜŸÅÆŒÇÐØ'"/>
+
+    <!-- to retrieve a string in uppercase -->
+    <xsl:template name="uppercase">
+        <xsl:param name="value"/>
+        <xsl:value-of select="translate($value, $smallcase, $uppercase)"/>
+    </xsl:template>
+
+    <!-- to retrieve a string in lowercase -->
+    <xsl:template name="lowercase">
+        <xsl:param name="value"/>
+        <xsl:value-of select="translate($value, $uppercase, $smallcase)"/>
+    </xsl:template>
+
+    <!--
+        this template will verify if an element
+        has any field that has the name starting "organization.legalName"
+     -->
+    <xsl:template name="hasOrganizationLegalNameField">
+        <xsl:param name="element"/>
+        <xsl:choose>
+            <xsl:when test="$element/doc:field[starts-with(@name,'organization.legalName')]">
+                <xsl:value-of select="true()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="false()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- it will verify if a given field is a handle -->
+    <xsl:template name="isHandle">
+        <xsl:param name="field"/>
+        <xsl:choose>
+            <xsl:when test="$field[contains(text(),'hdl.handle.net')]">
+                <xsl:value-of select="true()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="false()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- it will verify if a given field is a DOI -->
+    <xsl:template name="isDOI">
+        <xsl:param name="field"/>
+        <xsl:choose>
+            <xsl:when test="$field[contains(text(),'doi.org') or starts-with(text(),'10.')]">
+                <xsl:value-of select="true()"/>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="false()"/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- ignore all non specified text values or attributes -->
+    <xsl:template match="text()|@*"/>
+    <xsl:template match="text()|@*" mode="rioxx"/>
+    <xsl:template match="text()|@*" mode="entity_author"/>
+    <xsl:template match="text()|@*" mode="entity_project"/>
+    <xsl:template match="text()|@*" mode="entity_funding"/>
+
+</xsl:stylesheet>
diff --git a/dspace/config/crosswalks/oai/transformers/openaire4.xsl b/dspace/config/crosswalks/oai/transformers/openaire4.xsl
index cece890450..8ac703609d 100644
--- a/dspace/config/crosswalks/oai/transformers/openaire4.xsl
+++ b/dspace/config/crosswalks/oai/transformers/openaire4.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Following OpenAIRE Guidelines 4 -->
+<!-- Following Openaire Guidelines 4 -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:doc="http://www.lyncode.com/xoai">
     <xsl:output indent="yes" method="xml" omit-xml-declaration="yes"/>
@@ -12,7 +12,7 @@
 
     <!-- 
         Formatting dc.date.issued
-        based on what OpenAIRE4 specifies for issued dates 
+        based on what Openaire4 specifies for issued dates 
         https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/field_publicationdate.html
     -->
     <xsl:template
diff --git a/dspace/config/crosswalks/oai/transformers/rioxx.xsl b/dspace/config/crosswalks/oai/transformers/rioxx.xsl
new file mode 100644
index 0000000000..7fc597b483
--- /dev/null
+++ b/dspace/config/crosswalks/oai/transformers/rioxx.xsl
@@ -0,0 +1,361 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+
+    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/
+
+	Developed by DSpace @ Lyncode <dspace@lyncode.com>
+	Following Driver Guidelines 2.0:
+		- http://www.driver-support.eu/managers.html#guidelines
+
+ -->
+<xsl:stylesheet version="1.0"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://www.lyncode.com/xoai">
+	<xsl:output indent="yes" method="xml" omit-xml-declaration="yes" />
+
+	<xsl:template match="@*|node()">
+		<xsl:copy>
+			<xsl:apply-templates select="@*|node()" />
+		</xsl:copy>
+	</xsl:template>
+
+    <!-- Formatting dc.date.issued -->
+    <xsl:template match="/doc:metadata/doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='issued']/doc:element/doc:field/text()">
+        <xsl:call-template name="formatdate">
+            <xsl:with-param name="datestr" select="." />
+        </xsl:call-template>
+    </xsl:template>
+
+    <!-- Formatting dc.date.available -->
+    <xsl:template match="/doc:metadata/doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='available']/doc:element/doc:field/text()">
+        <xsl:call-template name="formatdate">
+            <xsl:with-param name="datestr" select="." />
+        </xsl:call-template>
+    </xsl:template>
+
+    <!-- Formatting dc.date.accessioned -->
+    <xsl:template match="/doc:metadata/doc:element[@name='dc']/doc:element[@name='date']/doc:element[@name='accessioned']/doc:element/doc:field/text()">
+        <xsl:call-template name="formatdate">
+            <xsl:with-param name="datestr" select="." />
+        </xsl:call-template>
+    </xsl:template>
+
+    <xsl:template name="formatdate">
+        <xsl:param name="datestr" />
+        <xsl:variable name="sub">
+            <xsl:value-of select="substring($datestr,1,10)" />
+        </xsl:variable>
+        <xsl:value-of select="$sub" />
+    </xsl:template>
+
+    <!--
+    Modifying and normalizing dc.language
+    to ISO 639-3 (from ISO 639-1) for each language available at the submission form
+    -->
+    <xsl:template
+            match="/doc:metadata/doc:element[@name='dc']/doc:element[@name='language']/doc:element[@name='iso']/doc:element/doc:field/text()">
+
+        <xsl:variable name="lc_value">
+            <xsl:call-template name="lowercase">
+                <xsl:with-param name="value" select="."/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when test="$lc_value = 'en_US'">
+                <xsl:text>eng</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'en'">
+                <xsl:text>eng</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'es'">
+                <xsl:text>spa</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'de'">
+                <xsl:text>deu</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'fr'">
+                <xsl:text>fra</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'it'">
+                <xsl:text>ita</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'ja'">
+                <xsl:text>jpn</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'zh'">
+                <xsl:text>zho</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'pt'">
+                <xsl:text>por</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_value = 'tr'">
+                <xsl:text>tur</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:value-of select="."/>
+            </xsl:otherwise>
+        </xsl:choose>
+    </xsl:template>
+
+    <!-- Modifying and normalizing dc.type according to COAR Controlled Vocabulary for Resource Type
+    Genres (Version 2.0) (http://vocabularies.coar-repositories.org/documentation/resource_types/) -->
+    <xsl:template
+            match="/doc:metadata/doc:element[@name='dc']/doc:element[@name='type']/doc:element/doc:field/text()">
+        <xsl:variable name="dc_type" select="."/>
+        <xsl:variable name="lc_dc_type">
+            <xsl:call-template name="lowercase">
+                <xsl:with-param name="value" select="."/>
+            </xsl:call-template>
+        </xsl:variable>
+        <xsl:choose>
+            <xsl:when
+                    test="$lc_dc_type = 'annotation' or $dc_type = 'http://purl.org/coar/resource_type/c_1162'">
+                <xsl:text>annotation</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'journal'">
+                <xsl:text>journal</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'journal article' or $lc_dc_type = 'article' or $lc_dc_type = 'journalarticle' or $dc_type = 'http://purl.org/coar/resource_type/c_6501'">
+                <xsl:text>journal article</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'editorial' or $dc_type = 'http://purl.org/coar/resource_type/c_b239'">
+                <xsl:text>editorial</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'bachelor thesis' or $lc_dc_type = 'bachelorthesis' or $dc_type = 'http://purl.org/coar/resource_type/c_7a1f'">
+                <xsl:text>bachelor thesis</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'bibliography' or $dc_type = 'http://purl.org/coar/resource_type/c_86bc'">
+                <xsl:text>bibliography</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'book' or $dc_type = 'http://purl.org/coar/resource_type/c_2f33'">
+                <xsl:text>book</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'book part' or $lc_dc_type = 'bookpart' or $dc_type = 'http://purl.org/coar/resource_type/c_3248'">
+                <xsl:text>book part</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'book review' or $lc_dc_type = 'bookreview' or $dc_type = 'http://purl.org/coar/resource_type/c_ba08'">
+                <xsl:text>book review</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'website' or $dc_type = 'http://purl.org/coar/resource_type/c_7ad9'">
+                <xsl:text>website</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'interactive resource' or $lc_dc_type = 'interactiveresource' or $dc_type = 'http://purl.org/coar/resource_type/c_e9a0'">
+                <xsl:text>interactive resource</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'conference proceedings' or $lc_dc_type = 'conferenceproceedings' or $dc_type = 'http://purl.org/coar/resource_type/c_f744'">
+                <xsl:text>conference proceedings</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'conference object' or $lc_dc_type = 'conferenceobject' or $dc_type = 'http://purl.org/coar/resource_type/c_c94f'">
+                <xsl:text>conference object</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'conference paper' or $lc_dc_type = 'conferencepaper' or $dc_type = 'http://purl.org/coar/resource_type/c_5794'">
+                <xsl:text>conference paper</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'conference poster' or $lc_dc_type = 'conferenceposter' or $dc_type = 'http://purl.org/coar/resource_type/c_6670'">
+                <xsl:text>conference poster</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'contribution to journal' or $lc_dc_type = 'contributiontojournal' or $dc_type = 'http://purl.org/coar/resource_type/c_3e5a'">
+                <xsl:text>contribution to journal</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'datapaper' or $dc_type = 'http://purl.org/coar/resource_type/c_beb9'">
+                <xsl:text>data paper</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'dataset' or $dc_type = 'http://purl.org/coar/resource_type/c_ddb1'">
+                <xsl:text>dataset</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'doctoral thesis' or $lc_dc_type = 'doctoralthesis' or $dc_type = 'http://purl.org/coar/resource_type/c_db06'">
+                <xsl:text>doctoral thesis</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'image' or $dc_type = 'http://purl.org/coar/resource_type/c_c513'">
+                <xsl:text>image</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'lecture' or $dc_type = 'http://purl.org/coar/resource_type/c_8544'">
+                <xsl:text>lecture</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'letter' or $dc_type = 'http://purl.org/coar/resource_type/c_0857'">
+                <xsl:text>letter</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'master thesis' or $lc_dc_type = 'masterthesis' or $dc_type = 'http://purl.org/coar/resource_type/c_bdcc'">
+                <xsl:text>master thesis</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'moving image' or $lc_dc_type = 'movingimage' or $dc_type = 'http://purl.org/coar/resource_type/c_8a7e'">
+                <xsl:text>moving image</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'periodical' or $dc_type = 'http://purl.org/coar/resource_type/c_2659'">
+                <xsl:text>periodical</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'letter to the editor' or $lc_dc_type = 'lettertotheeditor' or $dc_type = 'http://purl.org/coar/resource_type/c_545b'">
+                <xsl:text>letter to the editor</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'patent' or $dc_type = 'http://purl.org/coar/resource_type/c_15cd'">
+                <xsl:text>patent</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'preprint' or $dc_type = 'http://purl.org/coar/resource_type/c_816b'">
+                <xsl:text>preprint</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'report' or $dc_type = 'http://purl.org/coar/resource_type/c_93fc'">
+                <xsl:text>report</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'report part' or $lc_dc_type = 'reportpart' or $dc_type = 'http://purl.org/coar/resource_type/c_ba1f'">
+                <xsl:text>report part</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'research proposal' or $lc_dc_type = 'researchproposal' or $dc_type = 'http://purl.org/coar/resource_type/c_baaf'">
+                <xsl:text>research proposal</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'review' or $dc_type = 'http://purl.org/coar/resource_type/c_efa0'">
+                <xsl:text>review</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'software' or $dc_type = 'http://purl.org/coar/resource_type/c_5ce6'">
+                <xsl:text>software</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'still image' or $lc_dc_type = 'stillimage' or $dc_type = 'http://purl.org/coar/resource_type/c_ecc8'">
+                <xsl:text>still image</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'technical documentation' or $lc_dc_type = 'technicaldocumentation' or $dc_type = 'http://purl.org/coar/resource_type/c_71bd'">
+                <xsl:text>technical documentation</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'workflow' or $dc_type = 'http://purl.org/coar/resource_type/c_393c'">
+                <xsl:text>workflow</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'working paper' or $lc_dc_type = 'workingpaper' or $dc_type = 'http://purl.org/coar/resource_type/c_8042'">
+                <xsl:text>working paper</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'thesis' or $dc_type = 'http://purl.org/coar/resource_type/c_46ec'">
+                <xsl:text>thesis</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'cartographic material' or $lc_dc_type = 'cartographicmaterial' or $dc_type = 'http://purl.org/coar/resource_type/c_12cc'">
+                <xsl:text>cartographic material</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'map' or $dc_type = 'http://purl.org/coar/resource_type/c_12cd'">
+                <xsl:text>map</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'video' or $dc_type = 'http://purl.org/coar/resource_type/c_12ce'">
+                <xsl:text>video</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'sound' or $dc_type = 'http://purl.org/coar/resource_type/c_18cc'">
+                <xsl:text>sound</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'musical composition' or $lc_dc_type = 'musicalcomposition' or $dc_type = 'http://purl.org/coar/resource_type/c_18cd'">
+                <xsl:text>musical composition</xsl:text>
+            </xsl:when>
+            <xsl:when test="$lc_dc_type = 'text' or $dc_type = 'http://purl.org/coar/resource_type/c_18cf'">
+                <xsl:text>text</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'conference paper not in proceedings' or $lc_dc_type = 'conferencepapernotinproceedings' or $dc_type = 'http://purl.org/coar/resource_type/c_18cp'">
+                <xsl:text>conference paper not in proceedings</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'conference poster not in proceedings' or $lc_dc_type = 'conferenceposternotinproceedings' or $dc_type = 'http://purl.org/coar/resource_type/c_18co'">
+                <xsl:text>conference poster not in proceedings</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'musical notation' or $dc_type = 'http://purl.org/coar/resource_type/c_18cw'">
+                <xsl:text>musical notation</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'internal report' or $lc_dc_type = 'internalreport' or $dc_type = 'http://purl.org/coar/resource_type/c_18ww'">
+                <xsl:text>internal report</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'memorandum' or $dc_type = 'http://purl.org/coar/resource_type/c_18wz'">
+                <xsl:text>memorandum</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'other type of report'  or $lc_dc_type = 'othertypeofreport' or $dc_type = 'http://purl.org/coar/resource_type/c_18wq'">
+                <xsl:text>other type of report</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'policy report' or $lc_dc_type = 'policyreport'  or $dc_type = 'http://purl.org/coar/resource_type/c_186u'">
+                <xsl:text>policy report</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'project deliverable' or $lc_dc_type = 'projectdeliverable' or $dc_type = 'http://purl.org/coar/resource_type/c_18op'">
+                <xsl:text>project deliverable</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'report to funding agency' or $lc_dc_type = 'reporttofundingagency' or $dc_type = 'http://purl.org/coar/resource_type/c_18hj'">
+                <xsl:text>report to funding agency</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'research report' or $lc_dc_type = 'researchreport' or $dc_type = 'http://purl.org/coar/resource_type/c_18ws'">
+                <xsl:text>research report</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'technical report' or $lc_dc_type = 'technicalreport' or $dc_type = 'http://purl.org/coar/resource_type/c_18gh'">
+                <xsl:text>technical report</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'review article' or $lc_dc_type = 'reviewarticle' or $dc_type = 'http://purl.org/coar/resource_type/c_dcae04bc'">
+                <xsl:text>review article</xsl:text>
+            </xsl:when>
+            <xsl:when
+                    test="$lc_dc_type = 'research article' or $lc_dc_type = 'researcharticle' or $dc_type = 'http://purl.org/coar/resource_type/c_2df8fbb1'">
+                <xsl:text>research article</xsl:text>
+            </xsl:when>
+            <xsl:otherwise>
+                <xsl:text>other</xsl:text>
+            </xsl:otherwise>
+        </xsl:choose>
+
+    </xsl:template>
+
+    <!--  -->
+    <!-- Other Auxiliary templates -->
+    <!--  -->
+    <xsl:param name="smallcase" select="'abcdefghijklmnopqrstuvwxyzàèìòùáéíóúýâêîôûãñõäëïöüÿåæœçðø'"/>
+    <xsl:param name="uppercase" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÈÌÒÙÁÉÍÓÚÝÂÊÎÔÛÃÑÕÄËÏÖÜŸÅÆŒÇÐØ'"/>
+
+    <!-- to retrieve a string in uppercase -->
+    <xsl:template name="uppercase">
+        <xsl:param name="value"/>
+        <xsl:value-of select="translate($value, $smallcase, $uppercase)"/>
+    </xsl:template>
+
+    <!-- to retrieve a string in lowercase -->
+    <xsl:template name="lowercase">
+        <xsl:param name="value"/>
+        <xsl:value-of select="translate($value, $uppercase, $smallcase)"/>
+    </xsl:template>
+
+    <!-- to retrieve a string which the first letter is in uppercase -->
+    <xsl:template name="ucfirst">
+        <xsl:param name="value"/>
+        <xsl:call-template name="uppercase">
+            <xsl:with-param name="value" select="substring($value, 1, 1)"/>
+        </xsl:call-template>
+        <xsl:call-template name="lowercase">
+            <xsl:with-param name="value" select="substring($value, 2)"/>
+        </xsl:call-template>
+    </xsl:template>
+</xsl:stylesheet>
+
diff --git a/dspace/config/crosswalks/oai/xoai.xml b/dspace/config/crosswalks/oai/xoai.xml
index e843814dd7..0f1cdf7d68 100644
--- a/dspace/config/crosswalks/oai/xoai.xml
+++ b/dspace/config/crosswalks/oai/xoai.xml
@@ -19,6 +19,7 @@
             <Format ref="qdc"/>
             <Format ref="marc"/>
             <Format ref="uketd_dc"/>
+            <Format ref="rioxx"/>
             <!--<Format ref="junii2" />-->
             <Description>
                 This is the default context of the DSpace OAI-PMH data provider.
@@ -47,7 +48,7 @@
         </Context>
 
         <!--
-            OpenAIRE Guidelines 3.0:
+            Openaire Guidelines 3.0:
 
             - https://guidelines.openaire.eu/
 
@@ -55,10 +56,10 @@
 
             - Predefined DSpace fields don't allow to set this up with a default.
          -->
-        <Context baseurl="openaire" name="OpenAIRE Context">
+        <Context baseurl="openaire" name="Openaire Context">
             <!-- Date format, field prefixes, etc are ensured by the transformer -->
             <Transformer ref="openaireTransformer"/>
-            <!-- OpenAIRE filter -->
+            <!-- Openaire filter -->
             <Filter ref="openAireFilter"/>
             <!-- Just an alias, in fact it returns all items within the driver context -->
             <Set ref="openaireSet"/>
@@ -66,12 +67,12 @@
             <Format ref="oaidc"/>
             <Format ref="mets"/>
             <Description>
-                This contexts complies with OpenAIRE Guidelines for Literature Repositories v3.0.
+                This context complies with OpenAIRE Guidelines for Literature Repositories v3.0.
             </Description>
         </Context>
 
         <!--
-            OpenAIRE Guidelines 4.0:
+            Openaire Guidelines 4.0:
 
             - https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/
 
@@ -79,15 +80,32 @@
 
             - Predefined DSpace fields don't allow to set this up with a default.
          -->
-        <Context baseurl="openaire4" name="OpenAIRE 4 Context">
+        <Context baseurl="openaire4" name="Openaire 4 Context">
             <!-- Date format, field prefixes, etc are ensured by the transformer -->
             <Transformer ref="openaire4Transformer"/>
-            <!-- OpenAIRE filter -->
-            <Filter ref="openAIRE4Filter"/>
+            <!-- Openaire filter -->
+            <Filter ref="openaire4Filter"/>
             <!-- Metadata Formats -->
             <Format ref="oaiopenaire"/>
             <Description>
-                This contexts complies with OpenAIRE Guidelines for Literature Repositories v4.0.
+                This contexts complies with Openaire Guidelines for Literature Repositories v4.0.
+            </Description>
+        </Context>
+        <!--
+            Rioxx Guidelines v3.0 Final:
+            - https://www.rioxx.net/profiles/v3-0-final
+
+         -->
+        <Context baseurl="rioxx" name="Rioxx Context">
+            <!-- Date format, field prefixes, etc are ensured by the transformer -->
+            <Transformer ref="rioxxTransformer"/>
+            <Filter ref="rioxxFilter"/>
+            <!-- Metadata Formats -->
+            <Format ref="oaidc"/>
+            <Format ref="rioxx"/>
+            <Format ref="qdc"/>
+            <Description>
+                This context complies with the Rioxx metadata profile version 3
             </Description>
         </Context>
 
@@ -176,7 +194,7 @@
             <Namespace>http://irdb.nii.ac.jp/oai</Namespace>
             <SchemaLocation>http://irdb.nii.ac.jp/oai/junii2-3-1.xsd</SchemaLocation>
         </Format>
-        <!-- Metadata format based on the OpenAIRE 4.0 guidelines
+        <!-- Metadata format based on the Openaire 4.0 guidelines
              https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/use_of_oai_pmh.html
         -->
         <Format id="oaiopenaire">
@@ -185,17 +203,34 @@
             <Namespace>http://namespace.openaire.eu/schema/oaire/</Namespace>
             <SchemaLocation>https://www.openaire.eu/schema/repo-lit/4.0/openaire.xsd</SchemaLocation>
         </Format>
+        <!-- Metadata format based on the Rioxx Application Profile Version 3.0 Final
+             - https://www.rioxx.net/profiles/v3-0-final
+        -->
+        <Format id="rioxx">
+            <Prefix>rioxx</Prefix>
+            <XSLT>metadataFormats/rioxx.xsl</XSLT>
+            <Namespace>http://www.rioxx.net/schema/v3.0/rioxx/</Namespace>
+            <SchemaLocation>http://www.rioxx.net/schema/v3.0/rioxx/ http://www.rioxx.net/schema/v3.0/rioxx/rioxx.xsd</SchemaLocation>
+            <Filter ref="rioxxFilter"/>
+        </Format>
     </Formats>
 
     <Transformers>
         <Transformer id="driverTransformer">
             <XSLT>transformers/driver.xsl</XSLT>
+            <Description>Driver context transformer</Description>
         </Transformer>
         <Transformer id="openaireTransformer">
             <XSLT>transformers/openaire.xsl</XSLT>
+            <Description>OpenAire context transformer</Description>
         </Transformer>
         <Transformer id="openaire4Transformer">
             <XSLT>transformers/openaire4.xsl</XSLT>
+            <Description>OpenAire v4 context transformer</Description>
+        </Transformer>
+        <Transformer id="rioxxTransformer">
+            <XSLT>transformers/rioxx.xsl</XSLT>
+            <Description>Rioxx context transformer</Description>
         </Transformer>
     </Transformers>
 
@@ -250,13 +285,13 @@
             </Definition>
         </Filter>
 
-        <!-- OpenAIRE filter for records returned by OAI-PMH.
+        <!-- Openaire filter for records returned by OAI-PMH.
              By default, return an Item record:
                * If a Title & Author field both exist
                * AND a valid DRIVER Document Type exists
                * AND Item is either publicly accessible OR Withdrawn (for tombstones)
-               * AND the OpenAIRE "dc.relation" is specified
-             This filter is only used in the OpenAIRE context ([oai]/openaire).
+               * AND the Openaire "dc.relation" is specified
+             This filter is only used in the Openaire context ([oai]/openaire).
         -->
         <Filter id="openAireFilter">
             <Definition>
@@ -319,7 +354,7 @@
             </Definition>
         </Filter>
 
-        <!-- OpenAIRE4 filter for records returned by OAI-PMH.
+        <!-- Openaire4 filter for records returned by OAI-PMH.
              By default, return an Item record:
                 * If it is publicly accessible
                 * * OR it has been withdrawn (in order to display a tombstone record).
@@ -328,7 +363,7 @@
                 * limiting the results only to Publications as expected
              This filter is used by the default context ([oai]/request).
         -->
-        <Filter id="openAIRE4Filter">
+        <Filter id="openaire4Filter">
             <Definition>
                 <And>
                     <LeftCondition>
@@ -359,6 +394,67 @@
             </Definition>
         </Filter>
 
+        <!-- Rioxx v3.0 Final filter for records returned by OAI-PMH.
+             By default, return an Item record:
+                * If it is publicly accessible
+                * * OR it has been withdrawn (in order to display a tombstone record).
+                * AND it does have the following elements
+                * * title
+                * * Authors
+                * * dc.type is present OR dspace.entity.type is Publication
+                * * dateAccepted
+                * * language
+             This filter is only used in the Rioxx context ([oai]/rioxx).
+        -->
+        <Filter id="rioxxFilter">
+            <Definition>
+                <And>
+                    <LeftCondition>
+                        <Or>
+                            <LeftCondition>
+                                <Custom ref="itemAccessCondition"/>
+                            </LeftCondition>
+                            <RightCondition>
+                                <Custom ref="itemWithdrawnCondition"/>
+                            </RightCondition>
+                        </Or>
+                    </LeftCondition>
+                    <RightCondition>
+                        <And>
+                            <LeftCondition>
+                                <And>
+                                    <LeftCondition>
+                                        <Custom ref="titleExistsCondition"/>
+                                    </LeftCondition>
+                                    <RightCondition>
+                                        <Custom ref="authorExistsCondition"/>
+                                    </RightCondition>
+                                </And>
+                            </LeftCondition>
+                            <RightCondition>
+                                <And>
+                                    <LeftCondition>
+                                        <Custom ref="rioxxLangExistsCondition"/>
+                                    </LeftCondition>
+                                    <RightCondition>
+                                        <Or>
+                                            <LeftCondition>
+                                                <Custom ref="rioxxTypeExistsCondition"/>
+                                            </LeftCondition>
+                                            <RightCondition>
+                                                <Custom ref="isPublicationEntityCondition"/>
+                                            </RightCondition>
+                                        </Or>
+                                    </RightCondition>
+                                </And>
+                            </RightCondition>
+                        </And>
+                    </RightCondition>
+                </And>
+            </Definition>
+
+        </Filter>
+
         <!-- Default filter for records returned by OAI-PMH.
              By default, return an Item record:
                 * If it is publicly accessible
@@ -410,6 +506,30 @@
             </Configuration>
         </CustomCondition>
 
+        <!-- Rioxx specific custom conditions -->
+        <CustomCondition id="rioxxTypeExistsCondition">
+            <Class>org.dspace.xoai.filter.DSpaceMetadataExistsFilter</Class>
+            <Configuration>
+                <list name="fields">
+                    <string name="field">dc.type</string>
+                </list>
+            </Configuration>
+        </CustomCondition>
+
+        <CustomCondition id="rioxxLangExistsCondition">
+            <Class>org.dspace.xoai.filter.DSpaceMetadataExistsFilter</Class>
+            <Configuration>
+                <list name="fields">
+                    <string name="field">dc.language.iso</string>
+                </list>
+            </Configuration>
+        </CustomCondition>
+
+        <!-- This condition determines if an item has any files in the bundle ORIGINAL -->
+        <CustomCondition id="itemsWithBitstreamsFilter">
+            <Class>org.dspace.xoai.filter.ItemsWithBitstreamFilter</Class>
+        </CustomCondition>
+
         <!-- This condition determines if an Item has a "dc.contributor.author" -->
         <CustomCondition id="authorExistsCondition">
             <Class>org.dspace.xoai.filter.DSpaceMetadataExistsFilter</Class>
@@ -457,7 +577,7 @@
 
         <!-- This condition determines if an Item has a "dc.rights" field
              specifying "open access", which is required for DRIVER
-             OR "openAccess", which is required by OpenAIRE. -->
+             OR "openAccess", which is required by Openaire. -->
         <CustomCondition id="driverAccessCondition">
             <Class>org.dspace.xoai.filter.DSpaceAtLeastOneMetadataFilter</Class>
             <Configuration>
@@ -483,7 +603,7 @@
         </CustomCondition>
 
         <!-- This condition determines if an Item has a "dc.relation" field
-             which specifies the openAIRE project ID. -->
+             which specifies the openaire project ID. -->
         <CustomCondition id="openaireRelationCondition">
             <Class>org.dspace.xoai.filter.DSpaceAtLeastOneMetadataFilter</Class>
             <Configuration>
@@ -529,5 +649,10 @@
             <Name>OpenAIRE</Name>
             <!-- Just an alias -->
         </Set>
+        <Set id="rioxxSet">
+            <Spec>rioxx</Spec>
+            <Name>Rioxx set</Name>
+            <!-- Just an alias -->
+        </Set>
     </Sets>
 </Configuration>
diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index c21fb54655..0d8086751d 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -84,7 +84,7 @@ db.url = jdbc:postgresql://localhost:5432/dspace
 db.driver = org.postgresql.Driver
 
 # PostgreSQL Database Dialect (for Hibernate)
-db.dialect = org.hibernate.dialect.PostgreSQL94Dialect
+db.dialect = org.dspace.util.DSpacePostgreSQLDialect
 
 # Database username and password
 db.username = dspace
@@ -283,7 +283,7 @@ identifier.doi.namespaceseparator = dspace/
 # this configuration file (see "Browse Configuration" section below).
 #
 # Discovery configurations may be used to modify which fields in DSpace are
-# browseable/searchable or appear as filters/facets. These are configured in
+# browsable/searchable or appear as filters/facets. These are configured in
 # the discovery.xml at:
 #   [dspace]/config/spring/api/discovery.xml
 #
@@ -317,7 +317,7 @@ handle.prefix = 123456789
 handle.dir = ${dspace.dir}/handle-server
 
 # List any additional prefixes that need to be managed by this handle server
-# (as for examle handle prefix coming from old dspace repository merged in
+# (as for example handle prefix coming from old dspace repository merged in
 # that repository)
 # handle.additional.prefixes = prefix1[, prefix2]
 
@@ -384,7 +384,7 @@ handle.dir = ${dspace.dir}/handle-server
 #core.authorization.item-admin.cc-license = true
 
 
-#### Restricted item visibilty settings ###
+#### Restricted item visibility settings ###
 # By default RSS feeds, OAI-PMH and subscription emails will include ALL items
 # regardless of permissions set on them.
 #
@@ -519,7 +519,7 @@ filter.org.dspace.app.mediafilter.PDFBoxThumbnail.inputFormats = Adobe PDF
 # text ("filter-media -f" ) and then reindex your site ("index-discovery -b").
 #textextractor.use-temp-file = false
 
-# Custom settigns for ImageMagick Thumbnail Filters
+# Custom settings for ImageMagick Thumbnail Filters
 # ImageMagick and GhostScript must be installed on the server, set the path to ImageMagick and GhostScript executable
 #   http://www.imagemagick.org/
 #   http://www.ghostscript.com/
@@ -780,7 +780,7 @@ event.dispatcher.default.class = org.dspace.event.BasicDispatcher
 # Add rdf here, if you are using dspace-rdf to export your repository content as RDF.
 # Add iiif here, if you are using dspace-iiif.
 # Add orcidqueue here, if the integration with ORCID is configured and wish to enable the synchronization queue functionality
-event.dispatcher.default.consumers = versioning, discovery, eperson
+event.dispatcher.default.consumers = versioning, discovery, eperson, qaeventsdelete, ldnmessage
 
 # The noindex dispatcher will not create search or browse indexes (useful for batch item imports)
 event.dispatcher.noindex.class = org.dspace.event.BasicDispatcher
@@ -788,7 +788,7 @@ event.dispatcher.noindex.consumers = eperson
 
 # consumer to maintain the discovery index
 event.consumer.discovery.class = org.dspace.discovery.IndexEventConsumer
-event.consumer.discovery.filters = Community|Collection|Item|Bundle|Site+Add|Create|Modify|Modify_Metadata|Delete|Remove
+event.consumer.discovery.filters = Community|Collection|Item|Bundle|Site|LDN_MESSAGE+Add|Create|Modify|Modify_Metadata|Delete|Remove
 
 # consumer related to EPerson changes
 event.consumer.eperson.class = org.dspace.eperson.EPersonConsumer
@@ -806,6 +806,10 @@ event.consumer.rdf.filters = Community|Collection|Item|Bundle|Bitstream|Site+Add
 #event.consumer.test.class = org.dspace.event.TestConsumer
 #event.consumer.test.filters = All+All
 
+# qaevents consumer to delete events related to deleted items
+event.consumer.qaeventsdelete.class = org.dspace.qaevent.QAEventsDeleteCascadeConsumer
+event.consumer.qaeventsdelete.filters = Item+Delete
+
 # consumer to maintain versions
 event.consumer.versioning.class = org.dspace.versioning.VersioningConsumer
 event.consumer.versioning.filters = Item+Install
@@ -822,6 +826,10 @@ event.consumer.iiif.filters = Item+Modify:Item+Modify_Metadata:Item+Delete:Item+
 event.consumer.orcidqueue.class = org.dspace.orcid.consumer.OrcidQueueConsumer
 event.consumer.orcidqueue.filters = Item+Install|Modify|Modify_Metadata|Delete|Remove
 
+# consumer to store LDN Messages
+event.consumer.ldnmessage.class = org.dspace.app.ldn.LDNMessageConsumer
+event.consumer.ldnmessage.filters = Item+Install
+
 # item submission config reload consumer
 # This consumer can be useful for reloading changes made in the item-submission.xml config file,
 # without restarting Tomcat, primarily for adding new collection mappings.
@@ -933,7 +941,8 @@ registry.metadata.load = schema-publicationVolume-types.xml
 registry.metadata.load = openaire4-types.xml
 registry.metadata.load = dspace-types.xml
 registry.metadata.load = iiif-types.xml
-
+registry.metadata.load = datacite-types.xml
+registry.metadata.load = coar-types.xml
 
 #---------------------------------------------------------------#
 #-----------------UI-Related CONFIGURATIONS---------------------#
@@ -970,6 +979,11 @@ webui.licence_bundle.show = false
 metadata.hide.dc.description.provenance = true
 metadata.hide.person.email = true
 
+# Behavior to generate provenance message, if set true,
+# personal data (e.g. email) of submitter will be hidden in dc.description.provenance
+# Disabled by default.  To enable, uncomment the next line
+# metadata.privacy.dc.description.provenance = true
+
 ##### Settings for Submission Process #####
 
 # Whether or not we REQUIRE that a file be uploaded
@@ -982,6 +996,11 @@ metadata.hide.person.email = true
 # dspace-angular environment configuration property submission.typeBind.field
 #submit.type-bind.field = dc.type
 
+# Wheter or not we REQUIRE that the cclicense is provided
+# during the cclicense step in the submission process
+# Defaults to false; If you set to 'true', submitter needs to provide cclicense
+#cc.license.required = true
+
 #### Creative Commons settings ######
 
 # The url to the web service API
@@ -1491,8 +1510,8 @@ log.report.dir = ${dspace.dir}/log
 # If you would like to use Google Analytics to track general website statistics then
 # use the following parameter to provide your Analytics key. First sign up for an
 # account at http://analytics.google.com, then create an entry for your repository
-# website. Analytics will give you a snipet of JavaScript code to place on your site,
-# inside that snipet is your Google Analytics key usually found in this line:
+# website. Analytics will give you a snippet of JavaScript code to place on your site,
+# inside that snippet is your Google Analytics key usually found in this line:
 # _uacct = "UA-XXXXXXX-X"
 # Take this key (just the UA-XXXXXX-X part) and place it here in this parameter.
 # google.analytics.key=UA-XXXXXX-X
@@ -1637,6 +1656,7 @@ include = ${module_dir}/clamav.cfg
 include = ${module_dir}/curate.cfg
 include = ${module_dir}/discovery.cfg
 include = ${module_dir}/doi-curation.cfg
+include = ${module_dir}/duplicate-detection.cfg
 include = ${module_dir}/google-analytics.cfg
 include = ${module_dir}/healthcheck.cfg
 include = ${module_dir}/identifiers.cfg
@@ -1644,6 +1664,7 @@ include = ${module_dir}/irus-statistics.cfg
 include = ${module_dir}/oai.cfg
 include = ${module_dir}/openaire-client.cfg
 include = ${module_dir}/orcid.cfg
+include = ${module_dir}/qaevents.cfg
 include = ${module_dir}/rdf.cfg
 include = ${module_dir}/rest.cfg
 include = ${module_dir}/iiif.cfg
@@ -1653,6 +1674,7 @@ include = ${module_dir}/solrauthority.cfg
 include = ${module_dir}/researcher-profile.cfg
 include = ${module_dir}/spring.cfg
 include = ${module_dir}/submission-curation.cfg
+include = ${module_dir}/suggestion.cfg
 include = ${module_dir}/sword-client.cfg
 include = ${module_dir}/sword-server.cfg
 include = ${module_dir}/swordv2-server.cfg
@@ -1661,3 +1683,4 @@ include = ${module_dir}/usage-statistics.cfg
 include = ${module_dir}/versioning.cfg
 include = ${module_dir}/workflow.cfg
 include = ${module_dir}/external-providers.cfg
+include = ${module_dir}/ldn.cfg
diff --git a/dspace/config/emails/coar_notify_accepted b/dspace/config/emails/coar_notify_accepted
new file mode 100644
index 0000000000..78ab0da07d
--- /dev/null
+++ b/dspace/config/emails/coar_notify_accepted
@@ -0,0 +1,27 @@
+## Notification email sent when a request to review an item has been accepted by the service
+##
+## Parameters: {0} Service Name
+##             {1} Item Name
+##             {2} Service URL
+##             {3} Item URL
+##             {4} Submitter's Name
+##             {5} Date of the received LDN notification
+##
+##
+#set($subject = "DSpace: The Service ${params[0]} has accepted to review the Item ""${params[1]}""")
+
+An acceptance notification has been received by the service: ${params[0]}
+for the Item: ${params[1]}
+
+Here is a more detailed report:
+Item: ${params[1]}
+Item URL: ${params[3]}
+Submitted by: ${params[4]}
+
+Has a new status: ONGOING REVIEW
+
+By Service: ${params[0]}
+Service URL: ${params[2]}
+Date: ${params[5]}
+
+The ${config.get('dspace.name')} Team
diff --git a/dspace/config/emails/coar_notify_endorsed b/dspace/config/emails/coar_notify_endorsed
new file mode 100644
index 0000000000..aaf06b3efd
--- /dev/null
+++ b/dspace/config/emails/coar_notify_endorsed
@@ -0,0 +1,27 @@
+## Notification email sent when an item has been endorsed by a service
+##
+## Parameters: {0} Service Name
+##             {1} Item Name
+##             {2} Service URL
+##             {3} Item URL
+##             {4} Submitter's Name
+##             {5} Date of the received LDN notification
+##
+##
+#set($subject = "DSpace: The Service ${params[0]} has endorsed the Item ""${params[1]}""")
+
+An endorsement announce notification has been received by the service: ${params[0]}
+for the Item: ${params[1]}
+
+Here is a more detailed report:
+Item: ${params[1]}
+Item URL: ${params[3]}
+Submitted by: ${params[4]}
+
+Has a new status: ENDORSED
+
+By Service: ${params[0]}
+Service URL: ${params[2]}
+Date: ${params[5]}
+
+The ${config.get('dspace.name')} Team
diff --git a/dspace/config/emails/coar_notify_rejected b/dspace/config/emails/coar_notify_rejected
new file mode 100644
index 0000000000..ddba3366ba
--- /dev/null
+++ b/dspace/config/emails/coar_notify_rejected
@@ -0,0 +1,27 @@
+## Notification email sent when a request to review an item has been rejected by the service
+##
+## Parameters: {0} Service Name
+##             {1} Item Name
+##             {2} Service URL
+##             {3} Item URL
+##             {4} Submitter's Name
+##             {5} Date of the received LDN notification
+##
+##
+#set($subject = "DSpace: The Service ${params[0]} has refused to review the Item ""${params[1]}""")
+
+A rejection notification has been received by the service: ${params[0]}
+for the Item: ${params[1]}
+
+Here is a more detailed report:
+Item: ${params[1]}
+Item URL: ${params[3]}
+Submitted by: ${params[4]}
+
+Has a new update: REJECTED REVIEW REQUEST
+
+By Service: ${params[0]}
+Service URL: ${params[2]}
+Date: ${params[5]}
+
+The ${config.get('dspace.name')} Team
diff --git a/dspace/config/emails/coar_notify_relationship b/dspace/config/emails/coar_notify_relationship
new file mode 100644
index 0000000000..7a8782b5e9
--- /dev/null
+++ b/dspace/config/emails/coar_notify_relationship
@@ -0,0 +1,29 @@
+## Notification email sent that a resource has been related by a service
+##
+## Parameters: {0} Service Name
+##             {1} Item Name
+##             {2} Service URL
+##             {3} Item URL
+##             {4} Submitter's Name
+##             {5} Date of the received LDN notification
+##             {6} LDN notification
+##             {7} Item
+##
+##
+#set($subject = "DSpace: The Service ${params[0]} has related a Resource ""${params[6].object.subject}""")
+
+A relationship announce notification has been received relating to the Item: ${params[1]}
+
+Here is a more detailed report:
+Item: ${params[1]}
+Item URL: ${params[3]}
+Submitted by: ${params[4]}
+Linked Resource URL: ${params[6].object.subject}
+
+Has a new status: RELATED
+
+By Service: ${params[0]}
+Service URL: ${params[2]}
+Date: ${params[5]}
+
+The ${config.get('dspace.name')} Team
diff --git a/dspace/config/emails/coar_notify_reviewed b/dspace/config/emails/coar_notify_reviewed
new file mode 100644
index 0000000000..c25dd9b51d
--- /dev/null
+++ b/dspace/config/emails/coar_notify_reviewed
@@ -0,0 +1,27 @@
+## Notification email sent when an item has been reviewed by a service
+##
+## Parameters: {0} Service Name
+##             {1} Item Name
+##             {2} Service URL
+##             {3} Item URL
+##             {4} Submitter's Name
+##             {5} Date of the received LDN notification
+##
+##
+#set($subject = "DSpace: The Service ${params[0]} has reviewed the Item ""${params[1]}""")
+
+A review announce notification has been received by the service: ${params[0]}
+for the Item: ${params[1]}
+
+Here is a more detailed report:
+Item: ${params[1]}
+Item URL: ${params[3]}
+Submitted by: ${params[4]}
+
+Has a new status: REVIEWED
+
+By Service: ${params[0]}
+Service URL: ${params[2]}
+Date: ${params[5]}
+
+The ${config.get('dspace.name')} Team
diff --git a/dspace/config/emails/qaevent_admin_notification b/dspace/config/emails/qaevent_admin_notification
new file mode 100644
index 0000000000..6c75f89a8f
--- /dev/null
+++ b/dspace/config/emails/qaevent_admin_notification
@@ -0,0 +1,13 @@
+## E-mail sent to notify Administrator of new Withdrawn/Reinstate request
+##
+## Parameters: {0} Type of request 'topic'
+##             {1} resource id
+##             {2} reason
+##
+#set($subject = "Notification about ${params[0]} Request")
+
+Item Details:
+
+Type of request: ${params[0]}
+Relatem to item: ${params[1]}
+Reason: ${params[2]}
\ No newline at end of file
diff --git a/dspace/config/emails/request_item.granted b/dspace/config/emails/request_item.granted
index 37ee5c29bd..40710a3ce0 100644
--- a/dspace/config/emails/request_item.granted
+++ b/dspace/config/emails/request_item.granted
@@ -2,7 +2,7 @@
 ## request is granted.
 ##
 ## Parameters:
-##  {0} name of the requestor
+##  {0} name of the requester
 ##  {1} Handle URL of the requested Item
 ##  {2} title of the requested Item
 ##  {3} name of the grantor
diff --git a/dspace/config/emails/request_item.rejected b/dspace/config/emails/request_item.rejected
index c5a13860b6..74e7085f5e 100644
--- a/dspace/config/emails/request_item.rejected
+++ b/dspace/config/emails/request_item.rejected
@@ -2,7 +2,7 @@
 ## request is denied.
 ##
 ## Parameters:
-##  {0} name of the requestor
+##  {0} name of the requester
 ##  {1} Handle URL of the requested Item
 ##  {2} title of the requested Item
 ##  {3} name of the grantor
diff --git a/dspace/config/emails/subscriptions_content b/dspace/config/emails/subscriptions_content
index 9b8c91e559..a1b107e8fc 100644
--- a/dspace/config/emails/subscriptions_content
+++ b/dspace/config/emails/subscriptions_content
@@ -1,7 +1,7 @@
 ## E-mail sent to designated address about updates on subscribed items
 ##
-## Parameters: {0} Collections updates
-##             {1} Communities updates
+## Parameters: {0} Communities updates
+##             {1} Collections updates
 #set($subject = "${config.get('dspace.name')} Subscriptions")
 This email is sent from ${config.get('dspace.name')} based on the chosen subscription preferences.
 
diff --git a/dspace/config/entities/rioxx3-relationships.xml b/dspace/config/entities/rioxx3-relationships.xml
new file mode 100644
index 0000000000..558f766a5b
--- /dev/null
+++ b/dspace/config/entities/rioxx3-relationships.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE relationships SYSTEM "relationship-types.dtd">
+<!-- Note that these relationships are the same as those for openaire4
+ 	They are used to map to relevant fields within the Rioxx profile. See docs below. -->
+<relationships>
+
+	<!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:creator
+		The relation between a Publication and a Person regarding the authorship -->
+	<type>
+		<leftType>Publication</leftType>
+		<rightType>Person</rightType>
+		<leftwardType>isAuthorOfPublication</leftwardType>
+		<rightwardType>isPublicationOfAuthor</rightwardType>
+		<leftCardinality>
+			<min>0</min>
+		</leftCardinality>
+		<rightCardinality>
+			<min>0</min>
+		</rightCardinality>
+	</type>
+	<!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:creator
+		The relation between a Publication and an Organization regarding the authorship -->
+	<type>
+		<leftType>Publication</leftType>
+		<rightType>OrgUnit</rightType>
+		<leftwardType>isAuthorOfPublication</leftwardType>
+		<rightwardType>isPublicationOfAuthor</rightwardType>
+		<leftCardinality>
+			<min>0</min>
+		</leftCardinality>
+		<rightCardinality>
+			<min>0</min>
+		</rightCardinality>
+	</type>
+	<!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:contributor
+		The relation between a Publication and a Person regarding the contribution -->
+	<type>
+		<leftType>Publication</leftType>
+		<rightType>Person</rightType>
+		<leftwardType>isContributorOfPublication</leftwardType>
+		<rightwardType>isPublicationOfContributor</rightwardType>
+		<leftCardinality>
+			<min>0</min>
+		</leftCardinality>
+		<rightCardinality>
+			<min>0</min>
+		</rightCardinality>
+	</type>
+	<!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:contributor
+		The relation between a Publication and an Organization regarding the contribution -->
+	<type>
+		<leftType>Publication</leftType>
+		<rightType>OrgUnit</rightType>
+		<leftwardType>isContributorOfPublication</leftwardType>
+		<rightwardType>isPublicationOfContributor</rightwardType>
+		<leftCardinality>
+			<min>0</min>
+		</leftCardinality>
+		<rightCardinality>
+			<min>0</min>
+		</rightCardinality>
+	</type>
+	<!--https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:project
+		The relation between a Publication and an Organization regarding the Funder to populate rioxxterms:project -->
+	<type>
+		<leftType>Publication</leftType>
+		<rightType>Project</rightType>
+		<leftwardType>isProjectOfPublication</leftwardType>
+		<rightwardType>isPublicationOfProject</rightwardType>
+		<leftCardinality>
+			<min>0</min>
+		</leftCardinality>
+		<rightCardinality>
+			<min>0</min>
+		</rightCardinality>
+	</type>
+	<!-- https://www.rioxx.net/profiles/v3-0-final/#rioxxterms:grant
+		The relation between a Funded Project and an Organization regarding the Funder to populate rioxxterms:grant -->
+	<type>
+		<leftType>Project</leftType>
+		<rightType>OrgUnit</rightType>
+		<leftwardType>isFundingAgencyOfProject</leftwardType>
+		<rightwardType>isProjectOfFundingAgency</rightwardType>
+		<leftCardinality>
+			<min>0</min>
+		</leftCardinality>
+		<rightCardinality>
+			<min>0</min>
+		</rightCardinality>
+	</type>
+
+</relationships>
diff --git a/dspace/config/hibernate.cfg.xml b/dspace/config/hibernate.cfg.xml
index 3cc0623c34..9d1ee9dac0 100644
--- a/dspace/config/hibernate.cfg.xml
+++ b/dspace/config/hibernate.cfg.xml
@@ -31,7 +31,7 @@
         <!-- hibernate.javax.cache.uri is defined in
                   config/spring/api/core-hibernate.xml so that we can use
                   property substitution. -->
-        <property name="javax.persistence.sharedCache.mode">ENABLE_SELECTIVE</property>
+        <property name="jakarta.persistence.sharedCache.mode">ENABLE_SELECTIVE</property>
 
         <!-- Entities to be loaded by hibernate -->
         <mapping class="org.dspace.app.util.WebApp"/>
@@ -62,6 +62,8 @@
         <mapping class="org.dspace.content.Site"/>
         <mapping class="org.dspace.content.WorkspaceItem"/>
 
+        <mapping class="org.dspace.content.QAEventProcessed" />
+
         <mapping class="org.dspace.eperson.EPerson"/>
         <mapping class="org.dspace.eperson.Group"/>
         <mapping class="org.dspace.eperson.Group2GroupCache"/>
@@ -96,5 +98,11 @@
 
         <mapping class="org.dspace.supervision.SupervisionOrder"/>
 
+        <mapping class="org.dspace.app.ldn.NotifyServiceEntity"/>
+        <mapping class="org.dspace.app.ldn.NotifyServiceInboundPattern"/>
+
+        <mapping class="org.dspace.app.ldn.LDNMessageEntity"/>
+        <mapping class="org.dspace.app.ldn.NotifyPatternToTrigger"/>
+
     </session-factory>
 </hibernate-configuration>
diff --git a/dspace/config/item-submission.dtd b/dspace/config/item-submission.dtd
index dd1afa0dd0..01da4df808 100644
--- a/dspace/config/item-submission.dtd
+++ b/dspace/config/item-submission.dtd
@@ -12,6 +12,7 @@
  <!ELEMENT name-map EMPTY >
  <!ATTLIST name-map 
            collection-handle CDATA #IMPLIED
+           community-handle CDATA #IMPLIED
            collection-entity-type CDATA #IMPLIED
            submission-name NMTOKEN #REQUIRED>
 
diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index 1060a33031..b5278d2f3d 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -63,6 +63,15 @@
         <name-map collection-entity-type="Journal" submission-name="Journal"/>
         <name-map collection-entity-type="JournalVolume" submission-name="JournalVolume"/>
         <name-map collection-entity-type="JournalIssue" submission-name="JournalIssue"/>
+
+        <!-- Example of configuration using a community handle to map an Item Submission Process.
+
+            This configuration maps the submission process to the community's descendant
+            collections that do not have a mapping defined by collection-handle or entity-type
+
+        <name-map community-handle="123456789/1234" submission-name="xxxx"/>
+        -->
+
     </submission-map>
 
 
@@ -185,28 +194,28 @@
             <type>extract</type>
         </step-definition>
 
-        <!-- OpenAIRE submission steps/forms -->
-        <step-definition id="openAIREProjectForm" mandatory="true">
+        <!-- Openaire submission steps/forms -->
+        <step-definition id="openaireProjectForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREPersonForm" mandatory="true">
+        <step-definition id="openairePersonForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREOrganizationForm" mandatory="true">
+        <step-definition id="openaireOrganizationForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREPublicationPageoneForm" mandatory="true">
+        <step-definition id="openairePublicationPageoneForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
         </step-definition>
-        <step-definition id="openAIREPublicationPagetwoForm" mandatory="true">
+        <step-definition id="openairePublicationPagetwoForm" mandatory="true">
             <heading>submit.progressbar.describe.stepone</heading>
             <processing-class>org.dspace.app.rest.submit.step.DescribeStep</processing-class>
             <type>submission-form</type>
@@ -231,6 +240,20 @@
             <processing-class>org.dspace.app.rest.submit.step.ShowIdentifiersStep</processing-class>
             <type>identifiers</type>
         </step-definition>
+
+        <step-definition id="coarnotify">
+            <heading>submit.progressbar.coarnotify</heading>
+            <processing-class>org.dspace.app.rest.submit.step.NotifyStep</processing-class>
+            <type>coarnotify</type>
+        </step-definition>
+
+        <!-- Detect duplicates step -->
+        <step-definition id="duplicates">
+            <heading>submit.progressbar.duplicates</heading>
+            <processing-class>org.dspace.app.rest.submit.step.DuplicateDetectionStep</processing-class>
+            <type>duplicates</type>
+        </step-definition>
+
     </step-definitions>
 
     <!-- The submission-definitions map lays out the detailed definition of -->
@@ -268,6 +291,14 @@
             <!-- Uncomment this step to show when appropriate publisher policies retrieved from SHERPA/RoMEO -->
             <!-- <step id="sherpaPolicies"/> -->
 
+            <!-- To include the 'Duplicate Detection' step, uncomment the line below. Make sure
+                 that duplicate-detection.cfg is properly configured and items have been reindexed since
+                 enabling the feature -->
+            <!-- <step id="duplicates"/> -->
+
+            <!--Step will be COAR Notify services to the item -->
+            <!-- <step id="coarnotify"/> -->
+
             <!--Step will be to Upload the item -->
             <step id="upload"/>
 
@@ -361,13 +392,13 @@
             <step id="license"/>
         </submission-process>
 
-        <!-- OpenAIRE submission processes -->
-        <submission-process name="openAIREPublicationSubmission">
+        <!-- Openaire submission processes -->
+        <submission-process name="openairePublicationSubmission">
             <step id="collection"/>
 
             <!--Step will be to Describe the item. -->
-            <step id="openAIREPublicationPageoneForm"/>
-            <step id="openAIREPublicationPagetwoForm"/>
+            <step id="openairePublicationPageoneForm"/>
+            <step id="openairePublicationPagetwoForm"/>
 
             <!--Step will be to Upload the item -->
             <!-- step id="upload-with-embargo"/-->
@@ -376,17 +407,17 @@
             <!--Step will be to Sign off on the License -->
             <step id="license"/>
         </submission-process>
-        <submission-process name="openAIREPersonSubmission">
+        <submission-process name="openairePersonSubmission">
             <step id="collection"/>
-            <step id="openAIREPersonForm"/>
+            <step id="openairePersonForm"/>
         </submission-process>
-        <submission-process name="openAIREProjectSubmission">
+        <submission-process name="openaireProjectSubmission">
             <step id="collection"/>
-            <step id="openAIREProjectForm"/>
+            <step id="openaireProjectForm"/>
         </submission-process>
-        <submission-process name="openAIREOrganizationSubmission">
+        <submission-process name="openaireOrganizationSubmission">
             <step id="collection"/>
-            <step id="openAIREOrganizationForm"/>
+            <step id="openaireOrganizationForm"/>
         </submission-process>
     </submission-definitions>
 
diff --git a/dspace/config/ldn/announce-relationship b/dspace/config/ldn/announce-relationship
new file mode 100644
index 0000000000..205a61adb4
--- /dev/null
+++ b/dspace/config/ldn/announce-relationship
@@ -0,0 +1,62 @@
+## generate LDN message json when request-review of an item
+##
+## Parameters: {0} config 'dspace.ui.url'
+##             {1} config 'ldn.notify.inbox'
+##             {2} config 'dspace.name'
+##             {3} Notify Service url
+##             {4} Notify Service ldnUrl
+##             {5} 'dspace.ui.url'/handle/xxxx/yyy
+##             {6} metadata value of 'dc.identifier.uri'
+##             {7} the url to the primary bitstream or the first bitstream in the ORIGINAL bundle if there is no primary bitstream. The url is 'dspace.ui.url'/bitstreams/:uuid/download
+##             {8} the bitstream  MimeType or get User Format MimeType if getFormat is 'Unknown'
+##             {9} id of the created LDNMessage
+##            {10} uri of the related resource
+##            {11} relationship type, i.e. http://purl.org/vocab/frbr/core#supplement
+##            {12} urn:uuid of the relation (randomly generated)
+
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "${params[0]}",
+    "name": "${params[2]}",
+    "type": "Service"
+  },
+  "context": {
+    "id": "${params[5]}",
+    "ietf:cite-as": "${params[6]}",
+    "ietf:item": {
+      "id": "${params[7]}",
+      "mediaType": "${params[8]}",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    },
+    "type": "sorg:AboutPage"
+  },
+  "id": "${params[9]}",
+  "object": {
+    "as:object": "${params[10]}",
+    "as:relationship": "${params[11]}",
+    "as:subject": "${params[5]}",
+    "id": "${params[12]}",
+    "type": "Relationship"
+  },
+  "origin": {
+    "id": "${params[0]}",
+    "inbox": "${params[1]}",
+    "type": "Service"
+  },
+  "target": {
+    "id": "${params[3]}",
+    "inbox": "${params[4]}",
+    "type": "Service"
+  },
+  "type": [
+    "Announce",
+    "coar-notify:RelationshipAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace/config/ldn/request-endorsement b/dspace/config/ldn/request-endorsement
new file mode 100644
index 0000000000..443a702915
--- /dev/null
+++ b/dspace/config/ldn/request-endorsement
@@ -0,0 +1,52 @@
+## generate LDN message json when request-endorsement of an item
+##
+## Parameters: {0} config 'dspace.ui.url'
+##             {1} config 'ldn.notify.inbox'
+##             {2} config 'dspace.name'
+##             {3} Notify Service url
+##             {4} Notify Service ldnUrl
+##             {5} 'dspace.ui.url'/handle/xxxx/yyy
+##             {6} metadata value of 'dc.identifier.uri'
+##             {7} the url to the primary bitstream or the first bitstream in the ORIGINAL bundle if there is no primary bitstream. The url is 'dspace.ui.url'/bitstreams/:uuid/download
+##             {8} the bitstream  MimeType or get User Format MimeType if getFormat is 'Unknown'
+##             {9} id of the created LDNMessage
+
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "${params[0]}",
+    "name": "${params[2]}",
+    "type": "Service"
+  },
+  "id": "${params[9]}",
+  "object": {
+    "id": "${params[5]}",
+    "ietf:cite-as": "${params[6]}",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "${params[7]}",
+      "mediaType": "${params[8]}",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "origin": {
+    "id": "${params[0]}",
+    "inbox": "${params[1]}",
+    "type": "Service"
+  },
+  "target": {
+    "id": "${params[3]}",
+    "inbox": "${params[4]}",
+    "type": "Service"
+  },
+  "type": [
+    "Offer",
+    "coar-notify:EndorsementAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace/config/ldn/request-ingest b/dspace/config/ldn/request-ingest
new file mode 100644
index 0000000000..701f3929c8
--- /dev/null
+++ b/dspace/config/ldn/request-ingest
@@ -0,0 +1,52 @@
+## generate LDN message json when request-ingest of an item
+##
+## Parameters: {0} config 'dspace.ui.url'
+##             {1} config 'ldn.notify.inbox'
+##             {2} config 'dspace.name'
+##             {3} Notify Service url
+##             {4} Notify Service ldnUrl
+##             {5} 'dspace.ui.url'/handle/xxxx/yyy
+##             {6} metadata value of 'dc.identifier.uri'
+##             {7} the url to the primary bitstream or the first bitstream in the ORIGINAL bundle if there is no primary bitstream. The url is 'dspace.ui.url'/bitstreams/:uuid/download
+##             {8} the bitstream  MimeType or get User Format MimeType if getFormat is 'Unknown'
+##             {9} id of the created LDNMessage
+
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "${params[0]}",
+    "name": "${params[2]}",
+    "type": "Service"
+  },
+  "id": "${params[9]}",
+  "object": {
+    "id": "${params[5]}",
+    "ietf:cite-as": "${params[6]}",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "${params[7]}",
+      "mediaType": "${params[8]}",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "origin": {
+    "id": "${params[0]}",
+    "inbox": "${params[1]}",
+    "type": "Service"
+  },
+  "target": {
+    "id": "${params[3]}",
+    "inbox": "${params[4]}",
+    "type": "Service"
+  },
+  "type": [
+    "Offer",
+    "coar-notify:IngestAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace/config/ldn/request-review b/dspace/config/ldn/request-review
new file mode 100644
index 0000000000..01f177b6cc
--- /dev/null
+++ b/dspace/config/ldn/request-review
@@ -0,0 +1,52 @@
+## generate LDN message json when request-review of an item
+##
+## Parameters: {0} config 'dspace.ui.url'
+##             {1} config 'ldn.notify.inbox'
+##             {2} config 'dspace.name'
+##             {3} Notify Service url
+##             {4} Notify Service ldnUrl
+##             {5} 'dspace.ui.url'/handle/xxxx/yyy
+##             {6} metadata value of 'dc.identifier.uri'
+##             {7} the url to the primary bitstream or the first bitstream in the ORIGINAL bundle if there is no primary bitstream. The url is 'dspace.ui.url'/bitstreams/:uuid/download
+##             {8} the bitstream  MimeType or get User Format MimeType if getFormat is 'Unknown'
+##             {9} id of the created LDNMessage
+
+{
+  "@context": [
+    "https://www.w3.org/ns/activitystreams",
+    "https://purl.org/coar/notify"
+  ],
+  "actor": {
+    "id": "${params[0]}",
+    "name": "${params[2]}",
+    "type": "Service"
+  },
+  "id": "${params[9]}",
+  "object": {
+    "id": "${params[5]}",
+    "ietf:cite-as": "${params[6]}",
+    "type": "sorg:AboutPage",
+    "ietf:item": {
+      "id": "${params[7]}",
+      "mediaType": "${params[8]}",
+      "type": [
+        "Article",
+        "sorg:ScholarlyArticle"
+      ]
+    }
+  },
+  "origin": {
+    "id": "${params[0]}",
+    "inbox": "${params[1]}",
+    "type": "Service"
+  },
+  "target": {
+    "id": "${params[3]}",
+    "inbox": "${params[4]}",
+    "type": "Service"
+  },
+  "type": [
+    "Offer",
+    "coar-notify:ReviewAction"
+  ]
+}
\ No newline at end of file
diff --git a/dspace/config/local.cfg.EXAMPLE b/dspace/config/local.cfg.EXAMPLE
index 7176ed275a..79ae3b4838 100644
--- a/dspace/config/local.cfg.EXAMPLE
+++ b/dspace/config/local.cfg.EXAMPLE
@@ -76,20 +76,10 @@ dspace.name = DSpace at My University
 # URL for connecting to database
 db.url = jdbc:postgresql://localhost:5432/dspace
 
-# JDBC Driver for PostgreSQL
-db.driver = org.postgresql.Driver
-
-# PostgreSQL Database Dialect (for Hibernate)
-db.dialect = org.hibernate.dialect.PostgreSQL94Dialect
-
 # Database username and password
 db.username = dspace
 db.password = dspace
 
-# Database Schema name
-# For PostgreSQL, this is often "public" (default schema)
-db.schema = public
-
 ## Connection pool parameters
 
 # Maximum number of DB connections in pool (default = 30)
@@ -240,4 +230,9 @@ db.schema = public
 #spring.servlet.multipart.max-file-size = 512MB
 
 # Maximum size of a multipart request (i.e. max total size of all files in one request)
-#spring.servlet.multipart.max-request-size = 512MB
\ No newline at end of file
+#spring.servlet.multipart.max-request-size = 512MB
+
+########################
+#  LDN INBOX SETTINGS  #
+########################
+ldn.enabled = true
diff --git a/dspace/config/modules/actuator.cfg b/dspace/config/modules/actuator.cfg
index a14a3f1cac..5aecd1a4b5 100644
--- a/dspace/config/modules/actuator.cfg
+++ b/dspace/config/modules/actuator.cfg
@@ -9,7 +9,7 @@
 management.endpoint.health.show-details = when-authorized
 ## Configuration which users can see the health status details
 management.endpoint.health.roles = ADMIN
-## Configuration to establis
+## Configuration to establish
 management.endpoint.health.status.order= down, out-of-service, up-with-issues, up, unknown
 ## Configuration that enables only health and info endpoints
 management.endpoints.web.exposure.include=health,info
diff --git a/dspace/config/modules/assetstore.cfg b/dspace/config/modules/assetstore.cfg
index cbee6bd2c3..40e98340cb 100644
--- a/dspace/config/modules/assetstore.cfg
+++ b/dspace/config/modules/assetstore.cfg
@@ -26,7 +26,7 @@ assetstore.index.primary = 0
 # in your bitstore.xml
 
 # Enables or disables the store initialization during startup, without initialization the store won't work.
-# if changed to true, a lazy initialization will be tried on next store usage, be careful an excecption could be thrown
+# if changed to true, a lazy initialization will be tried on next store usage, be careful an exception could be thrown
 assetstore.s3.enabled = false
 
 # For using a relative path (xx/xx/xx/xxx...) set to true, default it false
diff --git a/dspace/config/modules/authentication-password.cfg b/dspace/config/modules/authentication-password.cfg
index 9029e76e26..81815e30e7 100644
--- a/dspace/config/modules/authentication-password.cfg
+++ b/dspace/config/modules/authentication-password.cfg
@@ -7,7 +7,10 @@
 #
 
 # self-registration can be disabled completely by setting the user.registration property to false
-# user.registration = false
+#user.registration = false
+
+# forgot-password can be disabled completely by setting the user.forgot-password property to false
+#user.forgot-password = false
 
 # Only emails ending in the following domains are allowed to self-register
 # Example - example.com domain : @example.com
diff --git a/dspace/config/modules/authentication-shibboleth.cfg b/dspace/config/modules/authentication-shibboleth.cfg
index 9258f9fdbd..22fd8bc054 100644
--- a/dspace/config/modules/authentication-shibboleth.cfg
+++ b/dspace/config/modules/authentication-shibboleth.cfg
@@ -32,7 +32,7 @@
 # apache will allow access to any URL, and when the application wants to it
 # may initiate an authenticated session. The Lazy Session method is preferable
 # for most DSpace installations where you want public access to most of DSpace
-# but restricted access to limitted areas - such as administration.
+# but restricted access to limited areas - such as administration.
 
 # Whether to use lazy sessions or active sessions.
 authentication-shibboleth.lazysession = true
@@ -126,7 +126,7 @@ authentication-shibboleth.sword.compatibility = false
 # students when submitting an ETD.
 
 # Metadata Headers
-# Shibboleth-based headers for the first and last name attirbutes
+# Shibboleth-based headers for the first and last name attributes
 authentication-shibboleth.firstname-header = SHIB-GIVENNAME
 authentication-shibboleth.lastname-header = SHIB-SURNAME
 
diff --git a/dspace/config/modules/contentreport.cfg b/dspace/config/modules/contentreport.cfg
new file mode 100644
index 0000000000..afba0654fa
--- /dev/null
+++ b/dspace/config/modules/contentreport.cfg
@@ -0,0 +1,10 @@
+#---------------------------------------------------------------#
+#--------------CONTENT REPORTS CONFIGURATIONS-------------------#
+#---------------------------------------------------------------#
+# Used by dspace-server-webapp and the Angular UI               #
+# NOTE: This is currently a beta feature.                       #
+#---------------------------------------------------------------#
+
+# Configuration setting to trigger showing/hiding the Content Reports
+# (REST endpoints on the REST side and menu section on the Angular side)
+#contentreport.enable=true
diff --git a/dspace/config/modules/duplicate-detection.cfg b/dspace/config/modules/duplicate-detection.cfg
new file mode 100644
index 0000000000..665790384e
--- /dev/null
+++ b/dspace/config/modules/duplicate-detection.cfg
@@ -0,0 +1,35 @@
+###
+# Duplicate detection settings
+##
+
+# Enable this feature. Default: false
+#duplicate.enable = true
+
+##
+# Normalisation rules. If these are changed, a full index-discovery re-index should be performed to force
+# stored comparison values to be updated.
+##
+# Should the comparison query/index value be normalised for case? Default: true
+duplicate.comparison.normalise.lowercase = true
+# Should the comparison query/index value be normalised for whitespace? Default: true
+# (highly recommended - if this is *not* used, some other placeholder needs to be used to force the value
+# to be treated as a single term by Lucene)
+duplicate.comparison.normalise.whitespace = true
+
+# Levenshtein edit distance. Default:0 (eg. Test will match Txst but not Txxt)
+# Valid distances are 0, 1, 2 as per Solr documentation. Note that this distance is applied *after* normalisation
+# rules above, so capitalisation and whitespace will not count as 'edits' if you have the above rules enabled.
+duplicate.comparison.distance = 0
+# DSpace metadata field(s) to use. They will be concatenated before normalisation.
+# Repeat the configuration property for multiple fields.
+duplicate.comparison.metadata.field = dc.title
+#duplicate.comparison.metadata.field = dc.contributor.author
+
+# Solr field used for storing the indexed comparison string
+duplicate.comparison.solr.field = deduplication_keyword
+
+## Metadata to populate in the potential duplicate
+duplicate.preview.metadata.field = dc.title
+duplicate.preview.metadata.field = dc.date.issued
+duplicate.preview.metadata.field = dc.type
+duplicate.preview.metadata.field = dspace.entity.type
\ No newline at end of file
diff --git a/dspace/config/modules/external-providers.cfg b/dspace/config/modules/external-providers.cfg
index b7c0e120db..f1ec32c910 100644
--- a/dspace/config/modules/external-providers.cfg
+++ b/dspace/config/modules/external-providers.cfg
@@ -2,7 +2,7 @@
 #------------- EXTERNAL PROVIDER CONFIGURATIONS ----------------#
 #---------------------------------------------------------------#
 #  Configuration properties used solely by external providers   #
-#  as Scopus, Pubmed, CiNii and ect.                            #
+#  as Scopus, Pubmed, CiNii and etc.                            #
 #---------------------------------------------------------------#
 
 
@@ -38,9 +38,9 @@ epo.consumerSecretKey =
 
 # this URL will be used during authentication to get access token
 epo.authUrl = https://ops.epo.org/3.2/auth/accesstoken
-# this URL is used to performe specific query  by epo document id & epo document type
+# this URL is used to perform a specific query by epo document id & epo document type
 epo.url = https://ops.epo.org/rest-services/published-data/publication/$(doctype)/$(id)/biblio
-# this url will be used to performe basic searching
+# this url will be used to perform basic searching
 epo.searchUrl = https://ops.epo.org/rest-services/published-data/search
 #################################################################
 #----------------------   PubMed   -----------------------------#
@@ -75,7 +75,7 @@ scopus.instToken =
 #The view mode to be used for the scopus search endpoint.
 #For more details see https://dev.elsevier.com/documentation/ScopusSearchAPI.wadl
 # https://dev.elsevier.com/sc_search_views.html
-# by default we use standart mode, to use complete mode this variable must be valued with 'COMPLETE'
+# by default we use standard mode, to use complete mode this variable must be valued with 'COMPLETE'
 scopus.search-api.viewMode =
 #################################################################
 #------------------- Web of Science (WOS) ----------------------#
@@ -92,3 +92,8 @@ wos.url.search = https://wos-api.clarivate.com/api/wos/?databaseId=WOS&lang=en&u
 datacite.url = https://api.datacite.org/dois/
 datacite.timeout = 180000
 #################################################################
+#--------------------------- ROR -------------------------------#
+#---------------------------------------------------------------#
+
+ror.orgunit-import.api-url = https://api.ror.org/organizations
+#################################################################
\ No newline at end of file
diff --git a/dspace/config/modules/ldn.cfg b/dspace/config/modules/ldn.cfg
new file mode 100644
index 0000000000..cc1ab4fade
--- /dev/null
+++ b/dspace/config/modules/ldn.cfg
@@ -0,0 +1,46 @@
+#---------------------------------------------------------------#
+#---------------COAR NOTIFY LDN CONFIGURATION-------------------#
+#---------------------------------------------------------------#
+#     Configuration properties used  by Coar Notify and ldn     #
+#---------------------------------------------------------------#
+
+
+# check on the IP number on incoming LDN Messages against the IP Range configured
+# on the Notify Service known and found as the message sender
+# ldn.ip-range.enabled = false
+
+#### LDN CONFIGURATION ####
+# To enable the LDN service, set to true.
+ldn.enabled = false
+
+#LDN message inbox endpoint
+ldn.notify.inbox = ${dspace.server.url}/ldn/inbox
+
+# LDN Queue extractor elaborates LDN Message entities of the queue
+ldn.queue.extractor.cron = 0 0/5 * * * ?
+
+# LDN Queue timeout checks LDN Message Entities relation with the queue
+ldn.queue.timeout.checker.cron = 0 0 */1 * * ? 
+
+# LDN Queue extractor elaborates LDN Message entities with max_attempts < than ldn.processor.max.attempts
+ldn.processor.max.attempts = 5
+
+# LDN Queue extractor sets LDN Message Entity queue_timeout property every time it tries a new elaboration
+# of the message. LDN Message with a future queue_timeout is not elaborated. This property is used to calculateas:
+# a new timeout, such as: new_timeout = now + ldn.processor.queue.msg.timeout (in minutes)
+ldn.processor.queue.msg.timeout = 60
+
+# Blocks the storage of incoming LDN messages with unknown Notify Service (origin)
+ldn.notify.inbox.block-untrusted = true
+
+# Blocks the storage of incoming LDN messages with known Notify Service (origin)
+# and out-of-range IP
+ldn.notify.inbox.block-untrusted-ip = true
+
+# this is the medatada used to retrieve the relation with external items when sending relationship requests
+#ldn.notify.relation.metadata = dc.relation
+
+
+# EMAIL CONFIGURATION
+
+ldn.notification.email = ${mail.admin}
diff --git a/dspace/config/modules/oai.cfg b/dspace/config/modules/oai.cfg
index 98b10f59de..d56764444a 100644
--- a/dspace/config/modules/oai.cfg
+++ b/dspace/config/modules/oai.cfg
@@ -86,7 +86,7 @@ oai.harvester.autoStart=false
 #oai.harvester.timePadding = 120
 
 # How frequently the harvest scheduler checks the remote provider for updates,
-# measured in minutes. The default vaule is 12 hours (or 720 minutes)
+# measured in minutes. The default value is 12 hours (or 720 minutes)
 #oai.harvester.harvestFrequency = 720
 
 # The heartbeat is the frequency at which the harvest scheduler queries the local
@@ -101,7 +101,7 @@ oai.harvester.autoStart=false
 # How many harvest process threads the scheduler can spool up at once. Default value is 3.
 #oai.harvester.maxThreads = 3
 
-# How much time passess before a harvest thread is terminated. The termination process
+# How much time passes before a harvest thread is terminated. The termination process
 # waits for the current item to complete ingest and saves progress made up to that point.
 # Measured in hours. Default value is 24.
 #oai.harvester.threadTimeout = 24
diff --git a/dspace/config/modules/openaire-client.cfg b/dspace/config/modules/openaire-client.cfg
index ded99d0120..09659299f2 100644
--- a/dspace/config/modules/openaire-client.cfg
+++ b/dspace/config/modules/openaire-client.cfg
@@ -16,20 +16,24 @@
 # The accessToken it only has a validity of one hour
 # For more details about the token, please check: https://develop.openaire.eu/personalToken.html
 #
-# the current OpenAIRE Rest client implementation uses basic authentication
+# the current Openaire Rest client implementation uses basic authentication
 # Described here: https://develop.openaire.eu/basic.html
 #
 # ---- Token usage required definitions ----
 # you can override this settings in your local.cfg file - can be true/false
 openaire.token.enabled = false
 
-# URL of the OpenAIRE authentication and authorization service 
+# URL of the Openaire authentication and authorization service 
 openaire.token.url = https://aai.openaire.eu/oidc/token
 
-# you will be required to register at OpenAIRE (https://services.openaire.eu/uoa-user-management/registeredServices) 
+# you will be required to register at Openaire (https://services.openaire.eu/uoa-user-management/registeredServices) 
 # and create your service in order to get the following data:
 openaire.token.clientId = CLIENT_ID_HERE
 openaire.token.clientSecret = CLIENT_SECRET_HERE
 
-# URL of OpenAIRE Rest API
-openaire.api.url = https://api.openaire.eu
\ No newline at end of file
+# URL of Openaire Rest API
+openaire.api.url = https://api.openaire.eu
+
+# OpenAIRE Search API to use for metadata import via external sources
+# (e.g. importing metadata from OpenAIRE via submission)
+openaire.search.url = https://api.openaire.eu/search/publications
\ No newline at end of file
diff --git a/dspace/config/modules/orcid.cfg b/dspace/config/modules/orcid.cfg
index cde8196774..28e8df60f8 100644
--- a/dspace/config/modules/orcid.cfg
+++ b/dspace/config/modules/orcid.cfg
@@ -7,6 +7,9 @@
 # Allowed values are disabled, only_admin, only_owner or admin_and_owner
 orcid.disconnection.allowed-users = admin_and_owner
 
+# Configuration if the orcid sync settings should be remain on he profile when it is disconnected from orcid or not
+orcid.disconnection.remain-sync = true
+
 #------------------------------------------------------------------#
 #--------------------ORCID CLIENT CONFIGURATIONS-------------------#
 #------------------------------------------------------------------#
@@ -111,6 +114,7 @@ orcid.mapping.organization.city = organization.address.addressLocality
 orcid.mapping.organization.identifiers = organization.identifier.crossrefid::FUNDREF
 orcid.mapping.organization.identifiers = organization.identifier.rin::RINGGOLD
 orcid.mapping.organization.identifiers = organization.identifier.lei::LEI
+orcid.mapping.organization.identifiers = organization.identifier.ror::ROR
 
 ### Contributor mapping ###
 orcid.mapping.contributor.email = person.email
@@ -128,6 +132,7 @@ orcid.validation.organization.identifier-sources = RINGGOLD
 orcid.validation.organization.identifier-sources = GRID
 orcid.validation.organization.identifier-sources = FUNDREF
 orcid.validation.organization.identifier-sources = LEI
+orcid.validation.organization.identifier-sources = ROR
 
 #------------------------------------------------------------------#
 #---------------------ORCID BULK SYNCHRONIZATION-------------------#
@@ -161,4 +166,4 @@ orcid.external-data.mapping.publication.external-ids = dc.identifier.doi::doi
 orcid.external-data.mapping.publication.external-ids = dc.identifier.scopus::eid
 orcid.external-data.mapping.publication.external-ids = dc.identifier.pmid::pmid
 orcid.external-data.mapping.publication.external-ids = dc.identifier.isi::wosuid
-orcid.external-data.mapping.publication.external-ids = dc.identifier.issn::issn
\ No newline at end of file
+orcid.external-data.mapping.publication.external-ids = dc.identifier.issn::issn
diff --git a/dspace/config/modules/qaevents.cfg b/dspace/config/modules/qaevents.cfg
new file mode 100644
index 0000000000..9008de06e7
--- /dev/null
+++ b/dspace/config/modules/qaevents.cfg
@@ -0,0 +1,54 @@
+#---------------------------------------------------------------#
+#------- Quality Assurance Broker Events CONFIGURATIONS --------#
+#---------------------------------------------------------------#
+# Configuration properties used by data correction service      #
+#---------------------------------------------------------------#
+# Quality Assurance enable property, false by default
+qaevents.enabled = false
+qaevents.solr.server = ${solr.server}/${solr.multicorePrefix}qaevent
+# A POST to these url(s) will be done to notify oaire of decision taken for each qaevents
+# qaevents.openaire.acknowledge-url = https://beta.api-broker.openaire.eu/feedback/events
+
+# The list of the supported events incoming from openaire (see also dspace/config/spring/api/qaevents.xml)
+# add missing abstract suggestion
+qaevents.openaire.import.topic = ENRICH/MISSING/ABSTRACT
+# add missing publication id suggestion
+qaevents.openaire.import.topic = ENRICH/MISSING/PID
+# add more publication id suggestion
+qaevents.openaire.import.topic = ENRICH/MORE/PID
+# add missing project suggestion
+qaevents.openaire.import.topic = ENRICH/MISSING/PROJECT
+# add more project suggestion
+qaevents.openaire.import.topic = ENRICH/MORE/PROJECT
+# add more review
+qaevents.openaire.import.topic = ENRICH/MORE/REVIEW
+# add more endorsement
+qaevents.openaire.import.topic = ENRICH/MORE/ENDORSEMENT
+# add more release/relationship
+qaevents.openaire.import.topic = ENRICH/MORE/LINK
+
+# The list of the supported pid href for the OPENAIRE events
+qaevents.openaire.pid-href-prefix.arxiv = https://arxiv.org/abs/
+qaevents.openaire.pid-href-prefix.handle = https://hdl.handle.net/
+qaevents.openaire.pid-href-prefix.urn = 
+qaevents.openaire.pid-href-prefix.doi = https://doi.org/
+qaevents.openaire.pid-href-prefix.pmc = https://www.ncbi.nlm.nih.gov/pmc/articles/
+qaevents.openaire.pid-href-prefix.pmid = https://pubmed.ncbi.nlm.nih.gov/
+qaevents.openaire.pid-href-prefix.ncid = https://ci.nii.ac.jp/ncid/
+
+# The URI used by the OPENAIRE broker client to import QA events
+qaevents.openaire.broker-url = http://api.openaire.eu/broker
+
+###### QAEvent source Configuration ######
+qaevents.sources = openaire, DSpaceUsers, coar-notify
+
+### Withdrawal&Reinstate correction Group ###
+# Members of this group enabled to make requests for the Withdrawn or Reinstate of an item.
+# By default this property is empty, so only Administrators will see the button to make these requests.
+# If you want to allow all authenticated users to have this feature,
+# you can configure this setting to use the Anonymous group.
+qaevents.withdraw-reinstate.group =
+
+# Withdrawal&Reinstate email to notify the system administrator about a new
+# Quality Assurance (QA) request event.
+qaevents.mail.notification = ${mail.admin}
diff --git a/dspace/config/modules/rdf.cfg b/dspace/config/modules/rdf.cfg
index 4d4191c291..fd9570d377 100644
--- a/dspace/config/modules/rdf.cfg
+++ b/dspace/config/modules/rdf.cfg
@@ -32,7 +32,7 @@ rdf.public.sparql.endpoint = http://localhost/fuseki/dspace/sparql
 
 
 
-# Address of the endpoint for the SPARQL 1.1 Graph Store HTTP Protocoll
+# Address of the endpoint for the SPARQL 1.1 Graph Store HTTP Protocol
 # This address is used to store data in the triple store.
 rdf.storage.graphstore.endpoint = http://localhost:3030/dspace/data
 # If the SPARQL 1.1. Graph Store HTTP Protocol endpoint requires
@@ -44,7 +44,7 @@ rdf.storage.graphstore.authentication = no
 # Address DSpace should use to query the SPARQL endpoint, e.g. the
 # RDFStorageImpl uses this address to determine a list of all stored
 # graphs. The SPARQL endpoint can be read-only, all commands which change
-# data will be performed using the SPARQL 1.1 Graph Store HTTP Protocoll.
+# data will be performed using the SPARQL 1.1 Graph Store HTTP Protocol.
 # If this is empty the property "rdf.public.sparql.endpoint" will be used instead.
 rdf.storage.sparql.endpoint =
 # If the internal SPARQL endpoint requires authentication, please set
diff --git a/dspace/config/modules/rdf/fuseki-assembler.ttl b/dspace/config/modules/rdf/fuseki-assembler.ttl
index 0b6340351c..7f577aebc1 100644
--- a/dspace/config/modules/rdf/fuseki-assembler.ttl
+++ b/dspace/config/modules/rdf/fuseki-assembler.ttl
@@ -29,7 +29,7 @@
 ### Assembler initialization ###
 ################################
 # Declaration additional assembler items.
-[] ja:loadClass "com.hp.hpl.jena.tdb.TDB" .
+[] ja:loadClass "org.apache.jena.tdb.TDB" .
 
 # TDB
 tdb:DatasetTDB  rdfs:subClassOf  ja:RDFDataset .
diff --git a/dspace/config/modules/rdf/metadata-rdf-schema.ttl b/dspace/config/modules/rdf/metadata-rdf-schema.ttl
index dd33c69d2c..78ba6a51bb 100644
--- a/dspace/config/modules/rdf/metadata-rdf-schema.ttl
+++ b/dspace/config/modules/rdf/metadata-rdf-schema.ttl
@@ -74,7 +74,7 @@
 :creates
     a rdf:Property ;
     rdfs:label "Result" ;
-    rdfs:comment "Specifies the RDF to generate for a specified matadata." ;
+    rdfs:comment "Specifies the RDF to generate for a specified metadata." ;
     rdfs:domain :DSpaceMetadataRDFMapping ;
     rdfs:range  :Result ;
     .
diff --git a/dspace/config/modules/rest.cfg b/dspace/config/modules/rest.cfg
index 537eedbd08..3bb620510e 100644
--- a/dspace/config/modules/rest.cfg
+++ b/dspace/config/modules/rest.cfg
@@ -54,143 +54,8 @@ rest.properties.exposed = google.recaptcha.mode
 rest.properties.exposed = cc.license.jurisdiction
 rest.properties.exposed = identifiers.item-status.register-doi
 rest.properties.exposed = authentication-password.domain.valid
+rest.properties.exposed = ldn.enabled
+rest.properties.exposed = ldn.notify.inbox
 rest.properties.exposed = handle.canonical.prefix
-
-#---------------------------------------------------------------#
-# These configs are used by the deprecated REST (v4-6) module   #
-#---------------------------------------------------------------#
-# record stats in DSpace statistics module
-rest.stats = true
-
-#------------------------------------------------------------------#
-# REST API Reporting Tools                                         #
-#------------------------------------------------------------------#
-# TODO: Currently only supported by deprecated REST (v4-6) module
-# This project is intended as an optional add-on to DSpace to provide
-# Quality Control Reporting for Collection Managers.
-#
-# See https://github.com/DSpace-Labs/DSpace-REST-Reports
-#
-# These reports utilize the DSpace REST API to provide a Collection
-# Manager with
-#  - an overview of their collections
-#  - a tool to query metadata for consistency
-#
-# When deploying the DSpace REST API, and institution may choose to
-# make the API publicly accessible or to restrict access to the API.
-# If these reports are deployed in a protected manner, the reporting
-# tools can be configured to bypass DSpace authorization when
-# reporting on collections and items.
-
-##### Configure the report pages that can be requested by name #####
-# Create a map of named reports that are available to a report tool user
-# Each map entry should be prefixed with rest-report-url
-#   The map key is a name for a report
-#   The map value is a URL to a report page
-# A list of available reports will be available with the call /rest/reports.
-# If a request is sent to /rest/reports/[report key], the request will be re-directed to the specified URL
-#
-# This project currently contains 2 sample reports.  Eventually, additional reports could be introduced through this mechanism.
-rest.report-url.collections = static/reports/index.html
-rest.report-url.item-query = static/reports/query.html
-#rest.report-url.custom =
-
-##### database specific way to format a regex SQL clause #####
-# The REST Report Tools may pass a regular expression test to the database.
-# The following configuration setting will construct a SQL regular expression test appropriate to your database engine
-rest.regex-clause = text_value ~ ?
-
-
-##### Configure REST Report Filters #####
-# A filter contains a set of tests that will be applied to an item to determine its inclusion in a particular report.
-# Private items and withdrawn items are frequently excluded from DSpace reports.
-# Additional filters can be configured to examine other item properties.
-# For instance, items containing an image bitstream often have different requirements from a item containing a PDF.
-# The DSpace REST reports come with a variety of filters that examine item properties, item bitstream properties,
-# and item authorization policies.  The existing filters can be used as an example to construct institution specific filters
-# that will test conformity to a set of institutional policies.
-# plugin.sequence.org.dspace.rest.filter points to a list of classes that contain available filters.
-# Each class must implement the ItemFilterList interface.
-#   ItemFilterDefs:     Filters that examine simple item and bitstream type properties
-#   ItemFilterDefsMisc: Filters that examine bitstream mime types and dependencies between bitstreams
-#   ItemFilterDefsMeta: Filters that examine metadata properties
-#   ItemFilterDefsPerm: Filters that examine item and bitstream authorization policies
-plugin.sequence.org.dspace.rest.filter.ItemFilterList = \
-        org.dspace.rest.filter.ItemFilterDefs,\
-        org.dspace.rest.filter.ItemFilterDefsMisc,\
-        org.dspace.rest.filter.ItemFilterDefsPerm
-
-#     org.dspace.rest.filter.ItemFilterDefsMeta,\
-
-##### Configuration Settings used by REST Report Filters #####
-
-# Define the set of supported bitstream bundle names for your repository as a comma separated list
-rest.report-supp-bundles = ORIGINAL,THUMBNAIL,TEXT,LICENSE
-
-# Define the bitstream mime types that will be interpreted as a "document".
-# Generally, a "document" should be expected to be searchable and to have a TEXT bitstream.  An institution may expect document types to
-# have a thumbnail.
-rest.report-mime-document = text/plain,application/pdf,text/html,application/msword,text/xml,application/vnd.openxmlformats-officedocument.wordprocessingml.document,application/vnd.ms-powerpoint,application/vnd.openxmlformats-officedocument.presentationml.presentation,application/vnd.ms-excel,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
-
-# Define the standard/preferred bitstream mime types for document items for your repository
-# This setting allows the reporting tools to report on "supported" and "unsupported" document types.
-rest.report-mime-document-supported = application/pdf
-
-# Define the standard/preferred bitstream mime types for image items for your repository
-# This setting allows the reporting tools to report on "supported" and "unsupported" image types.
-rest.report-mime-document-image = image/jpeg,image/jp2
-
-# Minimum size for a supported PDF in the repository
-# PDF bitstreams smaller than this size will be highlighted in a report.
-# PDF files smaller than this size are potentially corrupt.
-rest.report-pdf-min-size = 20000
-
-# Maximum size for a typical PDF in the repository
-# PDF bitstreams larger than this size will be highlighted in a report.
-# PDF files larger than this size may be slow to retrieve.
-rest.report-pdf-max-size = 25000000
-
-# Minimum size for a thumbnail - could indicate a corrupted original
-# Thumbnail bitstreams smaller than this size will be highlighted in a report.
-# Thumbnail files smaller than this size are potentially corrupt.
-rest.report-thumbnail-min-size = 400
-
-# Bitstream descriptor to identify generated thumbnails
-# The ImageMagick Thumbnail generator tags the thumbnails it has created with a standard description.
-# This description identifies thumbnails that can safely be re-generated.
-rest.report-gen-thumbnail-desc = Generated Thumbnail
-
-#### Metadata Filtering by Regular Expression #####
-# Used by org.dspace.rest.filter.ItemFilterDefsMeta
-# This class filters items based on metadata properties.
-# These filters are useful for filtering a small set of items.  These filters will be inefficient as a query tool.
-
-# regex to detect compound subjects - detect subject terms that should be split into individual terms
-rest.report-regex-compound-subject = .*;.*
-
-# regex to detect compound authors - detect author/creator names taht should be split into individual fields
-rest.report-regex-compound-author = .* and .*
-
-# regex to detect unbreaking metadata - detect long unbreaking text that may not render properly on a page
-# Be sure to escape commas to prevent Apache Config from breaking regex into array values
-rest.report-regex-unbreaking = ^.*[^ ]{50\,50}.*$
-
-# regex to detect url in description - detect description fields that contain URL's
-rest.report-regex-url = ^.*(http://|https://|mailto:).*$
-
-# regex to identify full text content from the provenance field
-# This test has been used to identfiy "full-text" content when harvesting DSpace content by Summon
-rest.report-regex-fulltext = ^.*No\\. of bitstreams(.|\\r|\\n|\\r\\n)*\\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$
-
-# regex to identify very long metadata fields that may be slow to render
-# Be sure to escape commas to prevent Apache Config from breaking regex into array values
-rest.report-regex-long = ^[\\s\\S]{6000\,}$
-
-# regex to identify partial XML entities within a description field (a frequent problem found in ProQuest ETD's)
-rest.report-regex-xml-entity = ^.*&#.*$
-
-# regex to identify non ascii characters in metadata
-rest.report-regex-non-ascii = ^.*[^\\p{ASCII}].*$
-
-# The maximum number of results to return for 1 request
-rest.search.max.results = 100
+rest.properties.exposed = contentreport.enable
+rest.properties.exposed = duplicate.enable
diff --git a/dspace/config/modules/solr-statistics.cfg b/dspace/config/modules/solr-statistics.cfg
index 073850ca23..57c061dac7 100644
--- a/dspace/config/modules/solr-statistics.cfg
+++ b/dspace/config/modules/solr-statistics.cfg
@@ -19,10 +19,6 @@ solr-statistics.query.filter.bundles=ORIGINAL
 # create new Solr cores when sharding the statistics data.
 solr-statistics.configset = statistics
 
-# control solr statistics querying to filter out spider IPs
-# false by default
-#solr-statistics.query.filter.spiderIp = false
-
 # control solr statistics querying to look at "isBot" field to determine
 # if record is a bot. true by default.
 #solr-statistics.query.filter.isBot = true
@@ -32,10 +28,10 @@ solr-statistics.configset = statistics
 solr-statistics.autoCommit = true
 
 # URLs to download IP addresses of search engine spiders from
-solr-statistics.spiderips.urls = http://iplists.com/google.txt, \
-                 http://iplists.com/inktomi.txt, \
-                 http://iplists.com/lycos.txt, \
-                 http://iplists.com/infoseek.txt, \
-                 http://iplists.com/altavista.txt, \
-                 http://iplists.com/excite.txt, \
-                 http://iplists.com/misc.txt
+solr-statistics.spiderips.urls = https://www.iplists.com/google.txt, \
+                 https://www.iplists.com/inktomi.txt, \
+                 https://www.iplists.com/lycos.txt, \
+                 https://www.iplists.com/infoseek.txt, \
+                 https://www.iplists.com/altavista.txt, \
+                 https://www.iplists.com/excite.txt, \
+                 https://www.iplists.com/misc.txt
diff --git a/dspace/config/modules/suggestion.cfg b/dspace/config/modules/suggestion.cfg
new file mode 100644
index 0000000000..0792c46ebf
--- /dev/null
+++ b/dspace/config/modules/suggestion.cfg
@@ -0,0 +1,7 @@
+#---------------------------------------------------------------#
+#-------------------Suggestion CONFIGURATIONS-------------------#
+#---------------------------------------------------------------#
+# Configuration properties used by publication claim            #
+#  (suggestion) service                                         #
+#---------------------------------------------------------------#
+suggestion.solr.server = ${solr.server}/${solr.multicorePrefix}suggestion
diff --git a/dspace/config/modules/swordv2-server.cfg b/dspace/config/modules/swordv2-server.cfg
index ccb7760e6d..5891f32726 100644
--- a/dspace/config/modules/swordv2-server.cfg
+++ b/dspace/config/modules/swordv2-server.cfg
@@ -122,7 +122,7 @@ swordv2-server.keep-original-package = true
 # if versions.keep is set to true.  This will be used in the case
 # that individual files are updated or removed via SWORD.  If
 # the entire Media Resource (files in the ORIGINAL bundle) is removed
-# this will be backed up in its entirity in a bundle of its own
+# this will be backed up in its entirety in a bundle of its own
 #
 # swordv2-server.bundle.deleted = DELETED
 
diff --git a/dspace/config/registries/coar-types.xml b/dspace/config/registries/coar-types.xml
new file mode 100644
index 0000000000..39c78e8f8c
--- /dev/null
+++ b/dspace/config/registries/coar-types.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dspace-dc-types SYSTEM "dspace-dc-types.dtd">
+
+<!--
+  This document was based on the OpenAIRE4 Guidelines for Literature Repositories
+  https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/index.html
+  -->
+  
+<dspace-dc-types>
+    <dspace-header>
+        <title>COAR fields definition</title>
+    </dspace-header>
+    
+    <dc-schema>
+        <name>coar</name>
+        <namespace>http://dspace.org/coar</namespace>
+    </dc-schema>
+    
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>review</qualifier>
+        <scope_note>Reviewed by</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>endorsement</qualifier>
+        <scope_note>Endorsement</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>examination</qualifier>
+        <scope_note>Examination</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>refused</qualifier>
+        <scope_note>Refused by</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>release</qualifier>
+        <scope_note>Released by</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>coar</schema>
+        <element>notify</element>
+        <qualifier>endorsedBy</qualifier>
+        <scope_note>Endorsed by</scope_note>
+    </dc-type>
+
+</dspace-dc-types>
diff --git a/dspace/config/registries/datacite-types.xml b/dspace/config/registries/datacite-types.xml
new file mode 100644
index 0000000000..b415ff0d2b
--- /dev/null
+++ b/dspace/config/registries/datacite-types.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE dspace-dc-types SYSTEM "dspace-dc-types.dtd">
+
+<!--
+  This document was based on the OpenAIRE4 Guidelines for Literature Repositories
+  https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/index.html
+  -->
+  
+<dspace-dc-types>
+    <dspace-header>
+        <title>OpenAIRE4 Datacite fields definition</title>
+    </dspace-header>
+    
+    <dc-schema>
+        <name>datacite</name>
+        <namespace>http://datacite.org/schema/kernel-4</namespace>
+    </dc-schema>
+
+    <!--
+      OpenAIRE4 Guidelines
+      21 - Geolocation -->	
+    <dc-type>
+        <schema>datacite</schema>
+        <element>geoLocation</element>
+        <scope_note>Spatial region or named place where the data was gathered or about which the data is focused.</scope_note>
+    </dc-type>
+        
+    <!-- specific type required by OpenAIRE4 Guidelines -->
+    <dc-type>
+        <schema>datacite</schema>
+        <element>subject</element>
+        <qualifier>fos</qualifier>
+        <scope_note>Fields of Science and Technology - OECD</scope_note>
+    </dc-type>
+    
+    <dc-type>
+        <schema>datacite</schema>
+        <element>relation</element>
+        <qualifier>isReviewedBy</qualifier>
+        <scope_note>Reviewd by</scope_note>
+    </dc-type>    
+    
+    <dc-type>
+        <schema>datacite</schema>
+        <element>relation</element>
+    	<qualifier>isReferencedBy</qualifier>
+		<scope_note>Referenced by</scope_note>
+	</dc-type>	
+	
+    <dc-type>
+        <schema>datacite</schema>
+        <element>relation</element>
+    	<qualifier>isSupplementedBy</qualifier>
+		<scope_note>Supplemented by</scope_note>
+	</dc-type>
+
+</dspace-dc-types>
diff --git a/dspace/config/registries/dublin-core-types.xml b/dspace/config/registries/dublin-core-types.xml
index d0f340f89c..9a4aefb3ff 100644
--- a/dspace/config/registries/dublin-core-types.xml
+++ b/dspace/config/registries/dublin-core-types.xml
@@ -265,6 +265,7 @@
     <schema>dc</schema>
     <element>identifier</element>
     <qualifier>doi</qualifier>
+    <scope_note>The doi identifier minted by this repository.</scope_note>
   </dc-type>
   
   <dc-type>
diff --git a/dspace/config/registries/openaire4-types.xml b/dspace/config/registries/openaire4-types.xml
index b3290ac120..e47e06e0ae 100644
--- a/dspace/config/registries/openaire4-types.xml
+++ b/dspace/config/registries/openaire4-types.xml
@@ -2,24 +2,19 @@
 <!DOCTYPE dspace-dc-types SYSTEM "dspace-dc-types.dtd">
 
 <!--
-  This document was based on the OpenAIRE4 Guidelines for Literature Repositories
+  This document was based on the Openaire4 Guidelines for Literature Repositories
   https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/index.html
   -->
   
 <dspace-dc-types>
     <dspace-header>
-        <title>OpenAIRE4 fields definition</title>
+        <title>Openaire4 fields definition</title>
     </dspace-header>
 
     <dc-schema>
         <name>oaire</name>
         <namespace>http://namespace.openaire.eu/schema/oaire/</namespace>
     </dc-schema>
-    
-    <dc-schema>
-        <name>datacite</name>
-        <namespace>http://datacite.org/schema/kernel-4</namespace>
-    </dc-schema>
 	
     <dc-type>
         <schema>oaire</schema>
@@ -107,21 +102,4 @@
         <scope_note>The date when the conference took place. This property is considered to be part of the bibliographic citation. Recommended best practice for encoding the date value is defined in a profile of ISO 8601 [W3CDTF] and follows the YYYY-MM-DD format.</scope_note>
     </dc-type>
 
-    <!--
-      OpenAIRE4 Guidelines
-      21 - Geolocation -->	
-    <dc-type>
-        <schema>datacite</schema>
-        <element>geoLocation</element>
-        <scope_note>Spatial region or named place where the data was gathered or about which the data is focused.</scope_note>
-    </dc-type>
-        
-    <!-- specific type required by OpenAIRE4 Guidelines -->
-    <dc-type>
-        <schema>datacite</schema>
-        <element>subject</element>
-        <qualifier>fos</qualifier>
-        <scope_note>Fields of Science and Technology - OECD</scope_note>
-    </dc-type>
-
 </dspace-dc-types>
diff --git a/dspace/config/registries/relationship-formats.xml b/dspace/config/registries/relationship-formats.xml
index f2f50182fa..53d15d4d43 100644
--- a/dspace/config/registries/relationship-formats.xml
+++ b/dspace/config/registries/relationship-formats.xml
@@ -237,7 +237,7 @@
         <scope_note>Contains all uuids of PUBLICATIONS which link to the current ISSUE via a "latest" relationship. In other words, this stores all relationships pointing to the current ISSUE from any PUBLICATION, implying that the ISSUE is marked as "latest". Internally used by DSpace to support versioning. Do not manually add, remove or edit values.</scope_note>
     </dc-type>
 
-    <!-- OpenAIRE4 Guidelines - required relationships -->
+    <!-- Openaire4 Guidelines - required relationships -->
 
     <dc-type>
         <schema>relation</schema>
diff --git a/dspace/config/registries/schema-organization-types.xml b/dspace/config/registries/schema-organization-types.xml
index 91ee203ae9..e69d29ef24 100644
--- a/dspace/config/registries/schema-organization-types.xml
+++ b/dspace/config/registries/schema-organization-types.xml
@@ -42,10 +42,10 @@
         </scope_note>
     </dc-type>
     
-    <!-- OpenAIRE4 Guidelines -->
+    <!-- Openaire4 Guidelines -->
     <!-- 2.2.2.1. Attribute nameType (R) -->
     <!-- and 3.2.6. Subproperty nameIdentifier (R) -->
-    <!-- specific type required by OpenAIRE4 Guidelines -->  
+    <!-- specific type required by Openaire4 Guidelines -->  
     
     <dc-type>
         <schema>organization</schema>
@@ -80,6 +80,24 @@
         <qualifier>crossrefid</qualifier>
         <scope_note>Crossref identifier</scope_note>
     </dc-type>
-    
+
+    <dc-type>
+        <schema>organization</schema>
+        <element>parentOrganization</element>
+        <scope_note>The larger organization that this organization is a subOrganization of, if any.</scope_note>
+    </dc-type>
+
+
+    <dc-type>
+        <schema>organization</schema>
+        <element>alternateName</element>
+        <scope_note>An alias for the organization.</scope_note>
+    </dc-type>
+
+    <dc-type>
+        <schema>organization</schema>
+        <element>url</element>
+        <scope_note>Url of the organization.</scope_note>
+    </dc-type>
 
 </dspace-dc-types>
diff --git a/dspace/config/registries/schema-person-types.xml b/dspace/config/registries/schema-person-types.xml
index 3a8f79732d..0a40060e51 100644
--- a/dspace/config/registries/schema-person-types.xml
+++ b/dspace/config/registries/schema-person-types.xml
@@ -17,7 +17,7 @@
     -->
 
     <!--
-	  OpenAIRE4 Guidelines	
+	  Openaire4 Guidelines	
       2.2.3. Subproperty givenName (R)
       The personal or first name of the author. -->
     <dc-type>
@@ -29,7 +29,7 @@
     </dc-type>
 	
     <!--
-	  OpenAIRE4 Guidelines
+	  Openaire4 Guidelines
       2.2.4. Subproperty familyName (R)
       The surname or last name of the author. -->
     <dc-type>
@@ -74,7 +74,7 @@
     </dc-type>
 	
     <!--
-      OpenAIRE4 Guidelines
+      Openaire4 Guidelines
       2.2.6. Subproperty affiliation (R)
       The organizational or institutional affiliation of the creator (occurrence: 0-n). -->
     <dc-type>
@@ -84,10 +84,10 @@
         <scope_note>The organizational or institutional affiliation of the creator</scope_note>
     </dc-type>
     
-    <!-- OpenAIRE4 Guidelines -->
+    <!-- Openaire4 Guidelines -->
     <!-- 2.2.2.1. Attribute nameType (R) -->
     <!-- and 3.2.6. Subproperty nameIdentifier (R) -->
-    <!-- specific type required by OpenAIRE4 Guidelines -->  
+    <!-- specific type required by Openaire4 Guidelines -->  
     <dc-type>
         <schema>person</schema>
         <element>identifier</element>
diff --git a/dspace/config/registries/schema-project-types.xml b/dspace/config/registries/schema-project-types.xml
index c2f844d2b2..4da07b6a79 100644
--- a/dspace/config/registries/schema-project-types.xml
+++ b/dspace/config/registries/schema-project-types.xml
@@ -18,7 +18,7 @@
     -->
 	
 	<!--
-	  OpenAIRE4 Guidelines
+	  Openaire4 Guidelines
       4.2.2. Subproperty funderName (M)
       Name of the funding provider (occurrence: 1). Mandatory if FundingReference is used. -->
     <dc-type>
@@ -29,7 +29,7 @@
     </dc-type>
 	
 	<!--
-	  OpenAIRE4 Guidelines
+	  Openaire4 Guidelines
       4.2.3. Subproperty funderIdentifier (R)
       Unique identifier of the funding entity (occurrence: 0-1). 
     -->
diff --git a/dspace/config/spiders/domains/example b/dspace/config/spiders/domains/example
index bf82d6d75a..ba7d83aa9a 100644
--- a/dspace/config/spiders/domains/example
+++ b/dspace/config/spiders/domains/example
@@ -1,4 +1,4 @@
-# example spider filder by domain regular expressions courtesy of OSU Libraries
+# example spider filter by domain regular expressions courtesy of OSU Libraries
 # https://raw.github.com/osulibraries/DSpace/osukb/dspace/config/Spiders-DomainName.txt
 (.*)\.fastsearch\.net\.
 (.*)\.scoutjet\.com\.
diff --git a/dspace/config/spiders/iplists.com-misc.txt b/dspace/config/spiders/iplists.com-misc.txt
index bfb35bab8b..a9a6270fee 100644
--- a/dspace/config/spiders/iplists.com-misc.txt
+++ b/dspace/config/spiders/iplists.com-misc.txt
@@ -775,7 +775,7 @@
 # UA "fscrawler/3.0 (www.e-dintorni.it;Windows NT 5.0)"
 213.215.160.170
 
-# EDSA Phillipines
+# EDSA Philippines
 210.16.10.40
 
 # eFamily
diff --git a/dspace/config/spring/api/core-dao-services.xml b/dspace/config/spring/api/core-dao-services.xml
index bc62a71c03..54cfb2df34 100644
--- a/dspace/config/spring/api/core-dao-services.xml
+++ b/dspace/config/spring/api/core-dao-services.xml
@@ -69,5 +69,10 @@
 
     <bean class="org.dspace.supervision.dao.impl.SupervisionOrderDaoImpl"/>
 
+    <bean class="org.dspace.app.ldn.dao.impl.NotifyServiceDaoImpl"/>
+    <bean class="org.dspace.app.ldn.dao.impl.NotifyServiceInboundPatternDaoImpl"/>
+    <bean class="org.dspace.app.ldn.dao.impl.LDNMessageDaoImpl"/>
+    <bean class="org.dspace.app.ldn.dao.impl.NotifyPatternToTriggerDaoImpl"/>
+
 
 </beans>
diff --git a/dspace/config/spring/api/core-factory-services.xml b/dspace/config/spring/api/core-factory-services.xml
index acfa0efe6d..2c6e60fc1c 100644
--- a/dspace/config/spring/api/core-factory-services.xml
+++ b/dspace/config/spring/api/core-factory-services.xml
@@ -57,6 +57,10 @@
 
     <bean id="supervisionOrderServiceFactory" class="org.dspace.supervision.factory.SupervisionOrderServiceFactoryImpl"/>
 
+    <bean id="notifyServiceFactory" class="org.dspace.app.ldn.factory.NotifyServiceFactoryImpl"/>
+    
+    <bean id="ldnMessageServiceFactory" class="org.dspace.app.ldn.factory.LDNMessageServiceFactoryImpl"/>
+
     <bean id="submissionServiceFactory" class="org.dspace.submit.factory.SubmissionServiceFactoryImpl"/>
 
 </beans>
diff --git a/dspace/config/spring/api/core-hibernate.xml b/dspace/config/spring/api/core-hibernate.xml
index 45f7d15dc5..6c54fca46e 100644
--- a/dspace/config/spring/api/core-hibernate.xml
+++ b/dspace/config/spring/api/core-hibernate.xml
@@ -4,7 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"
        default-lazy-init="true">
 
-    <!-- Hibernate 4 Configuration -->
+    <!-- Hibernate Configuration -->
     <bean id="sessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean" lazy-init="true">
         <!-- Load most Hibernate settings from hibernate.cfg.xml -->
         <property name="configLocation" value="file:${dspace.dir}/config/hibernate.cfg.xml"/>
diff --git a/dspace/config/spring/api/core-services.xml b/dspace/config/spring/api/core-services.xml
index 7a5642f464..8d9c9d3dd3 100644
--- a/dspace/config/spring/api/core-services.xml
+++ b/dspace/config/spring/api/core-services.xml
@@ -58,6 +58,7 @@
     <bean class="org.dspace.content.RelationshipTypeServiceImpl"/>
     <bean class="org.dspace.content.RelationshipMetadataServiceImpl"/>
     <bean class="org.dspace.content.FeedbackServiceImpl"/>
+    <bean class="org.dspace.content.DuplicateDetectionServiceImpl"/>
 
     <bean class="org.dspace.scripts.ProcessServiceImpl"/>
     <bean class="org.dspace.scripts.ScriptServiceImpl"/>
@@ -80,6 +81,8 @@
         <constructor-arg name='configPrefix' value='solr'/>
     </bean>
 
+    <bean class="org.dspace.contentreport.ContentReportServiceImpl"/>
+
     <!-- Ensure PluginService is initialized properly via init() method -->
     <bean class="org.dspace.core.LegacyPluginServiceImpl" init-method="init"/>
     <bean class="org.dspace.core.LicenseServiceImpl"/>
@@ -145,6 +148,7 @@
     <bean class="org.dspace.discovery.indexobject.WorkflowItemIndexFactoryImpl" autowire-candidate="true"/>
     <bean class="org.dspace.discovery.indexobject.WorkspaceItemIndexFactoryImpl" autowire-candidate="true"/>
     <bean class="org.dspace.discovery.indexobject.MetadataFieldIndexFactoryImpl" autowire-candidate="true"/>
+    <bean class="org.dspace.discovery.indexobject.LDNMessageEntityIndexFactoryImpl" autowire-candidate="true"/>
 
     <!-- OIDC Authentication -->
     <bean class="org.dspace.authenticate.OidcAuthenticationBean" id="oidcAuthentication"/>
@@ -155,8 +159,12 @@
 
     <bean class="org.dspace.supervision.SupervisionOrderServiceImpl"/>
 
+    <bean class="org.dspace.content.ItemFilterServiceImpl"/>
+    
     <!-- Submission Config Service -->
     <bean class="org.dspace.submit.service.SubmissionConfigServiceImpl"/>
 
+    <bean class="org.dspace.correctiontype.service.impl.CorrectionTypeServiceImpl"/>
+
 </beans>
 
diff --git a/dspace/config/spring/api/correction-types.xml b/dspace/config/spring/api/correction-types.xml
new file mode 100644
index 0000000000..b79e2408d8
--- /dev/null
+++ b/dspace/config/spring/api/correction-types.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-lazy-init="true">
+
+    <bean id="withdrawnRequest" class="org.dspace.correctiontype.WithdrawnCorrectionType" >
+        <property name="id" value="request-withdrawn"/>
+        <property name="topic" value="REQUEST/WITHDRAWN"/>
+    </bean>
+
+    <bean id="reinstateRequest" class="org.dspace.correctiontype.ReinstateCorrectionType" >
+        <property name="id" value="request-reinstate"/>
+        <property name="topic" value="REQUEST/REINSTATE"/>
+    </bean>
+
+</beans>
diff --git a/dspace/config/spring/api/discovery.xml b/dspace/config/spring/api/discovery.xml
index c5486ad84e..9291781813 100644
--- a/dspace/config/spring/api/discovery.xml
+++ b/dspace/config/spring/api/discovery.xml
@@ -44,6 +44,9 @@
     <!-- Additional indexing plugin enables searching by supervised (true,false) -->
     <bean id="solrServiceSupervisionOrderIndexingPlugin" class="org.dspace.discovery.SolrServiceSupervisionOrderIndexingPlugin"/>
 
+    <!-- Additional indexing plugin that normalises and indexes value(s) for comparison to be used in e.g. duplication detection -->
+    <bean id="solrServiceIndexComparisonPlugin" class="org.dspace.discovery.SolrServiceIndexComparisonPlugin" scope="prototype"/>
+
     <!--Bean that is used for mapping communities/collections to certain discovery configurations.-->
     <bean id="org.dspace.discovery.configuration.DiscoveryConfigurationService" class="org.dspace.discovery.configuration.DiscoveryConfigurationService">
         <property name="map">
@@ -73,6 +76,11 @@
                 <entry key="undiscoverable" value-ref="unDiscoverableItems" />
                 <entry key="administrativeView" value-ref="administrativeView" />
 
+                <!-- "community" is the search configuration for community pages -->
+                <entry key="community" value-ref="communityConfiguration" />
+                <!-- "collection" is the search configuration for collection pages -->
+                <entry key="collection" value-ref="collectionConfiguration" />
+
                 <entry key="publication" value-ref="publication"/>
                 <!-- Same as the "publication" configuration, but does NOT filter out older versions of items -->
                 <!-- Used to display related items on single-item pages, because a relationship does not always point to the latest version of the related item -->
@@ -110,9 +118,24 @@
 
                 <!-- search for an entity that can be a Person or an OrgUnit -->
                 <entry key="personOrOrgunit" value-ref="personOrOrgunit"/>
-                <!-- OpenAIRE4 guidelines - search for an OrgUnit that have a specific dc.type=FundingOrganization -->
-                <entry key="openAIREFundingAgency" value-ref="openAIREFundingAgency"/>
+                <!-- Openaire4 guidelines - search for an OrgUnit that have a specific dc.type=FundingOrganization -->
+                <entry key="openaireFundingAgency" value-ref="openaireFundingAgency"/>
                 <entry key="eperson_claims" value-ref="eperson_claims"/>
+                <!-- COAR NOTIFY LDN MESSAGES configuration -->
+                <entry key="NOTIFY.incoming" value-ref="NOTIFY.incoming"/>
+                <entry key="NOTIFY.outgoing" value-ref="NOTIFY.outgoing"/>
+                <!-- COAR NOTIFY LDN MESSAGES incoming configuration -->
+                <entry key="NOTIFY.incoming.accepted" value-ref="NOTIFY.incoming.accepted"/>
+                <entry key="NOTIFY.incoming.processed" value-ref="NOTIFY.incoming.processed"/>
+                <entry key="NOTIFY.incoming.failure" value-ref="NOTIFY.incoming.failure"/>
+                <entry key="NOTIFY.incoming.untrusted" value-ref="NOTIFY.incoming.untrusted"/>
+                <entry key="NOTIFY.incoming.involvedItems" value-ref="NOTIFY.incoming.involvedItems"/>
+                <!-- COAR NOTIFY LDN MESSAGES outgoing configuration -->
+                <entry key="NOTIFY.outgoing.delivered" value-ref="NOTIFY.outgoing.delivered"/>
+                <entry key="NOTIFY.outgoing.queued" value-ref="NOTIFY.outgoing.queued"/>
+                <entry key="NOTIFY.outgoing.queued_for_retry" value-ref="NOTIFY.outgoing.queued_for_retry"/>
+                <entry key="NOTIFY.outgoing.failure" value-ref="NOTIFY.outgoing.failure"/>
+                <entry key="NOTIFY.outgoing.involvedItems" value-ref="NOTIFY.outgoing.involvedItems"/>
             </map>
         </property>
         <property name="toIgnoreMetadataFields">
@@ -306,6 +329,40 @@
         <property name="spellCheckEnabled" value="true"/>
     </bean>
 
+    <bean id="communityConfiguration" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype" parent="defaultConfiguration">
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortDateAccessioned"/>
+                        <ref bean="sortScore"/>
+                        <ref bean="sortTitle"/>
+                        <ref bean="sortDateIssued"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
+    <bean id="collectionConfiguration" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+          scope="prototype" parent="defaultConfiguration">
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                        <ref bean="sortDateAccessioned"/>
+                        <ref bean="sortScore"/>
+                        <ref bean="sortTitle"/>
+                        <ref bean="sortDateIssued"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
+
     <bean id="defaultRelationshipsConfiguration" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
         <!--Which sidebar facets are to be displayed-->
         <property name="sidebarFacets">
@@ -585,6 +642,7 @@
     <!--The configuration settings for discovery of withdrawn and undiscoverable items (admin only) and regular items-->
     <bean id="administrativeView" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype">
         <property name="id" value="administrativeView"/>
+        <property name="indexAlways" value="true"/>
         <property name="sidebarFacets">
             <list>
                 <ref bean="searchFilterDiscoverable" />
@@ -594,6 +652,9 @@
                 <ref bean="searchFilterIssued" />
                 <ref bean="searchFilterContentInOriginalBundle"/>
                 <ref bean="searchFilterEntityType"/>
+                <ref bean="searchFilterNotifyRelation" />
+                <ref bean="searchFilterNotifyEndorsement" />
+                <ref bean="searchFilterNotifyReview" />
             </list>
         </property>
         <!-- Set TagCloud configuration per discovery configuration -->
@@ -616,6 +677,9 @@
                 <ref bean="searchFilterIsOrgUnitOfPublicationRelation"/>
                 <ref bean="searchFilterIsPublicationOfJournalIssueRelation"/>
                 <ref bean="searchFilterIsJournalOfPublicationRelation"/>
+                <ref bean="searchFilterNotifyRelation" />
+                <ref bean="searchFilterNotifyEndorsement" />
+                <ref bean="searchFilterNotifyReview" />
             </list>
         </property>
         <!--The sort filters for the discovery search-->
@@ -2027,7 +2091,7 @@
         <property name="spellCheckEnabled" value="true"/>
     </bean>
 
-    <bean id="openAIREFundingAgency" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+    <bean id="openaireFundingAgency" class="org.dspace.discovery.configuration.DiscoveryConfiguration"
           scope="prototype">
         <property name="id" value="fundingAgency"/>
         <property name="indexAlways" value="true"/>
@@ -2120,6 +2184,61 @@
     </bean>
 
 
+    <bean id="ldnMessageEntityBaseConfig"
+        class="org.dspace.discovery.configuration.DiscoveryConfiguration"
+        scope="prototype">
+        <property name="id" value="ldnMessages" />
+        <!--Which sidebar facets are to be displayed -->
+        <property name="sidebarFacets">
+            <list>
+            	<ref bean="searchFilterNotifyRelatedItem" />
+            	<ref bean="searchFilterNotifyLdnService" />
+            	<ref bean="searchFilterNotifyQueueStatus" />
+            	<ref bean="searchFilterNotifyActivityStreamType" />
+            	<ref bean="searchFilterNotifyCoarNotifyType" />
+            	<ref bean="searchFilterNotifyLastStartTime" />
+            </list>
+        </property>
+        <!--The search filters which can be used on the discovery search page -->
+        <property name="searchFilters">
+            <list>
+            	<ref bean="searchFilterNotifyRelatedItem" />
+            	<ref bean="searchFilterNotifyOrigin" />
+            	<ref bean="searchFilterNotifyTarget" />
+            	<ref bean="searchFilterNotifyLdnService" />
+            	<ref bean="searchFilterNotifyQueueStatus" />
+            	<ref bean="searchFilterNotifyActivityStreamType" />
+            	<ref bean="searchFilterNotifyCoarNotifyType" />
+            	<ref bean="searchFilterNotifyLastStartTime" />
+            </list>
+        </property>
+        <!--The sort filters for the discovery search-->
+        <property name="searchSortConfiguration">
+            <bean class="org.dspace.discovery.configuration.DiscoverySortConfiguration">
+                <property name="sortFields">
+                    <list>
+                    	<ref bean="sortLastModified"/>
+                    	<ref bean="sortLastModifiedAsc"/>
+                    	<ref bean="sortQueueLastStartTimeDesc"/>
+                    	<ref bean="sortQueueLastStartTimeAsc"/>
+                    	<ref bean="sortQueueAttemptsDesc"/>
+                    	<ref bean="sortQueueAttemptsAsc"/>
+                    </list>
+                </property>
+            </bean>
+        </property>
+        <!--Any default filter queries, these filter queries will be used for all
+            queries done by discovery for this configuration -->
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+            </list>
+        </property>
+        <!--Default result per page  -->
+        <property name="defaultRpp" value="10" />
+    </bean>
+
      <!--TagCloud configuration bean for default discovery configuration-->
     <bean id="defaultTagCloudFacetConfiguration" class="org.dspace.discovery.configuration.TagCloudFacetConfiguration">
         <!-- Actual configuration of the tagcloud (colors, sorting, etc.) -->
@@ -2131,6 +2250,150 @@
             </list>
         </property>
     </bean>
+    
+    <bean id="NOTIFY.incoming" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="ldnMessageEntityBaseConfig">
+        <property name="id" value="NOTIFY.incoming"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.incoming.accepted" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.incoming">
+        <property name="id" value="NOTIFY.incoming.accepted"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+                <value>in_reply_to:*</value>
+                <value>activity_stream_type_keyword:Accept</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_PROCESSED}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.incoming.processed" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.incoming">
+        <property name="id" value="NOTIFY.incoming.processed"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_PROCESSED}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.incoming.failure" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.incoming">
+        <property name="id" value="NOTIFY.incoming.failure"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_FAILED} OR queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_UNMAPPED_ACTION}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.incoming.untrusted" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.incoming">
+        <property name="id" value="NOTIFY.incoming.untrusted"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_UNTRUSTED}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.incoming.involvedItems" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="administrativeView">
+        <property name="id" value="NOTIFY.incoming.involvedItems"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:Item</value>
+                <value>{!join from=relateditem_authority to=search.resourceid fromIndex=${solr.multicorePrefix}search}notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_INCOMING}</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.outgoing" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="ldnMessageEntityBaseConfig">
+        <property name="id" value="NOTIFY.outgoing"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.outgoing.delivered" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.outgoing">
+        <property name="id" value="NOTIFY.outgoing.delivered"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_PROCESSED}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.outgoing.queued" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.outgoing">
+        <property name="id" value="NOTIFY.outgoing.queued"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_QUEUED}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.outgoing.queued_for_retry" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.outgoing">
+        <property name="id" value="NOTIFY.outgoing.queued_for_retry"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_QUEUED_FOR_RETRY}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.outgoing.failure" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="NOTIFY.outgoing">
+        <property name="id" value="NOTIFY.outgoing.failure"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:LDNMessageEntity</value>
+                <value>notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+                <value>queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_FAILED} OR queue_status_authority:#{T(org.dspace.app.ldn.LDNMessageEntity).QUEUE_STATUS_UNMAPPED_ACTION}</value>
+            </list>
+        </property>
+    </bean>
+    
+    <bean id="NOTIFY.outgoing.involvedItems" class="org.dspace.discovery.configuration.DiscoveryConfiguration" scope="prototype" parent="administrativeView">
+        <property name="id" value="NOTIFY.outgoing.involvedItems"/>
+        <property name="defaultFilterQueries">
+            <list>
+                <!--Only find LDNMessageEntity -->
+                <value>search.resourcetype:Item</value>
+                <value>{!join from=relateditem_authority to=search.resourceid fromIndex=${solr.multicorePrefix}search}notification_type_keyword:#{T(org.dspace.app.ldn.LDNMessageEntity).TYPE_OUTGOING}</value>
+                <value>-withdrawn:true AND -discoverable:false</value>
+            </list>
+        </property>
+    </bean>
 
     <bean id="tagCloudConfiguration" class="org.dspace.discovery.configuration.TagCloudConfiguration">
         <!-- Should display the score of each tag next to it? Default: false -->
@@ -2848,6 +3111,177 @@
         </property>
     </bean>
 
+    <bean id="searchFilterNotifyRelatedItem" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="relateditem"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyLdnService" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="ldn_service"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyOrigin" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="origin"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyTarget" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="target"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyQueueStatus" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="queue_status"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyActivityStreamType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="activity_stream_type"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyCoarNotifyType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="coar_notify_type"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyNotificationType" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="notification_type"/>
+        <property name="metadataFields">
+            <list>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
+    <bean id="searchFilterNotifyRelation" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="notifyRelation"/>
+        <property name="metadataFields">
+            <list>
+                <value>datacite.relation.isReferencedBy</value>
+                <value>datacite.relation.isSupplementedBy</value>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+    </bean>
+
+    <bean id="searchFilterNotifyEndorsement" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="notifyEndorsement"/>
+        <property name="metadataFields">
+            <list>
+                <value>coar.notify.endorsedBy</value>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+    </bean>
+
+    <bean id="searchFilterNotifyReview" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="notifyReview"/>
+        <property name="metadataFields">
+            <list>
+                <value>datacite.relation.isReviewedBy</value>
+            </list>
+        </property>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="true"/>
+        <property name="pageSize" value="10"/>
+    </bean>
+    
+    <bean id="searchFilterNotifyLastStartTime" class="org.dspace.discovery.configuration.DiscoverySearchFilterFacet">
+        <property name="indexFieldName" value="queue_last_start_time"/>
+        <property name="metadataFields">
+            <list>
+                <value></value>
+            </list>
+        </property>
+        <property name="type" value="date"/>
+        <property name="facetLimit" value="5"/>
+        <property name="sortOrderSidebar" value="COUNT"/>
+        <property name="sortOrderFilterPage" value="COUNT"/>
+        <property name="isOpenByDefault" value="false"/>
+        <property name="pageSize" value="10"/>
+        <property name="exposeMinAndMaxValue" value="true"/>
+    </bean>
+
     <!--Sort properties-->
     <bean id="sortScore" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
         <property name="defaultSortOrder" value="desc"/>
@@ -2928,6 +3362,34 @@
         <property name="defaultSortOrder" value="desc"/>
     </bean>
 
+    <bean id="sortLastModifiedAsc" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
+        <property name="metadataField" value="lastModified" />
+        <property name="type" value="date" />
+        <property name="defaultSortOrder" value="asc"/>
+    </bean>
+
+    <bean id="sortQueueLastStartTimeDesc" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
+        <property name="metadataField" value="queue_last_start_time" />
+        <property name="type" value="date" />
+        <property name="defaultSortOrder" value="desc"/>
+    </bean>
+
+    <bean id="sortQueueLastStartTimeAsc" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
+        <property name="metadataField" value="queue_last_start_time" />
+        <property name="type" value="date" />
+        <property name="defaultSortOrder" value="asc"/>
+    </bean>
+
+    <bean id="sortQueueAttemptsDesc" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
+        <property name="metadataField" value="queue_attempts" />
+        <property name="defaultSortOrder" value="desc"/>
+    </bean>
+
+    <bean id="sortQueueAttemptsAsc" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
+        <property name="metadataField" value="queue_attempts" />
+        <property name="defaultSortOrder" value="asc"/>
+    </bean>
+
     <bean id="sortTitleAsc" class="org.dspace.discovery.configuration.DiscoverySortFieldConfiguration">
         <property name="metadataField" value="dc.title"/>
         <property name="defaultSortOrder" value="asc"/>
diff --git a/dspace/config/spring/api/external-openaire.xml b/dspace/config/spring/api/external-openaire.xml
index 25a23a1739..9800e42bd1 100644
--- a/dspace/config/spring/api/external-openaire.xml
+++ b/dspace/config/spring/api/external-openaire.xml
@@ -7,7 +7,7 @@
                            http://www.springframework.org/schema/util/spring-util.xsd"
        default-lazy-init="true">
 
-    <bean id="openAIRERestConnector" class="org.dspace.external.OpenAIRERestConnector">
+    <bean id="openaireRestConnector" class="org.dspace.external.OpenaireRestConnector">
         <constructor-arg value="${openaire.api.url:https://api.openaire.eu}"/>
 		<property name="tokenEnabled" value="${openaire.token.enabled:false}"/>
 		<property name="tokenServiceUrl" value="${openaire.token.url:https://aai.openaire.eu/oidc/token}"/>
@@ -15,9 +15,9 @@
 		<property name="clientSecret" value="${openaire.token.clientSecret}"/>
     </bean>
 
-	<bean class="org.dspace.external.provider.impl.OpenAIREFundingDataProvider" init-method="init">
-		<property name="sourceIdentifier" value="openAIREFunding" />
-		<property name="connector" ref="openAIRERestConnector" />
+	<bean class="org.dspace.external.provider.impl.OpenaireFundingDataProvider" init-method="init">
+		<property name="sourceIdentifier" value="openaireFunding" />
+		<property name="connector" ref="openaireRestConnector" />
 		<property name="metadataFields" ref="mapOfmetadata"/>
 		<property name="supportedEntityTypes">
 			<list>
diff --git a/dspace/config/spring/api/external-services.xml b/dspace/config/spring/api/external-services.xml
index 6d7d50c39f..e3a842efa0 100644
--- a/dspace/config/spring/api/external-services.xml
+++ b/dspace/config/spring/api/external-services.xml
@@ -69,6 +69,30 @@
     <bean id="orcidRestConnector" class="org.dspace.external.OrcidRestConnector">
         <constructor-arg value="${orcid.api-url}"/>
     </bean>
+    
+    <bean id="openaireLiveImportDataProviderByAuthor" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="openaireImportServiceByAuthor"/>
+        <property name="sourceIdentifier" value="openaire"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
+    <bean id="openaireLiveImportDataProviderByTitle" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="openaireImportServiceByTitle"/>
+        <property name="sourceIdentifier" value="openaireTitle"/>
+        <property name="recordIdMetadata" value="dc.identifier.other"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
 
     <bean id="pubmedLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
         <property name="metadataSource" ref="pubmedImportService"/>
@@ -93,7 +117,7 @@
             </list>
         </property>
     </bean>
-    
+
     <bean id="orcidPublicationDataProvider" class="org.dspace.external.provider.impl.OrcidPublicationDataProvider">
         <property name="sourceIdentifier" value="orcidWorks"/>
         <property name="fieldMapping" ref="orcidPublicationDataProviderFieldMapping"/>
@@ -164,6 +188,18 @@
         </property>
     </bean>
 
+    <bean id="doiLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
+        <property name="metadataSource" ref="DoiImportService"/>
+        <property name="sourceIdentifier" value="doi"/>
+        <property name="recordIdMetadata" value="dc.identifier.doi"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>Publication</value>
+                <value>none</value>
+            </list>
+        </property>
+    </bean>
+
     <bean id="vufindLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
         <property name="metadataSource" ref="vufindImportService"/>
         <property name="sourceIdentifier" value="vufind"/>
@@ -199,6 +235,18 @@
             </list>
         </property>
     </bean>
+    
+    <bean id="rorDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider" >
+        <property name="metadataSource" ref="rorImportService"/>
+        <property name="sourceIdentifier" value="ror"/>
+        <property name="recordIdMetadata" value="organization.identifier.ror"/>
+        <property name="displayMetadata" value="organization.legalName"/>
+        <property name="supportedEntityTypes">
+            <list>
+                <value>OrgUnit</value>
+            </list>
+        </property>
+    </bean>
 
     <bean id="wosLiveImportDataProvider" class="org.dspace.external.provider.impl.LiveImportDataProvider">
         <property name="metadataSource" ref="WosImportService"/>
diff --git a/dspace/config/spring/api/item-filters.xml b/dspace/config/spring/api/item-filters.xml
index 85f00cfcd0..84e82ef936 100644
--- a/dspace/config/spring/api/item-filters.xml
+++ b/dspace/config/spring/api/item-filters.xml
@@ -284,7 +284,7 @@
         </property>
     </bean>
 
-    <!-- An example of an OpenAIRE compliance filter based on the same rules in xoai.xml
+    <!-- An example of an Openaire compliance filter based on the same rules in xoai.xml
          some sub-statements are defined within this bean, and some are referenced from earlier definitions
     -->
     <bean id="openaire_filter" class="org.dspace.content.logic.DefaultFilter">
@@ -327,7 +327,7 @@
                                 </list>
                             </property>
                         </bean>
-                        <!-- AND the dc.relation is a valid OpenAIRE identifier
+                        <!-- AND the dc.relation is a valid Openaire identifier
                              (starts with "info:eu-repo/grantAgreement/") -->
                         <bean id="has-openaire-relation_condition"
                               class="org.dspace.content.logic.condition.MetadataValueMatchCondition">
@@ -344,4 +344,12 @@
         </property>
     </bean>
 
+    <util:map id="ldnItemFilters" key-type="java.lang.String"
+              value-type="org.dspace.content.logic.LogicalStatement">
+     	<entry key="item-is-public_condition" value-ref="item-is-public_condition"/>
+		<entry key="title-starts-with-pattern_condition" value-ref="title-starts-with-pattern_condition"/>
+		<entry key="type-equals-journal-article_condition" value-ref="type-equals-journal-article_condition"/>
+		<entry key="type-equals-dataset_condition" value-ref="type-equals-dataset_condition"/>
+		<entry key="has-one-bitstream_condition" value-ref="has-one-bitstream_condition"/>
+    </util:map>
 </beans>
diff --git a/dspace/config/spring/api/ldn-coar-notify.xml b/dspace/config/spring/api/ldn-coar-notify.xml
new file mode 100644
index 0000000000..2329925a54
--- /dev/null
+++ b/dspace/config/spring/api/ldn-coar-notify.xml
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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/ -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+        http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+        http://www.springframework.org/schema/context
+        http://www.springframework.org/schema/context/spring-context-3.0.xsd
+        http://www.springframework.org/schema/util
+        http://www.springframework.org/schema/util/spring-util-3.0.xsd"
+    default-autowire-candidates="*">
+
+    <context:annotation-config />
+    <!-- allows us to use spring annotations in beans -->
+
+    <bean class="org.dspace.app.ldn.service.impl.NotifyServiceImpl"/>
+    <bean class="org.dspace.app.ldn.service.impl.NotifyServiceInboundPatternServiceImpl"/>
+    <bean class="org.dspace.app.ldn.service.impl.LDNMessageServiceImpl"/>
+    <bean class="org.dspace.app.ldn.service.impl.NotifyPatternToTriggerImpl"/>
+
+    <bean name="ldnRouter" class="org.dspace.app.ldn.LDNRouter">
+        <property name="incomingProcessors">
+            <map key-type="java.util.Set" value-type="org.dspace.app.ldn.LDNProcessor">
+                <entry>
+                    <key>
+                        <set>
+                            <value>Announce</value>
+                            <value>coar-notify:ReviewAction</value>
+                        </set>
+                    </key>
+                    <ref bean="announceReviewAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Announce</value>
+                            <value>coar-notify:EndorsementAction</value>
+                        </set>
+                    </key>
+                    <ref bean="announceEndorsementAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Accept</value>
+                            <value>coar-notify:ReviewAction</value>
+                        </set>
+                    </key>
+                    <ref bean="acceptAckAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>TentativeReject</value>
+                            <value>coar-notify:ReviewAction</value>
+                        </set>
+                    </key>
+                    <ref bean="rejectAckAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Accept</value>
+                            <value>coar-notify:EndorsementAction</value>
+                        </set>
+                    </key>
+                    <ref bean="acceptAckAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>TentativeReject</value>
+                            <value>coar-notify:EndorsementAction</value>
+                        </set>
+                    </key>
+                    <ref bean="rejectAckAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Accept</value>
+                            <value>coar-notify:IngestAction</value>
+                        </set>
+                    </key>
+                    <ref bean="acceptAckAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>TentativeReject</value>
+                            <value>coar-notify:IngestAction</value>
+                        </set>
+                    </key>
+                    <ref bean="rejectAckAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Announce</value>
+                            <value>coar-notify:RelationshipAction</value>
+                        </set>
+                    </key>
+                    <ref bean="announceReleaseAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Offer</value>
+                            <value>coar-notify:ReviewAction</value>
+                        </set>
+                    </key>
+                    <ref bean="offerReviewAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Offer</value>
+                            <value>coar-notify:IngestAction</value>
+                        </set>
+                    </key>
+                    <ref bean="offerIngestAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Offer</value>
+                            <value>coar-notify:EndorsementAction</value>
+                        </set>
+                    </key>
+                    <ref bean="offerEndorsementAction" />
+                </entry>
+            </map>
+        </property>
+        <property name="outcomingProcessors">
+            <map key-type="java.util.Set" value-type="org.dspace.app.ldn.LDNProcessor">
+                <entry>
+                    <key>
+                        <set>
+                            <value>Offer</value>
+                            <value>coar-notify:ReviewAction</value>
+                        </set>
+                    </key>
+                    <ref bean="outcomingAnnounceReviewAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Offer</value>
+                            <value>coar-notify:EndorsementAction</value>
+                        </set>
+                    </key>
+                    <ref bean="outcomingAnnounceEndorsementAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Offer</value>
+                            <value>coar-notify:IngestAction</value>
+                        </set>
+                    </key>
+                    <ref bean="outcomingAnnounceIngestAction" />
+                </entry>
+                <entry>
+                    <key>
+                        <set>
+                            <value>Announce</value>
+                            <value>coar-notify:RelationshipAction</value>
+                        </set>
+                    </key>
+                    <ref bean="outcomingAnnounceRelationAction" />
+                </entry>
+            </map>
+        </property>
+    </bean>
+
+    <bean name="offerEndorsementAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_reviewed" />
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="offerIngestAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_reviewed" />
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="offerReviewAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_reviewed" />
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="announceReviewAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_reviewed" />
+                </bean>
+                <bean class="org.dspace.app.ldn.action.LDNCorrectionAction">
+                	<property name="qaEventTopic" value="ENRICH/MORE/REVIEW"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="announceEndorsementAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_endorsed" />
+                </bean>
+                <bean class="org.dspace.app.ldn.action.LDNCorrectionAction">
+                	<property name="qaEventTopic" value="ENRICH/MORE/ENDORSEMENT"/>
+                </bean>                
+            </list>
+        </property>
+    </bean>
+
+    <bean name="acceptAckAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_accepted" />
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="rejectAckAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_rejected" />
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="announceReleaseAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.LDNEmailAction">
+                    <property name="actionSendFilter" value="${ldn.notification.email}" />
+                    <property name="actionSendEmailTextFile" value="coar_notify_relationship" />
+                </bean>
+                <bean class="org.dspace.app.ldn.action.LDNRelationCorrectionAction">
+                	<property name="qaEventTopic" value="ENRICH/MORE/LINK"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="outcomingAnnounceReviewAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.SendLDNMessageAction"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="outcomingAnnounceRelationAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.SendLDNMessageAction"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="outcomingAnnounceEndorsementAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.SendLDNMessageAction"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean name="outcomingAnnounceIngestAction" class="org.dspace.app.ldn.processor.LDNMetadataProcessor">
+        <property name="actions">
+            <list value-type="org.dspace.app.ldn.action.LDNAction">
+                <bean class="org.dspace.app.ldn.action.SendLDNMessageAction"/>
+            </list>
+        </property>
+    </bean>
+
+    <bean class="org.dspace.coarnotify.SubmissionNotifyServiceImpl"/>
+
+    <bean class="org.dspace.coarnotify.NotifyConfigurationService">
+        <property name="patterns">
+            <map>
+                <entry key="coarnotify">
+                    <list>
+                        <ref bean="requestReview"/>
+                        <ref bean="requestEndorsement"/>
+                        <ref bean="requestIngest" />
+                    </list>
+                </entry>
+            </map>
+        </property>
+    </bean>
+
+    <bean id="requestReview" class="org.dspace.coarnotify.NotifyPattern">
+        <property name="pattern" value="request-review"/>
+        <property name="multipleRequest" value="true"/>
+    </bean>
+
+    <bean id="requestEndorsement" class="org.dspace.coarnotify.NotifyPattern">
+        <property name="pattern" value="request-endorsement"/>
+        <property name="multipleRequest" value="true"/>
+    </bean>
+
+    <bean id="requestIngest" class="org.dspace.coarnotify.NotifyPattern">
+        <property name="pattern" value="request-ingest"/>
+        <property name="multipleRequest" value="false"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/openaire-integration.xml b/dspace/config/spring/api/openaire-integration.xml
new file mode 100644
index 0000000000..8e4becddc5
--- /dev/null
+++ b/dspace/config/spring/api/openaire-integration.xml
@@ -0,0 +1,227 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+
+    <util:map id="openairePublicationsMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="openaire.title" value-ref="openaireTitleContrib"/>
+        <entry key-ref="openaire.summary" value-ref="openaireSummaryContrib"/>
+        <entry key-ref="openaire.published" value-ref="openairePublishedContrib"/>
+        <entry key-ref="openaire.doi" value-ref="openaireDoiContrib"/>
+        <entry key-ref="openaire.journal_ref" value-ref="openaireJournalContrib"/>
+        <entry key-ref="openaire.category.term" value-ref="openaireCategoryTermContrib"/>
+        <entry key-ref="openaire.author.name" value-ref="openaireAuthorContrib"/>
+        <entry key-ref="openaire.identifier.other" value-ref="openaireOtherContrib"/>
+    </util:map>
+
+
+    <bean id="openaireOtherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.identifier.other"/>
+        <property name="query" value="descendant::dri:objIdentifier"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.identifier.other" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier.other"/>
+    </bean>
+
+
+    <bean id="openaireTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.title"/>
+        <property name="query" value="descendant::oaf:result/title"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+
+    <bean id="openaireSummaryContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.summary"/>
+        <property name="query" value="descendant::oaf:result/description"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.summary" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description.abstract"/>
+    </bean>
+
+    <bean id="openairePublishedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathDateFormatMetadataContributor">
+        <property name="dateFormatFrom" value="yyyy-MM-dd'T'HH:mm:ss'Z'"/>
+        <property name="dateFormatTo" value="yyyy-MM-dd"></property>
+        <property name="field" ref="openaire.published"/>
+        <property name="query" value="descendant::oaf:result/relevantdate"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.published" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.date.issued"/>
+    </bean>
+
+    <bean id="openaireDoiContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.doi"/>
+        <property name="query" value="descendant::oaf:result/pid"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.doi" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.identifier"/>
+    </bean>
+
+    <bean id="openaireJournalContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.journal_ref"/>
+        <property name="query" value="descendant::oaf:result/collectedfrom/@name"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.journal_ref" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.source"/>
+    </bean>
+
+
+    <bean id="openaireCategoryTermContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.category.term"/>
+        <property name="query" value="descendant::oaf:result/subject"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.category.term" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean>
+
+    <bean id="openaireAuthorContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaire.author.name"/>
+        <property name="query" value="descendant::oaf:result/creator"/>
+        <property name="prefixToNamespaceMapping" ref="openairePrefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaire.author.name" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.contributor.author"/>
+    </bean>
+
+    <util:map id="openairePrefixToNamespaceMapping" map-class="java.util.HashMap"
+        key-type="java.lang.String" value-type="java.lang.String">
+        <entry key="http://www.driver-repository.eu/namespace/dri" value="dri" />
+        <entry key="http://namespace.openaire.eu/oaf" value="oaf" />
+        <entry key="http://www.w3.org/2001/XMLSchema-instance" value="xsi" />
+    </util:map>
+    
+    <!--
+    <util:map id="openaireProjectsMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+              value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <description>Defines which metadatum is mapped on which metadatum. Note that while the key must be unique it
+            only matters here for postprocessing of the value. The mapped MetadatumContributor has full control over
+            what metadatafield is generated.
+        </description>
+        <entry key-ref="openaireFunding.title" value-ref="openaireFundingTitle"/>
+        <entry key-ref="openaireFunding.acronym" value-ref="openaireFundingAcronym"/>
+        <entry key-ref="openaireFunding.code" value-ref="openaireFundingCode"/>
+        <entry key-ref="openaireFunding.startDate" value-ref="openaireFundingStartDate"/>
+        <entry key-ref="openaireFunding.endDate" value-ref="openaireFundingEndDate"/>
+        <entry key-ref="openaireFunding.funder" value-ref="openaireFundingFunder"/>
+        <entry key-ref="openaireFunding.callidentifier" value-ref="openaireFundingCall"/>
+        <entry key-ref="openaireFunding.summary" value-ref="openaireFundingSummary"/>
+        <entry key-ref="openaireFunding.oamandate" value-ref="openaireFundingOAMandate"/>
+    </util:map>
+
+    <bean id="openaireFundingTitle" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.title"/>
+        <property name="query" value=".//title"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.title"/>
+    </bean>
+    <bean id="openaireFundingAcronym" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.acronym"/>
+        <property name="query" value=".//acronym"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.acronym" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.acronym"/>
+    </bean>
+    
+    <bean id="openaireFundingCode" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.code"/>
+        <property name="query" value=".//code"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.code" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.funding.identifier"/>
+    </bean>
+
+    <bean id="openaireFundingStartDate" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.startDate"/>
+        <property name="query" value=".//startdate"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.startDate" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.funding.startDate"/>
+    </bean>
+
+    <bean id="openaireFundingEndDate" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.endDate"/>
+        <property name="query" value=".//enddate"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.endDate" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.funding.endDate"/>
+    </bean>
+    -->
+
+    <!-- <bean id="openaireFundingKeywords" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.keywords"/>
+        <property name="query" value=".//keywords"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.keywords" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.subject"/>
+    </bean> -->
+<!--
+    <bean id="openaireFundingFunder" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.funder"/>
+        <property name="query" value=".//fundingtree/funder/name"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>    
+    <bean id="openaireFunding.funder" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.funder"/>
+    </bean>
+
+    <bean id="openaireFundingCall" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.callidentifier"/>
+        <property name="query" value=".//callidentifier"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.callidentifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.fundingParent"/>
+    </bean>
+
+    <bean id="openaireFundingOAMandate" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.oamandate"/>
+        <property name="query" value=".//oamandatepublications"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.oamandate" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="oairecerif.oamandate"/>
+    </bean>
+
+    <bean id="openaireFundingSummary" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
+        <property name="field" ref="openaireFunding.summary"/>
+        <property name="query" value=".//summary"/>
+        <property name="prefixToNamespaceMapping" ref="prefixToNamespaceMapping"/>
+    </bean>
+    <bean id="openaireFunding.summary" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.description"/>
+    </bean>
+-->
+
+    <bean class="java.lang.Integer" id="maxRetry">
+        <constructor-arg value="3"/>
+    </bean>
+
+</beans>
\ No newline at end of file
diff --git a/dspace/config/spring/api/orcid-services.xml b/dspace/config/spring/api/orcid-services.xml
index e5fb002c31..8286a16a88 100644
--- a/dspace/config/spring/api/orcid-services.xml
+++ b/dspace/config/spring/api/orcid-services.xml
@@ -38,17 +38,17 @@
     <bean class="org.dspace.orcid.model.validator.impl.OrcidValidatorImpl" />
     
     <bean class="org.dspace.orcid.service.impl.OrcidEntityFactoryServiceImpl">
-    	<constructor-arg name="itemService" ref="org.dspace.content.ItemServiceImpl" />
-    	<constructor-arg name="entityFactories">
-    		<list>
-    			<bean class="org.dspace.orcid.model.factory.impl.OrcidWorkFactory">
-    				<property name="fieldMapping" ref="orcidWorkFactoryFieldMapping" />
-    			</bean>
-    			<bean class="org.dspace.orcid.model.factory.impl.OrcidFundingFactory">
-    				<property name="fieldMapping" ref="orcidFundingFactoryFieldMapping" />
-    			</bean>
-    		</list>
-   		</constructor-arg>
+        <constructor-arg name="entityFactories">
+            <list>
+                <bean class="org.dspace.orcid.model.factory.impl.OrcidWorkFactory">
+                    <property name="fieldMapping" ref="orcidWorkFactoryFieldMapping" />
+                </bean>
+                <bean class="org.dspace.orcid.model.factory.impl.OrcidFundingFactory">
+                    <property name="fieldMapping" ref="orcidFundingFactoryFieldMapping" />
+                </bean>
+            </list>
+        </constructor-arg>
+        <constructor-arg name="itemService" ref="org.dspace.content.ItemServiceImpl" />
 	</bean>
 	
 	<bean id="orcidWorkFactoryFieldMapping" class="org.dspace.orcid.model.OrcidWorkFieldMapping" >
diff --git a/dspace/config/spring/api/qaevents.xml b/dspace/config/spring/api/qaevents.xml
new file mode 100644
index 0000000000..74b72af61b
--- /dev/null
+++ b/dspace/config/spring/api/qaevents.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+           http://www.springframework.org/schema/util
+           http://www.springframework.org/schema/util/spring-util.xsd">
+
+    <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
+
+    <bean id="qaEventsDao" class="org.dspace.qaevent.dao.impl.QAEventsDAOImpl" />
+    
+    <bean id="openaireBrokerClient" class="eu.dnetlib.broker.BrokerClient" />
+    
+    <bean id="openaireClientFactory" class="org.dspace.qaevent.service.impl.OpenaireClientFactoryImpl" />
+ 
+     <bean id="org.dspace.qaevent.service.QAEventActionService" class="org.dspace.qaevent.service.impl.QAEventActionServiceImpl">
+        <property name="topicsToActions">
+            <map>
+            	<!--The key are the TOPIC, the value must be a valid implementation of the org.dspace.qaevent.QAEventAction interface -->
+               <entry value-ref="ProjectLinkedEntityAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MORE_PROJECT"/></key>
+               </entry>
+               <entry value-ref="ProjectLinkedEntityAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_PROJECT"/></key>
+			   </entry>
+               <entry value-ref="AbstractMetadataAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_ABSTRACT"/></key>
+               </entry>
+               <entry value-ref="AddReviewMetadataAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MORE_REVIEW"/></key>
+               </entry>
+               <entry value-ref="AddEndorsedMetadataAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MORE_ENDORSEMENT"/></key>
+               </entry>
+               <entry value-ref="PIDMetadataAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MORE_PID"/></key>
+               </entry>
+               <entry value-ref="PIDMetadataAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MISSING_PID"/></key>
+               </entry>
+               <entry value-ref="RelationMetadataAction">
+                  <key><util:constant static-field="org.dspace.qaevent.QANotifyPatterns.TOPIC_ENRICH_MORE_LINK"/></key>
+               </entry>
+               <entry key="REQUEST/WITHDRAWN" value-ref="WithdrawnRequestAction" />
+               <entry key="REQUEST/REINSTATE" value-ref="ReinstateRequestAction" />
+            </map>
+        </property>
+     </bean>
+     
+     <!-- This action bind the publication to the project, otherwise if the project has not been specified, 
+      create a new project with the available data and then bind it to the publication -->
+     <bean id="ProjectLinkedEntityAction" class="org.dspace.qaevent.action.QAEntityOpenaireMetadataAction">
+        <!-- which metadata will hold the relation between the publication and the project -->
+        <property name="relation" value="isPublicationOfProject" />
+        <!-- the type of local entity used to store the project details -->
+        <property name="entityType" value="Project" />
+        <property name="entityMetadata">
+            <map>
+	<!--The key are the json path of qa message, the value is the metadata in 
+		the linked entity where the information should be stored -->
+               <!--  <entry key="acronym" value="" /> -->
+               <entry key="code" value="dc.identifier" />
+               <!--  <entry key="funder" value="oairecerif.funder" /> -->
+	           <entry key="title" value="dc.title" />
+	           <!--  <entry key="fundingProgram" value="oairecerif.fundingProgram" /> -->
+	           <!--  <entry key="openaireId" value="oairecerif.funding.identifier" /> -->
+            </map>
+        </property>    
+     </bean>
+     <bean id="AbstractMetadataAction" class="org.dspace.qaevent.action.QAOpenaireSimpleMetadataAction">
+        <property name="metadata" value="dc.description.abstract" />
+     </bean>
+     <bean id="AddReviewMetadataAction" class="org.dspace.qaevent.action.QANotifySimpleMetadataAction">
+        <property name="metadata" value="datacite.relation.isReviewedBy" />
+     </bean>
+
+     <bean id="AddEndorsedMetadataAction" class="org.dspace.qaevent.action.QANotifySimpleMetadataAction">
+        <property name="metadata" value="coar.notify.endorsedBy"/>
+     </bean>
+     <!-- Add a new identifier to the given item, using the defined types mapping -->
+     <bean id="PIDMetadataAction" class="org.dspace.qaevent.action.QAOpenaireMetadataMapAction">
+	     <property name="types">
+	         <map>
+	<!--The key are the type of identifier (or subject) reported in the message, the value is the metadata in 
+        the linked entity where the information should be stored -->
+               <entry key="default" value="dc.identifier.other" />
+               <!-- <entry key="doi" value="dc.identifier.doi" />
+               <entry key="pmid" value="dc.identifier.pmid" /> -->
+	         </map>
+	     </property>    
+     </bean>
+
+     <bean id="RelationMetadataAction" class="org.dspace.qaevent.action.QANotifyMetadataMapAction">
+	     <property name="types">
+	         <map>
+               <entry key="default" value="datacite.relation.isReferencedBy" />
+               <entry key="http://purl.org/vocab/frbr/core#supplement" value="datacite.relation.isSupplementedBy" />
+	         </map>
+	     </property>
+     </bean>
+
+    <bean id="submitterQASecurity" class="org.dspace.qaevent.security.UserBasedFilterQASecurity">
+        <property name="filterTemplate">
+            <!-- we need to escape the { as it as a special meaning for the message format -->
+            <!-- argument {0} will be replaced with the uuid of the loggedin user -->
+            <value>'{'!join from=search.resourceid to=resource_uuid fromIndex=${solr.multicorePrefix}search}submitter_authority:{0}</value>
+        </property>
+    </bean>
+    <!--
+        To configure rules to automatic process specific qaevent you must provide a qaAutomaticProcessingMap
+        where the keys are the qaevent source provider name and the value is a reference to a
+        AutomaticProcessingEvaluation implementation. Below you can find an example of configuration defining
+        some thresholds rules for the coar-notify generated QAEvent to be approved, rejected and ignored
+     -->
+    <!--
+    <util:map id="qaAutomaticProcessingMap">
+        <entry key="coar-notify" value-ref="qaScoreEvaluation"/>
+    </util:map>
+
+    <bean id="qaScoreEvaluation" class="org.dspace.qaevent.QAScoreAutomaticProcessingEvaluation">
+        <property name="scoreToReject" value="0.3" />
+        <property name="scoreToIgnore" value="0.5" />
+        <property name="scoreToApprove" value="0.8" />
+        <property name="itemFilterToReject" ref="simple-demo_filter" />
+        <property name="itemFilterToIgnore" ref="simple-demo_filter" />
+        <property name="itemFilterToApprove" ref="simple-demo_filter" />
+    </bean>
+	-->
+
+    <bean id="WithdrawnRequestAction" class="org.dspace.qaevent.action.QAWithdrawnRequestAction" />
+
+    <bean id="ReinstateRequestAction" class="org.dspace.qaevent.action.QAReinstateRequestAction" />
+
+    <bean id="org.dspace.qaevent.service.QAEventSecurityService" class="org.dspace.qaevent.service.impl.QAEventSecurityServiceImpl">
+        <property name="defaultSecurity">
+            <bean class="org.dspace.qaevent.security.AdministratorsOnlyQASecurity" />
+        </property>
+        <property name="qaSecurityConfiguration">
+            <map>
+                <entry key="DSpaceUsers" value-ref="submitterWithdrawnReinstateQASecurity" />
+                <entry key="coar-notify" value-ref="submitterQASecurity" />
+            </map>
+        </property>
+    </bean>
+
+    <bean id="submitterWithdrawnReinstateQASecurity" class="org.dspace.qaevent.security.UserBasedFilterQASecurity">
+        <property name="filterTemplate">
+            <!-- we need to escape the { as it as a special meaning for the message format -->
+            <!-- argument {0} will be replaced with the uuid of the loggedin user -->
+            <value>original_id:{0}</value>
+        </property>
+    </bean>
+
+ </beans>
diff --git a/dspace/config/spring/api/ror-integration.xml b/dspace/config/spring/api/ror-integration.xml
new file mode 100644
index 0000000000..ff55461205
--- /dev/null
+++ b/dspace/config/spring/api/ror-integration.xml
@@ -0,0 +1,111 @@
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
+       default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
+
+    <context:annotation-config/>
+    <!-- allows us to use spring annotations in beans -->
+    
+     <util:map id="rorMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig" value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <entry key-ref="ror.title" value-ref="rorTitleContrib"/>
+        <entry key-ref="ror.identifier" value-ref="rorIdentifierContrib"/>
+        <entry key-ref="ror.links" value-ref="rorLinksContrib"/>
+        <entry key-ref="ror.types" value-ref="rorTypesContrib"/>
+        <entry key-ref="ror.acronym" value-ref="rorAcronymContrib"/>
+        <entry key-ref="ror.country" value-ref="rorCountryContrib"/>
+        <entry key-ref="ror.established" value-ref="rorEstablishedContrib"/>
+        <entry key-ref="ror.fundref" value-ref="rorFundRefContrib"/>
+        <entry key-ref="ror.isni" value-ref="rorISNIContrib"/>
+        <entry key-ref="ror.parent" value-ref="rorParentContrib"/>
+    </util:map>
+
+    <bean id="rorTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.title"/>
+        <property name="query" value="/name"/>
+    </bean>
+    <bean id="ror.title" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.legalName"/>
+    </bean>
+
+    <bean id="rorIdentifierContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.identifier"/>
+        <property name="query" value="/id"/>
+    </bean>
+    <bean id="ror.identifier" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.identifier.ror"/>
+    </bean>
+
+    <bean id="rorAcronymContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.acronym"/>
+        <property name="query" value="/acronyms"/>
+    </bean>
+    <bean id="ror.acronym" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.alternateName"/>
+    </bean>
+
+    <bean id="rorLinksContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.links"/>
+        <property name="query" value="/links"/>
+    </bean>
+    <bean id="ror.links" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.url"/>
+    </bean>
+
+    <bean id="rorTypesContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.types"/>
+        <property name="query" value="/types"/>
+    </bean>
+    <bean id="ror.types" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="dc.type"/>
+    </bean>
+
+    <bean id="rorCountryContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.country"/>
+        <property name="query" value="/country/country_code"/>
+    </bean>
+    <bean id="ror.country" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.address.addressCountry"/>
+    </bean>
+
+    <bean id="rorEstablishedContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.established"/>
+        <property name="query" value="/established"/>
+    </bean>
+    <bean id="ror.established" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.foundingDate"/>
+    </bean>
+
+    <bean id="rorFundRefContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.fundref"/>
+        <property name="query" value="/external_ids/FundRef/all"/>
+    </bean>
+    <bean id="ror.fundref" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.identifier.crossrefid"/>
+    </bean>
+
+    <bean id="rorISNIContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
+        <property name="field" ref="ror.isni"/>
+        <property name="query" value="/external_ids/ISNI/all"/>
+    </bean>
+    <bean id="ror.isni" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.identifier.isni"/>
+    </bean>
+
+    <bean id="rorParentContrib" class="org.dspace.importer.external.metadatamapping.contributor.RorParentOrgUnitMetadataContributor">
+        <property name="field" ref="ror.parent"/>
+        <property name="query" value="/relationships"/>
+        <property name="typeField" value="type"/>
+        <property name="labelField" value="label"/>
+        <property name="parentType" value="Parent"/>
+    </bean>
+    
+    <bean id="ror.parent" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.parentOrganization"/>
+    </bean>
+    
+</beans>
diff --git a/dspace/config/spring/api/scripts.xml b/dspace/config/spring/api/scripts.xml
index 56eacbfff2..4a372d1c6d 100644
--- a/dspace/config/spring/api/scripts.xml
+++ b/dspace/config/spring/api/scripts.xml
@@ -3,6 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
            http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+    <bean id="import-openaire-events" class="org.dspace.qaevent.script.OpenaireEventsImportCliScriptConfiguration" primary="true">
+        <property name="description" value="Import new Openaire quality assurance broker events"/>
+        <property name="dspaceRunnableClass" value="org.dspace.qaevent.script.OpenaireEventsImportCli"/>
+    </bean>
+
     <bean id="index-discovery" class="org.dspace.discovery.IndexDiscoveryScriptConfiguration">
         <property name="description" value="Update Discovery Solr Search Index"/>
         <property name="dspaceRunnableClass" value="org.dspace.discovery.IndexClient"/>
@@ -91,4 +97,9 @@
         <property name="dspaceRunnableClass" value="org.dspace.app.bulkaccesscontrol.BulkAccessControlCli"/>
     </bean>
 
+    <bean id="import-openaire-suggestions" class="org.dspace.app.suggestion.openaire.PublicationLoaderCliScriptConfiguration">
+       <property name="description" value="Imports suggestions from OpenAIRE for publication claim"/>
+       <property name="dspaceRunnableClass" value="org.dspace.app.suggestion.openaire.PublicationLoaderRunnableCli"/>
+    </bean>
+
 </beans>
diff --git a/dspace/config/spring/api/solr-services.xml b/dspace/config/spring/api/solr-services.xml
index 80e9449d4c..8f7bd4867a 100644
--- a/dspace/config/spring/api/solr-services.xml
+++ b/dspace/config/spring/api/solr-services.xml
@@ -12,9 +12,9 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/beans/spring-beans.xsd
            http://www.springframework.org/schema/context
-           http://www.springframework.org/schema/context/spring-context-2.5.xsd"
+           http://www.springframework.org/schema/context/spring-context.xsd"
        default-autowire-candidates="*Service,*DAO,javax.sql.DataSource">
 
     <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
@@ -25,13 +25,31 @@
 
     <alias name="org.dspace.discovery.SearchService" alias="org.dspace.discovery.IndexingService"/>
 
-    <!--<bean class="org.dspace.discovery.SolrServiceIndexOutputPlugin" id="solrServiceIndexOutputPlugin"/>-->
+    <bean id="solrLoggerService"
+          class="org.dspace.statistics.SolrLoggerServiceImpl"
+          lazy-init="true">
+        <description>Store and access DSpace usage statistics records in Solr.</description>
+    </bean>
 
-    <!-- Statistics services are both lazy loaded (by name), as you are likely just using ONE of them and not both -->
-    <bean id="solrLoggerService" class="org.dspace.statistics.SolrLoggerServiceImpl" lazy-init="true"/>
+    <bean id='SolrStatisticsCore'
+	  class='org.dspace.statistics.SolrStatisticsCore'
+	  autowire-candidate='true'>
+        <description>
+          Store and access DSpace usage statistics records in Solr.
+        </description>
+    </bean>
 
-    <bean class="org.dspace.statistics.SolrStatisticsCore" autowire-candidate="true"/>
+    <bean id='HttpSolrClientFactory'
+          class='org.dspace.statistics.HttpSolrClientFactory'>
+        <description>HTTP connection to a Solr instance.</description>
+    </bean>
+    
+    <!-- quality assurance broker service -->
+    <bean id="org.dspace.qaevent.service.QAEventService" class="org.dspace.qaevent.service.impl.QAEventServiceImpl" />
     
     <bean class="org.dspace.statistics.GeoIpService" autowire-candidate="true"/>
-
+    
+    <!-- suggestion service for solr providers -->     
+    <bean id="org.dspace.app.suggestion.SolrSuggestionStorageService" class="org.dspace.app.suggestion.SolrSuggestionStorageServiceImpl" />
+   
 </beans>
diff --git a/dspace/config/spring/api/subscriptions_email_configuration.xml b/dspace/config/spring/api/subscriptions_email_configuration.xml
index 2d52dfc270..0eaf2d97d9 100644
--- a/dspace/config/spring/api/subscriptions_email_configuration.xml
+++ b/dspace/config/spring/api/subscriptions_email_configuration.xml
@@ -17,15 +17,6 @@
            http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean class="org.dspace.subscriptions.SubscriptionEmailNotificationServiceImpl">
-        <constructor-arg name="subscriptionType2generators">
-            <!-- The keys of the map used by the script "subscription-send"
-             org.dspace.subscriptions.SubscriptionEmailNotification
-             currently we support only 'content' type.   
-              --> 
-            <map>
-                <entry key="content" value-ref="contentNotifyGenerator"/>
-            </map>
-        </constructor-arg>
         <constructor-arg name="contentUpdates">
             <!-- Currently we support subscriptions ONLY for Community & Collection -->
             <map>
@@ -33,6 +24,15 @@
                 <entry key="collection" value-ref="collectionUpdates"/>
             </map>
         </constructor-arg>
+        <constructor-arg name="subscriptionType2generators">
+            <!-- The keys of the map used by the script "subscription-send"
+             org.dspace.subscriptions.SubscriptionEmailNotification
+             currently we support only 'content' type.
+              -->
+            <map>
+                <entry key="content" value-ref="contentNotifyGenerator"/>
+            </map>
+        </constructor-arg>
     </bean>
 
     <bean id="contentNotifyGenerator" class="org.dspace.subscriptions.ContentGenerator" >
diff --git a/dspace/config/spring/api/suggestions.xml b/dspace/config/spring/api/suggestions.xml
new file mode 100644
index 0000000000..85e7949809
--- /dev/null
+++ b/dspace/config/spring/api/suggestions.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:context="http://www.springframework.org/schema/context"
+    xmlns:util="http://www.springframework.org/schema/util"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans
+           http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+           http://www.springframework.org/schema/context
+           http://www.springframework.org/schema/context/spring-context-2.5.xsd
+           http://www.springframework.org/schema/util 
+           http://www.springframework.org/schema/util/spring-util-3.0.xsd">
+
+    <context:annotation-config /> <!-- allows us to use spring annotations in beans -->
+
+    <!-- This is defined in the solr-services.xml
+	<bean id="org.dspace.app.nbevent.service.NBEventService" 
+	   class="org.dspace.app.nbevent.service.impl.NBEventServiceImpl" /> -->
+ 
+	 <util:map id="suggestionProviders" map-class="java.util.HashMap" 
+	          key-type="java.lang.String" value-type="org.dspace.app.suggestion.SuggestionProvider">
+	    <entry key="openaire" value-ref="OpenairePublicationLoader" />
+	</util:map>
+
+    <bean id="OpenairePublicationLoader" class="org.dspace.app.suggestion.openaire.PublicationLoader">
+        <property name="sourceName" value="openaire" />
+        <property name="primaryProvider" ref="openaireLiveImportDataProviderByAuthor" />
+        <property name="otherProviders">
+            <list>
+                <ref bean="openaireLiveImportDataProviderByTitle"/>
+            </list>
+        </property>
+        <property name="names">
+            <list>
+                <value>dc.title</value>
+            </list>
+        </property>
+        <property name="pipeline">
+            <list>
+                <bean
+                    class="org.dspace.app.suggestion.openaire.AuthorNamesScorer">
+                    <property name="contributorMetadata">
+                        <list>
+                            <value>dc.contributor.author</value>
+                        </list>
+                    </property>
+                    <property name="names">
+                        <list>
+                            <value>dc.title</value>
+                        </list>
+                    </property>
+                </bean>
+                <bean
+                    class="org.dspace.app.suggestion.openaire.DateScorer">
+                    <property name="birthDateMetadata" value="person.birthDate" />
+                    <property name="publicationDateMetadata" value="dc.date.issued" />
+                </bean>    
+            </list>
+        </property>
+    </bean>
+
+ </beans>
diff --git a/dspace/config/spring/api/virtual-metadata.xml.openaire4 b/dspace/config/spring/api/virtual-metadata.xml.openaire4
index bbdae0e759..da0bd4dd5c 100644
--- a/dspace/config/spring/api/virtual-metadata.xml.openaire4
+++ b/dspace/config/spring/api/virtual-metadata.xml.openaire4
@@ -167,6 +167,7 @@
         <entry key="oaire.awardTitle" value-ref="publicationProject_name"/>
         <entry key="project.funder.name" value-ref="publicationProject_projectFunderName_related"/>
         <entry key="project.funder.identifier" value-ref="publicationProject_projectFunderId_related"/>
+        <entry key="project.funder.rorIdentifier" value-ref="publicationProject_projectRorId_related"/>
     </util:map>
     <bean class="org.dspace.content.virtual.Collected" id="publicationProject_name">
         <property name="fields">
@@ -200,17 +201,21 @@
     <!-- This Related bean defines a relationship type that will be used on a publication (from a project).
          -->
     <bean class="org.dspace.content.virtual.Related" id="publicationProject_projectFunderName_related">
-        <property name="relationshipTypeString" value="isProjectOfFundingAgency"/>
-        <property name="place" value="1"/>
+        <property name="relationshipTypeString" value="isFundingAgencyOfProject"/>
         <property name="virtualMetadataConfiguration" ref="projectOrgUnit_orgName"/>
     </bean>
 
     <bean class="org.dspace.content.virtual.Related" id="publicationProject_projectFunderId_related">
-        <property name="relationshipTypeString" value="isProjectOfFundingAgency"/>
-        <property name="place" value="1"/>
+        <property name="relationshipTypeString" value="isFundingAgencyOfProject"/>
         <property name="virtualMetadataConfiguration" ref="projectOrgUnit_orgId"/>
     </bean>
-    
+
+    <bean class="org.dspace.content.virtual.Related" id="publicationProject_projectRorId_related">
+        <property name="relationshipTypeString" value="isProjectOfFundingAgency"/>
+        <property name="place" value="0"/>
+        <property name="virtualMetadataConfiguration" ref="projectOrgUnit_rorId"/>
+    </bean>
+
     <!-- Config like this will tell our VirtualMetadataPopulator to include the virtual metadata field
      'project.funder.*' on the appropriate item with the values defined in the value-ref.
       This value-ref should be a bean of type VirtualMetadataConfiguration -->
@@ -233,4 +238,11 @@
             </util:list>
         </property>
     </bean>
+    <bean class="org.dspace.content.virtual.Collected" id="projectOrgUnit_rorId">
+        <property name="fields">
+            <util:list>
+                <value>organization.identifier.ror</value>
+            </util:list>
+        </property>
+    </bean>
 </beans>
diff --git a/dspace/config/spring/api/wos-integration.xml b/dspace/config/spring/api/wos-integration.xml
index 17bd53c04a..ba90363a2e 100644
--- a/dspace/config/spring/api/wos-integration.xml
+++ b/dspace/config/spring/api/wos-integration.xml
@@ -35,6 +35,7 @@
         <entry key-ref="wos.fullName" value-ref="wosFullNameContrib"/>
         <entry key-ref="wos.subject" value-ref="wosSubjectContrib"/>
         <entry key-ref="wos.orcid" value-ref="wosOrcidContrib"/>
+        <entry key-ref="wos.publisher" value-ref="wosPublisherContrib"/>
         <entry key-ref="wos.contributorEditor" value-ref="wosContributorEditorContrib"/>
         <entry key-ref="wos.wosId" value-ref="wosIdContrib"/>
         <entry key-ref="wos.rid" value-ref="wosRidContrib"/>
diff --git a/dspace/config/spring/rest/scripts.xml b/dspace/config/spring/rest/scripts.xml
index eda8c579a8..e6a667697d 100644
--- a/dspace/config/spring/rest/scripts.xml
+++ b/dspace/config/spring/rest/scripts.xml
@@ -8,6 +8,11 @@
 
     <!-- This primary attribute is present so that we can assure that in the REST layer we'll always use this
         bean if it is present-->
+    <bean id="import-openaire-events" class="org.dspace.qaevent.script.OpenaireEventsImportScriptConfiguration" primary="true">
+        <property name="description" value="Import new openaire quality assurance broker events"/>
+        <property name="dspaceRunnableClass" value="org.dspace.qaevent.script.OpenaireEventsImport"/>
+     </bean>
+
     <bean id="metadata-import" class="org.dspace.app.bulkedit.MetadataImportScriptConfiguration" primary="true">
         <property name="description" value="Import metadata after batch editing" />
         <property name="dspaceRunnableClass" value="org.dspace.app.bulkedit.MetadataImport"/>
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index 0b1e049c81..a93195c91f 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -163,7 +163,7 @@
                     <input-type value-pairs-name="common_types">dropdown</input-type>
                     <hint>Select the type of content of the item.
                     </hint>
-                    <required></required>
+                    <required>You must choose at least one type.</required>
                 </field>
             </row>
             <row>
@@ -366,7 +366,7 @@
                     <hint>Select the type(s) of content of the item. To select more than one value in the list, you may
                         have to hold down the "CTRL" or "Shift" key.
                     </hint>
-                    <required></required>
+                    <required>You must choose at least one type.</required>
                 </field>
             </row>
             <row>
@@ -531,18 +531,18 @@
             </row>
             <row>
                 <relation-field>
-                    <relationship-type>isProjectOfOrgUnit</relationship-type>
+                    <relationship-type>isOrgUnitOfProject</relationship-type>
                     <search-configuration>orgunit</search-configuration>
                     <repeatable>false</repeatable>
                     <label>Organization</label>
                     <hint>Enter the organization's name</hint>
                     <linked-metadata-field>
-                        <dc-schema>project</dc-schema>
-                        <dc-element>funder</dc-element>
-                        <dc-qualifier>name</dc-qualifier>
+                        <dc-schema>dc</dc-schema>
+                        <dc-element>contributor</dc-element>
+                        <dc-qualifier>other</dc-qualifier>
                         <input-type>onebox</input-type>
                     </linked-metadata-field>
-                    <externalsources/>
+                    <externalsources>ror</externalsources>
                 </relation-field>
             </row>
             <row>
@@ -819,9 +819,9 @@
 
         </form>
 
-        <!-- OpenAIRE specific forms -->
+        <!-- Openaire specific forms -->
 
-        <form name="openAIREPublicationPageoneForm">
+        <form name="openairePublicationPageoneForm">
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
@@ -1041,7 +1041,7 @@
                     <hint>Select the type(s) of content of the item. To select more than one value in the list, you may
                         have to hold down the "CTRL" or "Shift" key.
                     </hint>
-                    <required></required>
+                    <required>You must choose at least one type.</required>
                 </field>
             </row>
             <row>
@@ -1071,7 +1071,7 @@
             </row>
         </form>
 
-        <form name="openAIREPublicationPagetwoForm">
+        <form name="openairePublicationPagetwoForm">
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
@@ -1129,7 +1129,7 @@
                         <dc-element>relation</dc-element>
                         <input-type>onebox</input-type>
                     </linked-metadata-field>
-                    <externalsources>openAIREFunding</externalsources>
+                    <externalsources>openaireFunding</externalsources>
                     <required></required>
                 </relation-field>
             </row>
@@ -1182,7 +1182,7 @@
             </row>
         </form>
 
-        <form name="openAIREPersonForm">
+        <form name="openairePersonForm">
             <row>
                 <field>
                     <dc-schema>person</dc-schema>
@@ -1246,7 +1246,7 @@
             </row>
         </form>
 
-        <form name="openAIREProjectForm">
+        <form name="openaireProjectForm">
             <row>
                 <field>
                     <dc-schema>dc</dc-schema>
@@ -1269,7 +1269,7 @@
             <row>
                 <relation-field>
                     <relationship-type>isFundingAgencyOfProject</relationship-type>
-                    <search-configuration>openAIREFundingAgency</search-configuration>
+                    <search-configuration>openaireFundingAgency</search-configuration>
                     <repeatable>false</repeatable>
                     <name-variants>false</name-variants>
                     <label>Funding Agency</label>
@@ -1302,7 +1302,7 @@
             </row>
         </form>
 
-        <form name="openAIREOrganizationForm">
+        <form name="openaireOrganizationForm">
             <row>
                 <field>
                     <dc-schema>organization</dc-schema>
@@ -1537,7 +1537,7 @@
             </pair>
         </value-pairs>
 
-        <!-- OpenAIRE specific value pairs -->
+        <!-- Openaire specific value pairs -->
 
         <value-pairs value-pairs-name="openaire_license_types" dc-term="license">
 
@@ -1579,7 +1579,7 @@
 
         </value-pairs>
 
-        <!-- OpenAIRE document types
+        <!-- Openaire document types
              https://openaire-guidelines-for-literature-repository-managers.readthedocs.io/en/v4.0.0/field_publicationtype.html
              Based on COAR Vocabularies -> Controlled Vocabulary for Resource Type Genres (Version 2.0):
              http://vocabularies.coar-repositories.org/documentation/resource_types/
diff --git a/dspace/modules/additions/pom.xml b/dspace/modules/additions/pom.xml
index 7e60e982ec..f2ff1f5bfb 100644
--- a/dspace/modules/additions/pom.xml
+++ b/dspace/modules/additions/pom.xml
@@ -17,7 +17,7 @@
    <parent>
       <groupId>org.dspace</groupId>
       <artifactId>modules</artifactId>
-      <version>7.6.2-SNAPSHOT</version>
+      <version>9.0-SNAPSHOT</version>
       <relativePath>..</relativePath>
    </parent>
 
@@ -109,7 +109,7 @@
                      <systemPropertyVariables>
                         <!-- Specify the dspace.dir to use for test environment -->
                         <!-- This system property is loaded by AbstractDSpaceTest to initialize the test environment -->
-                        <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                        <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>
@@ -177,7 +177,7 @@
                   <configuration>
                      <systemPropertyVariables>
                         <!-- Specify the dspace.dir to use for test environment -->
-                        <dspace.dir>${agnostic.build.dir}/testing/dspace/</dspace.dir>
+                        <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>
@@ -223,8 +223,8 @@
           <artifactId>dspace-services</artifactId>
       </dependency>
       <dependency>
-         <groupId>javax.servlet</groupId>
-         <artifactId>javax.servlet-api</artifactId>
+         <groupId>jakarta.servlet</groupId>
+         <artifactId>jakarta.servlet-api</artifactId>
          <scope>provided</scope>
       </dependency>
       <dependency>
@@ -250,6 +250,13 @@
          <artifactId>solr-core</artifactId>
          <version>${solr.client.version}</version>
          <scope>test</scope>
+         <exclusions>
+            <!-- Later version provided by Hibernate -->
+            <exclusion>
+               <groupId>org.antlr</groupId>
+               <artifactId>antlr4-runtime</artifactId>
+            </exclusion>
+         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.apache.lucene</groupId>
diff --git a/dspace/modules/pom.xml b/dspace/modules/pom.xml
index 5819158505..f5e36a3481 100644
--- a/dspace/modules/pom.xml
+++ b/dspace/modules/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -39,20 +39,6 @@
          compiling of the corresponding source module.
     -->
     <profiles>
-        <!-- As this old REST API module is deprecated, it only builds if you activate it via -Pdspace-rest -->
-        <profile>
-            <id>dspace-rest</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-                <!-- Enable if we are doing a release (-Drelease), to tag/release this optional module -->
-                <property>
-                    <name>release</name>
-                </property>
-            </activation>
-            <modules>
-                <module>rest</module>
-            </modules>
-        </profile>
         <profile>
             <id>dspace-server-webapp</id>
             <activation>
@@ -64,5 +50,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/modules/rest/pom.xml b/dspace/modules/rest/pom.xml
deleted file mode 100644
index 7797346c51..0000000000
--- a/dspace/modules/rest/pom.xml
+++ /dev/null
@@ -1,123 +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>rest</artifactId>
-    <packaging>war</packaging>
-    <name>DSpace (Deprecated) REST Webapp :: Local Customizations</name>
-    <description>
-        This project allows you to overlay your own local REST customizations
-        on top of the deprecated REST API provided with DSpace. NOTE: This REST API is DEPRECATED. Please consider
-        using the REST API in dspace-server-webapp instead.
-    </description>
-
-    <parent>
-        <groupId>org.dspace</groupId>
-        <artifactId>modules</artifactId>
-        <version>7.6.2-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>
-                    <overlays>
-                        <!--
-                           the priority of overlays is determined here
-                           1.) default: anything in the current project has highest
-                           2.) anything defined here has precedence in the order defined
-                           3.) any war found transitively in the dependencies will be applied
-                           next. the order is unpredictable.
-                        -->
-                        <overlay>
-                            <groupId>org.dspace</groupId>
-                            <artifactId>dspace-rest</artifactId>
-                        </overlay>
-                    </overlays>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                    </execution>
-                </executions>
-            </plugin>
-
-        </plugins>
-    </build>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.dspace.modules</groupId>
-            <artifactId>additions</artifactId>
-        </dependency>
-
-        <!-- DSpace REST Webapp -->
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-rest</artifactId>
-            <version>${project.version}</version>
-            <type>war</type>
-        </dependency>
-        <dependency>
-            <groupId>org.dspace</groupId>
-            <artifactId>dspace-rest</artifactId>
-            <version>${project.version}</version>
-            <type>jar</type>
-            <classifier>classes</classifier>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/dspace/modules/server-boot/pom.xml b/dspace/modules/server-boot/pom.xml
new file mode 100644
index 0000000000..4a8fd8f966
--- /dev/null
+++ b/dspace/modules/server-boot/pom.xml
@@ -0,0 +1,123 @@
+<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>server-boot</artifactId>
+    <name>DSpace Server Webapp:: Executable JAR</name>
+
+    <!--
+      A Parent POM that Maven inherits DSpace Default
+      POM attributes from.
+    -->
+    <parent>
+        <artifactId>modules</artifactId>
+        <groupId>org.dspace</groupId>
+        <version>9.0-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+
+    <properties>
+        <!-- This is the path to the root [dspace-src] directory. -->
+        <root.basedir>${basedir}/../../..</root.basedir>
+    </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>
+            <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>
+
+</project>
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 0000000000..efc15ef555
--- /dev/null
+++ b/dspace/modules/server-boot/src/main/java/org/dspace/app/ServerBootApplication.java
@@ -0,0 +1,33 @@
+/**
+ * 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 run using an
+ * embedded application server.
+ * 
+ * @author Luca Giamminonni (luca.giamminonni at 4science.it)
+ *
+ */
+@SuppressWarnings({ "checkstyle:hideutilityclassconstructor" })
+@SpringBootApplication(scanBasePackageClasses = WebApplication.class)
+public class 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
index 564f815937..f9b1006e74 100644
--- a/dspace/modules/server/pom.xml
+++ b/dspace/modules/server/pom.xml
@@ -3,21 +3,16 @@
     <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>
-
+    <name>DSpace Server Webapp:: Tomcat deployable WAR</name>
     <parent>
         <artifactId>modules</artifactId>
         <groupId>org.dspace</groupId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 
     <properties>
+        <dspace.version>8.0-SNAPSHOT</dspace.version>
         <!-- This is the path to the root [dspace-src] directory. -->
         <root.basedir>${basedir}/../../..</root.basedir>
     </properties>
@@ -73,6 +68,26 @@ just adding new jar in the classloader</description>
                     </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
@@ -155,7 +170,7 @@ just adding new jar in the classloader</description>
                                 <!-- 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>
+                                <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>
@@ -224,7 +239,7 @@ just adding new jar in the classloader</description>
                             <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>
+                                <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>
@@ -255,12 +270,12 @@ just adding new jar in the classloader</description>
         <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>
+            <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>
@@ -320,6 +335,13 @@ just adding new jar in the classloader</description>
             <artifactId>solr-core</artifactId>
             <version>${solr.client.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <!-- Later version provided by Hibernate -->
+                <exclusion>
+                    <groupId>org.antlr</groupId>
+                    <artifactId>antlr4-runtime</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.lucene</groupId>
diff --git a/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java b/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java
new file mode 100644
index 0000000000..bc8e4f8a78
--- /dev/null
+++ b/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java
@@ -0,0 +1,52 @@
+/**
+ * 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;
+
+/**
+ * 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 ServerApplication extends SpringBootServletInitializer {
+
+    /**
+     * 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 some builder.
+     * @return the builder, configured with DSpace sources and initializers.
+     */
+    @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(ServerApplication.class)
+                          .initializers(new DSpaceKernelInitializer(), new DSpaceConfigurationInitializer());
+    }
+}
diff --git a/dspace/pom.xml b/dspace/pom.xml
index f9dc6126e6..1647314781 100644
--- a/dspace/pom.xml
+++ b/dspace/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>org.dspace</groupId>
         <artifactId>dspace-parent</artifactId>
-        <version>7.6.2-SNAPSHOT</version>
+        <version>9.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -188,7 +188,6 @@
             </build>
             <dependencies>
                 <!-- Add all modules that should be taken into account for the coverage reports -->
-                <!-- (Excludes dspace-rest which is deprecated and doesn't build by default) -->
                 <dependency>
                     <groupId>org.dspace</groupId>
                     <artifactId>dspace-api</artifactId>
@@ -217,7 +216,6 @@
                 <dependency>
                     <groupId>org.dspace</groupId>
                     <artifactId>dspace-server-webapp</artifactId>
-                    <type>war</type>
                     <scope>compile</scope>
                 </dependency>
                 <dependency>
@@ -250,8 +248,8 @@
         <!-- The Servlet API is also needed by the 'dspace oai' launcher.xml
              command. -->
     	<dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
     	</dependency>
     </dependencies>
 </project>
diff --git a/dspace/solr/oai/conf/schema.xml b/dspace/solr/oai/conf/schema.xml
index b2f61c2de9..aefa798348 100644
--- a/dspace/solr/oai/conf/schema.xml
+++ b/dspace/solr/oai/conf/schema.xml
@@ -126,7 +126,9 @@
    <field name="item.submitter" type="string" indexed="true" stored="true" multiValued="false" />
    <field name="item.deleted" type="boolean" indexed="true" stored="true" multiValued="false" />
    <!-- if true, item.public will change in the future due to an embargo being set/lifted -->
-   <field name="item.willChangeStatus" type="boolean" indexed="true" stored="true" multiValued="false" />																									 
+   <field name="item.willChangeStatus" type="boolean" indexed="true" stored="true" multiValued="false" />
+   <!-- Used in RIOXX OAI context to determine whether an item has files in ORIGINAL Bundle -->
+   <field name="item.hasbitstream" type="boolean" indexed="true" stored="true" multiValued="false" />
 
    <!-- Item compiled -->
    <field name="item.compile" type="string" indexed="false" stored="true" multiValued="false" />
diff --git a/dspace/solr/qaevent/conf/protwords.txt b/dspace/solr/qaevent/conf/protwords.txt
new file mode 100644
index 0000000000..1dfc0abecb
--- /dev/null
+++ b/dspace/solr/qaevent/conf/protwords.txt
@@ -0,0 +1,21 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
+
diff --git a/dspace/solr/qaevent/conf/schema.xml b/dspace/solr/qaevent/conf/schema.xml
new file mode 100644
index 0000000000..4bcadcd5a1
--- /dev/null
+++ b/dspace/solr/qaevent/conf/schema.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+    This is the DSpace "qaevent" core, which stores the events coming from the Quality Assurance Broker.
+-->
+<schema name="qaevent" version="1.5">
+
+  <types>
+    
+    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+
+    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
+
+    <fieldType name="int" class="solr.IntPointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="float" class="solr.FloatPointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="long" class="solr.LongPointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="date" class="solr.DatePointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+
+    <fieldType name="pint" class="solr.IntPointField" omitNorms="true" docValues="true"/>
+    <fieldType name="plong" class="solr.LongPointField" omitNorms="true" docValues="true"/>
+    <fieldType name="pfloat" class="solr.FloatPointField" omitNorms="true" docValues="true"/>
+    <fieldType name="pdouble" class="solr.DoublePointField" omitNorms="true" docValues="true"/>
+    <fieldType name="pdate" class="solr.DatePointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+
+    <fieldType name="sint" class="solr.IntPointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+    <fieldType name="slong" class="solr.LongPointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+    <fieldType name="sfloat" class="solr.FloatPointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+    <fieldType name="sdouble" class="solr.DoublePointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+
+    <fieldType name="random" class="solr.RandomSortField" indexed="true" />
+
+    <!-- A text field that only splits on whitespace for exact matching of words -->
+    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
+    </fieldType>
+
+   	<fieldType name="text" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="0"
+                splitOnCaseChange="1"/>
+        <filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="0"
+                catenateNumbers="0"
+                catenateAll="0"
+                splitOnCaseChange="1"/>
+        <filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <fieldType name="textTight" class="solr.TextField" positionIncrementGap="100" >
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="0"
+                generateNumberParts="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <fieldType name="textgen" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt" />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="0"
+                splitOnCaseChange="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="0"
+                catenateNumbers="0"
+                catenateAll="0"
+                splitOnCaseChange="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+
+    <fieldType name="lowerCaseSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
+      <analyzer>
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory" />
+        <filter class="solr.TrimFilterFactory" />
+      </analyzer>
+    </fieldType>
+
+    <fieldType name="keywordFilter" class="solr.TextField" sortMissingLast="true" omitNorms="true">
+        <analyzer>
+            <!--Treats the entire field as a single token, regardless of its content-->
+            <tokenizer class="solr.KeywordTokenizerFactory"/>
+
+            <!--<filter class="solr.LowerCaseFilterFactory" />-->
+            <filter class="solr.TrimFilterFactory" />
+        </analyzer>
+    </fieldType>
+
+    <fieldType name="textSpell" class="solr.TextField"
+               positionIncrementGap="100" stored="false" multiValued="true">
+        <analyzer type="index">
+            <tokenizer class="solr.StandardTokenizerFactory"/>
+            <filter class="solr.LowerCaseFilterFactory"/>
+            <filter class="solr.SynonymFilterFactory"
+                    synonyms="synonyms.txt" ignoreCase="true"
+                    expand="true"/>
+            <filter class="solr.StopFilterFactory" ignoreCase="true"
+                    words="stopwords.txt"/>
+            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        </analyzer>
+        <analyzer type="query">
+            <tokenizer class="solr.StandardTokenizerFactory"/>
+            <filter class="solr.LowerCaseFilterFactory"/>
+            <filter class="solr.StopFilterFactory" ignoreCase="true"
+                    words="stopwords.txt"/>
+            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        </analyzer>
+    </fieldType>
+ </types>
+
+
+ <fields>
+ 
+ 	<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+
+    <!-- The event source -->
+    <field name="source" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The event id -->
+    <field name="event_id" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The event original id -->
+    <field name="original_id" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The subject title -->
+    <field name="title" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The event topic -->
+	<field name="topic" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The event trust -->
+	<field name="trust" type="double" indexed="true" stored="true" omitNorms="true" />
+    <!-- The event message -->
+	<field name="message" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The uuid of the item related to the event -->
+	<field name="resource_uuid" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The uuid of the second item related to the event-->
+	<field name="related_uuid" type="string" indexed="true" stored="true" omitNorms="true" />
+    <!-- The last update date -->
+	<field name="last_update" type="date" indexed="true" stored="true" omitNorms="true" />
+   	    
+   	<dynamicField name="*_i"  type="int"    indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_l"  type="long"   indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_t"  type="text"    indexed="true"  stored="true" multiValued="true" />
+   	<dynamicField name="*_b"  type="boolean" indexed="true"  stored="true" multiValued="true" />
+   	<dynamicField name="*_f"  type="float"  indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_d"  type="double" indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_dt" type="date" indexed="true"  stored="true" multiValued="true"/>
+   	<dynamicField name="*_signature" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true" docValues="true"/>
+       	
+ </fields>
+
+ <uniqueKey>event_id</uniqueKey>
+ 
+</schema>
diff --git a/dspace/solr/qaevent/conf/solrconfig.xml b/dspace/solr/qaevent/conf/solrconfig.xml
new file mode 100644
index 0000000000..2a5f1ef4e9
--- /dev/null
+++ b/dspace/solr/qaevent/conf/solrconfig.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+    DSpace 'qaevent' core.
+
+    For more details about configurations options that may appear in
+    this file, see http://wiki.apache.org/solr/SolrConfigXml.
+-->
+<config>
+    <luceneMatchVersion>8.8.1</luceneMatchVersion>
+    
+    <!-- Include contributed libraries that we use in DSpace. -->
+    <lib dir='${solr.install.dir}/contrib/analysis-extras/lib/'
+         regex='icu4j-.*\.jar'/>
+    <lib dir='${solr.install.dir}/contrib/analysis-extras/lucene-libs/'
+         regex='lucene-analyzers-icu-.*\.jar'/>
+
+    <dataDir>${solr.data.dir:}</dataDir>
+
+    <directoryFactory name="DirectoryFactory"
+                      class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+
+    <codecFactory class="solr.SchemaCodecFactory"/>
+
+    <!-- Use classic schema.xml & disallow programmatic changes to schema at runtime -->
+    <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+    <indexConfig>
+        <ramBufferSizeMB>32</ramBufferSizeMB>
+        <maxBufferedDocs>1000</maxBufferedDocs>
+        <lockType>${solr.lock.type:native}</lockType>
+        <!-- Set to true to "write detailed debug information from the indexing process as Solr log messages" -->
+        <infoStream>false</infoStream>
+    </indexConfig>
+
+    <!-- Settings for how updates are done internally -->
+    <updateHandler class="solr.DirectUpdateHandler2">
+        <!-- How often should commits be done automatically -->
+        <autoCommit>
+            <maxDocs>10000</maxDocs> <!--Commit every 10.000 documents-->
+            <maxTime>${solr.autoCommit.maxTime:10000}</maxTime> <!--Default commit every 10 seconds-->
+            <openSearcher>true</openSearcher>
+        </autoCommit>
+
+        <autoSoftCommit>
+            <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+        </autoSoftCommit>
+    </updateHandler>
+
+    <!-- Settings for how Solr will process & respond to queries -->
+    <query>
+        <maxBooleanClauses>${solr.max.booleanClauses:1024}</maxBooleanClauses>
+
+        <!-- Cache used by SolrIndexSearcher for filters (DocSets) for
+                 unordered sets of *all* documents that match a query. Caches results of 'fq' search param. -->
+        <filterCache class="solr.search.CaffeineCache"
+                     size="512"
+                     initialSize="512"
+                     autowarmCount="0"/>
+
+        <!-- Caches results of previous searches - ordered lists of document ids
+         (DocList) based on a query, a sort, and the range of documents requested. -->
+        <queryResultCache class="solr.search.CaffeineCache"
+                          size="512"
+                          initialSize="512"
+                          autowarmCount="0"/>
+
+        <!-- Caches Lucene Document objects (the stored fields for each
+         document).  Since Lucene internal document ids are transient,
+         this cache will not be autowarmed. -->
+        <documentCache class="solr.search.CaffeineCache"
+                       size="512"
+                       initialSize="512"
+                       autowarmCount="0"/>
+
+        <enableLazyFieldLoading>true</enableLazyFieldLoading>
+        <queryResultWindowSize>20</queryResultWindowSize>
+        <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
+        <useColdSearcher>false</useColdSearcher>
+        <maxWarmingSearchers>2</maxWarmingSearchers>
+    </query>
+
+    <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
+    <requestDispatcher handleSelect="false" >
+        <requestParsers enableRemoteStreaming="true"
+                        multipartUploadLimitInKB="-1"
+                        formdataUploadLimitInKB="-1"
+                        addHttpRequestToContext="false"/>
+
+        <httpCaching never304="true" />
+    </requestDispatcher>
+
+    <!-- Process requests to /select path -->
+    <requestHandler name="/select" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">explicit</str>
+       <int name="rows">10</int>
+       <str name="df">event_id</str>
+     </lst>
+    </requestHandler>
+
+    <!-- Processes updates to the index -->
+    <requestHandler name="/update" class="solr.UpdateRequestHandler"/>
+
+    <requestHandler name="/update/json" class="solr.UpdateRequestHandler">
+        <lst name="defaults">
+            <str name="stream.contentType">application/json</str>
+        </lst>
+    </requestHandler>
+</config>
+
diff --git a/dspace/solr/qaevent/conf/stopwords.txt b/dspace/solr/qaevent/conf/stopwords.txt
new file mode 100644
index 0000000000..8433c832d2
--- /dev/null
+++ b/dspace/solr/qaevent/conf/stopwords.txt
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+#Standard english stop words taken from Lucene's StopAnalyzer
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
+
diff --git a/dspace/solr/qaevent/conf/synonyms.txt b/dspace/solr/qaevent/conf/synonyms.txt
new file mode 100644
index 0000000000..b0e31cb7ec
--- /dev/null
+++ b/dspace/solr/qaevent/conf/synonyms.txt
@@ -0,0 +1,31 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+#some test synonym mappings unlikely to appear in real input text
+aaa => aaaa
+bbb => bbbb1 bbbb2
+ccc => cccc1,cccc2
+a\=>a => b\=>b
+a\,a => b\,b
+fooaaa,baraaa,bazaaa
+
+# Some synonym groups specific to this example
+GB,gib,gigabyte,gigabytes
+MB,mib,megabyte,megabytes
+Television, Televisions, TV, TVs
+#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
+#after us won't split it into two words.
+
+# Synonym mappings can be used for spelling correction too
+pixima => pixma
+
diff --git a/dspace/solr/qaevent/core.properties b/dspace/solr/qaevent/core.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dspace/solr/statistics/conf/solrconfig.xml b/dspace/solr/statistics/conf/solrconfig.xml
index 2b1cff4537..c3f023ff2e 100644
--- a/dspace/solr/statistics/conf/solrconfig.xml
+++ b/dspace/solr/statistics/conf/solrconfig.xml
@@ -32,14 +32,16 @@
 
     <codecFactory class="solr.SchemaCodecFactory"/>
 
-    <!-- Use classic schema.xml & disallow programmatic changes to schema at runtime -->
+    <!-- Use classic schema.xml & disallow programmatic changes to
+         schema at runtime -->
     <schemaFactory class="ClassicIndexSchemaFactory"/>
 
     <indexConfig>
         <ramBufferSizeMB>32</ramBufferSizeMB>
         <maxBufferedDocs>1000</maxBufferedDocs>
         <lockType>${solr.lock.type:native}</lockType>
-        <!-- Set to true to "write detailed debug information from the indexing process as Solr log messages" -->
+        <!-- Set to true to "write detailed debug information from the
+             indexing process as Solr log messages" -->
         <infoStream>false</infoStream>
     </indexConfig>
 
@@ -48,7 +50,7 @@
         <!-- How often should commits be done automatically -->
         <autoCommit>
             <maxDocs>10000</maxDocs> <!--Commit every 10.000 documents-->
-            <maxTime>${solr.autoCommit.maxTime:900000}</maxTime> <!--Default commit every 15 minutes-->
+            <maxTime>${solr.autoCommit.maxTime:10000}</maxTime> <!--Ten seconds-->
             <openSearcher>true</openSearcher>
         </autoCommit>
 
@@ -62,14 +64,16 @@
         <maxBooleanClauses>${solr.max.booleanClauses:1024}</maxBooleanClauses>
 
         <!-- Cache used by SolrIndexSearcher for filters (DocSets) for
-             unordered sets of *all* documents that match a query. Caches results of 'fq' search param. -->
+             unordered sets of *all* documents that match a
+             query. Caches results of 'fq' search param. -->
         <filterCache class="solr.search.CaffeineCache"
                      size="512"
                      initialSize="512"
                      autowarmCount="0"/>
 
-        <!-- Caches results of previous searches - ordered lists of document ids
-         (DocList) based on a query, a sort, and the range of documents requested. -->
+        <!-- Caches results of previous searches - ordered lists of
+             document ids (DocList) based on a query, a sort, and the
+             range of documents requested. -->
         <queryResultCache class="solr.search.CaffeineCache"
                           size="512"
                           initialSize="512"
@@ -91,7 +95,8 @@
         <slowQueryThresholdMillis>1000</slowQueryThresholdMillis>
     </query>
 
-    <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
+    <!-- Controls how the Solr HTTP RequestDispatcher responds to
+         requests -->
     <requestDispatcher handleSelect="false" >
         <requestParsers enableRemoteStreaming="true"
                         multipartUploadLimitInKB="-1"
@@ -113,7 +118,8 @@
 
     <!-- Processes updates to the index -->
     <requestHandler name="/update" class="solr.UpdateRequestHandler">
-        <!-- Update chain processor required by DSpace to auto generate the UUID field in solr -->
+        <!-- Update chain processor required by DSpace to auto
+             generate the UUID field in solr -->
         <lst name="defaults">
             <str name="update.chain">uuid</str>
         </lst>
@@ -126,7 +132,8 @@
         </lst>
     </requestHandler>
 
-    <!-- Required for DSpace to ensure that unique identifiers are added to each solr document -->
+    <!-- Required for DSpace to ensure that unique identifiers are
+         added to each solr document -->
     <updateRequestProcessorChain name="uuid">
         <processor class="solr.UUIDUpdateProcessorFactory">
             <str name="fieldName">uid</str>
diff --git a/dspace/solr/suggestion/conf/protwords.txt b/dspace/solr/suggestion/conf/protwords.txt
new file mode 100644
index 0000000000..1dfc0abecb
--- /dev/null
+++ b/dspace/solr/suggestion/conf/protwords.txt
@@ -0,0 +1,21 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# Use a protected word file to protect against the stemmer reducing two
+# unrelated words to the same base word.
+
+# Some non-words that normally won't be encountered,
+# just to test that they won't be stemmed.
+dontstems
+zwhacky
+
diff --git a/dspace/solr/suggestion/conf/schema.xml b/dspace/solr/suggestion/conf/schema.xml
new file mode 100644
index 0000000000..dc88df5736
--- /dev/null
+++ b/dspace/solr/suggestion/conf/schema.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+    This is the DSpace "suggestion" core, which holds records of each imported
+    item suggestions coming from an external resoure.
+    Each search or view/download event is logged here.
+    See dspace-api:org.dspace.statistics.SolrLoggerServiceImpl.
+
+    You should find the extensively commented example schema distributed with
+    Solr in [Solr]/server/solr/configsets/_default/conf/.
+-->
+<schema name="suggestion" version="1.5">
+
+  <types>
+    
+    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
+
+    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
+
+    <fieldType name="int" class="solr.IntPointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="float" class="solr.FloatPointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="long" class="solr.LongPointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="double" class="solr.DoublePointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+    <fieldType name="date" class="solr.DatePointField" omitNorms="true" positionIncrementGap="0" docValues="true"/>
+
+    <fieldType name="pint" class="solr.IntPointField" omitNorms="true" docValues="true"/>
+    <fieldType name="plong" class="solr.LongPointField" omitNorms="true" docValues="true"/>
+    <fieldType name="pfloat" class="solr.FloatPointField" omitNorms="true" docValues="true"/>
+    <fieldType name="pdouble" class="solr.DoublePointField" omitNorms="true" docValues="true"/>
+    <fieldType name="pdate" class="solr.DatePointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+
+    <fieldType name="sint" class="solr.IntPointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+    <fieldType name="slong" class="solr.LongPointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+    <fieldType name="sfloat" class="solr.FloatPointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+    <fieldType name="sdouble" class="solr.DoublePointField" sortMissingLast="true" omitNorms="true" docValues="true"/>
+
+    <fieldType name="random" class="solr.RandomSortField" indexed="true" />
+
+    <!-- A text field that only splits on whitespace for exact matching of words -->
+    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- A text field that uses WordDelimiterFilter to enable splitting and matching of
+        words on case-change, alpha numeric boundaries, and non-alphanumeric chars,
+        so that a query of "wifi" or "wi fi" could match a document containing "Wi-Fi".
+        Synonyms and stopwords are customized by external files, and stemming is enabled.
+        Duplicate tokens at the same position (which may result from Stemmed Synonyms or
+        WordDelim parts) are removed.
+        -->
+   	<fieldType name="text" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="0"
+                splitOnCaseChange="1"/>
+        <filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="0"
+                catenateNumbers="0"
+                catenateAll="0"
+                splitOnCaseChange="1"/>
+        <filter class="org.apache.lucene.analysis.icu.ICUFoldingFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- Less flexible matching, but less false matches.  Probably not ideal for product names,
+         but may be good for SKUs.  Can insert dashes in the wrong place and still match. -->
+    <fieldType name="textTight" class="solr.TextField" positionIncrementGap="100" >
+      <analyzer>
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
+        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="0"
+                generateNumberParts="0"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.SnowballPorterFilterFactory" language="English" protected="protwords.txt"/>
+        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <!-- A general unstemmed text field - good if one does not know the language of the field -->
+    <fieldType name="textgen" class="solr.TextField" positionIncrementGap="100">
+      <analyzer type="index">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt" />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="1"
+                catenateNumbers="1"
+                catenateAll="0"
+                splitOnCaseChange="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+      <analyzer type="query">
+        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
+        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
+        <filter class="solr.StopFilterFactory"
+                ignoreCase="true"
+                words="stopwords.txt"
+                />
+        <filter class="solr.WordDelimiterFilterFactory"
+                generateWordParts="1"
+                generateNumberParts="1"
+                catenateWords="0"
+                catenateNumbers="0"
+                catenateAll="0"
+                splitOnCaseChange="0"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
+
+    <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
+
+    <fieldType name="lowerCaseSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
+      <analyzer>
+        <tokenizer class="solr.KeywordTokenizerFactory"/>
+        <filter class="solr.LowerCaseFilterFactory" />
+        <filter class="solr.TrimFilterFactory" />
+      </analyzer>
+    </fieldType>
+
+    <fieldType name="keywordFilter" class="solr.TextField" sortMissingLast="true" omitNorms="true">
+        <analyzer>
+            <!--Treats the entire field as a single token, regardless of its content-->
+            <tokenizer class="solr.KeywordTokenizerFactory"/>
+
+            <!--<filter class="solr.LowerCaseFilterFactory" />-->
+            <filter class="solr.TrimFilterFactory" />
+        </analyzer>
+    </fieldType>
+
+    <!--
+     SpellCheck analysis config based off of http://wiki.apache.org/solr/
+     SpellCheckingAnalysis
+     -->
+    <fieldType name="textSpell" class="solr.TextField"
+               positionIncrementGap="100" stored="false" multiValued="true">
+        <analyzer type="index">
+            <tokenizer class="solr.StandardTokenizerFactory"/>
+            <filter class="solr.LowerCaseFilterFactory"/>
+            <filter class="solr.SynonymFilterFactory"
+                    synonyms="synonyms.txt" ignoreCase="true"
+                    expand="true"/>
+            <filter class="solr.StopFilterFactory" ignoreCase="true"
+                    words="stopwords.txt"/>
+            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        </analyzer>
+        <analyzer type="query">
+            <tokenizer class="solr.StandardTokenizerFactory"/>
+            <filter class="solr.LowerCaseFilterFactory"/>
+            <filter class="solr.StopFilterFactory" ignoreCase="true"
+                    words="stopwords.txt"/>
+            <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
+        </analyzer>
+    </fieldType>
+ </types>
+
+
+ <fields>
+ 
+ 	<field name="_version_" type="long" indexed="true" stored="true" multiValued="false"/>
+
+    <field name="source" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="suggestion_fullid" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="suggestion_id" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="target_id" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="title" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="date" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="display" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="contributors" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true" />
+    <field name="abstract" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="category" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true"/>
+    <field name="external-uri" type="string" indexed="true" stored="true" omitNorms="true" />
+    <field name="processed" type="boolean" indexed="true" stored="true" omitNorms="true" />
+    <field name="trust" type="double" indexed="true" stored="true" omitNorms="true" />
+    <field name="evidences" type="string" indexed="false" stored="true" omitNorms="true" />
+   	    
+   	<dynamicField name="*_i"  type="int"    indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_l"  type="long"   indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_t"  type="text"    indexed="true"  stored="true" multiValued="true" />
+   	<dynamicField name="*_b"  type="boolean" indexed="true"  stored="true" multiValued="true" />
+   	<dynamicField name="*_f"  type="float"  indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_d"  type="double" indexed="true"  stored="true" multiValued="true" docValues="true"/>
+   	<dynamicField name="*_dt" type="date" indexed="true"  stored="true" multiValued="true"/>
+   	<dynamicField name="*_signature" type="string" indexed="true" stored="true" omitNorms="true" multiValued="true" docValues="true"/>
+       	
+ </fields>
+
+ <uniqueKey>suggestion_fullid</uniqueKey>
+ 
+</schema>
diff --git a/dspace/solr/suggestion/conf/solrconfig.xml b/dspace/solr/suggestion/conf/solrconfig.xml
new file mode 100644
index 0000000000..228b5f545e
--- /dev/null
+++ b/dspace/solr/suggestion/conf/solrconfig.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!--
+    DSpace 'suggestion' core.
+
+    For more details about configurations options that may appear in
+    this file, see http://wiki.apache.org/solr/SolrConfigXml. 
+-->
+<config>
+    <luceneMatchVersion>8.8.1</luceneMatchVersion>
+    
+    <!-- Include contributed libraries that we use in DSpace. -->
+    <lib dir='${solr.install.dir}/contrib/analysis-extras/lib/'
+         regex='icu4j-.*\.jar'/>
+    <lib dir='${solr.install.dir}/contrib/analysis-extras/lucene-libs/'
+         regex='lucene-analyzers-icu-.*\.jar'/>
+
+    <dataDir>${solr.data.dir:}</dataDir>
+
+    <directoryFactory name="DirectoryFactory"
+                      class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}"/>
+
+    <codecFactory class="solr.SchemaCodecFactory"/>
+
+    <!-- Use classic schema.xml & disallow programmatic changes to schema at runtime -->
+    <schemaFactory class="ClassicIndexSchemaFactory"/>
+
+    <indexConfig>
+        <ramBufferSizeMB>32</ramBufferSizeMB>
+        <maxBufferedDocs>1000</maxBufferedDocs>
+        <lockType>${solr.lock.type:native}</lockType>
+        <!-- Set to true to "write detailed debug information from the indexing process as Solr log messages" -->
+        <infoStream>false</infoStream>
+    </indexConfig>
+
+    <!-- Settings for how updates are done internally -->
+    <updateHandler class="solr.DirectUpdateHandler2">
+        <!-- How often should commits be done automatically -->
+        <autoCommit>
+            <maxDocs>10000</maxDocs> <!--Commit every 10.000 documents-->
+            <maxTime>${solr.autoCommit.maxTime:10000}</maxTime> <!--Default commit every 10 seconds-->
+            <openSearcher>true</openSearcher>
+        </autoCommit>
+
+        <autoSoftCommit>
+            <maxTime>${solr.autoSoftCommit.maxTime:-1}</maxTime>
+        </autoSoftCommit>
+        
+        <!-- This is required for Atomic Updates -->
+        <updateLog>
+            <str name="dir">${solr.ulog.dir:}</str>
+        </updateLog>
+    </updateHandler>
+
+    <!-- Settings for how Solr will process & respond to queries -->
+    <query>
+        <maxBooleanClauses>${solr.max.booleanClauses:1024}</maxBooleanClauses>
+
+        <!-- Cache used by SolrIndexSearcher for filters (DocSets) for
+                 unordered sets of *all* documents that match a query. Caches results of 'fq' search param. -->
+        <filterCache class="solr.search.CaffeineCache"
+                     size="512"
+                     initialSize="512"
+                     autowarmCount="0"/>
+
+        <!-- Caches results of previous searches - ordered lists of document ids
+         (DocList) based on a query, a sort, and the range of documents requested. -->
+        <queryResultCache class="solr.search.CaffeineCache"
+                          size="512"
+                          initialSize="512"
+                          autowarmCount="0"/>
+
+        <!-- Caches Lucene Document objects (the stored fields for each
+         document).  Since Lucene internal document ids are transient,
+         this cache will not be autowarmed. -->
+        <documentCache class="solr.search.CaffeineCache"
+                       size="512"
+                       initialSize="512"
+                       autowarmCount="0"/>
+
+        <enableLazyFieldLoading>true</enableLazyFieldLoading>
+        <queryResultWindowSize>20</queryResultWindowSize>
+        <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
+        <useColdSearcher>false</useColdSearcher>
+        <maxWarmingSearchers>2</maxWarmingSearchers>
+    </query>
+
+    <!-- Controls how the Solr HTTP RequestDispatcher responds to requests -->
+    <requestDispatcher handleSelect="false" >
+        <requestParsers enableRemoteStreaming="true"
+                        multipartUploadLimitInKB="-1"
+                        formdataUploadLimitInKB="-1"
+                        addHttpRequestToContext="false"/>
+
+        <httpCaching never304="true" />
+    </requestDispatcher>
+
+    <!-- Process requests to /select path -->
+    <requestHandler name="/select" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">explicit</str>
+       <int name="rows">10</int>
+       <str name="df">suggestion_id</str>
+     </lst>
+    </requestHandler>
+
+    <!-- Processes updates to the index -->
+    <requestHandler name="/update" class="solr.UpdateRequestHandler"/>
+
+    <requestHandler name="/update/json" class="solr.UpdateRequestHandler">
+        <lst name="defaults">
+            <str name="stream.contentType">application/json</str>
+        </lst>
+    </requestHandler>
+</config>
diff --git a/dspace/solr/suggestion/conf/stopwords.txt b/dspace/solr/suggestion/conf/stopwords.txt
new file mode 100644
index 0000000000..8433c832d2
--- /dev/null
+++ b/dspace/solr/suggestion/conf/stopwords.txt
@@ -0,0 +1,57 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+# a couple of test stopwords to test that the words are really being
+# configured from this file:
+stopworda
+stopwordb
+
+#Standard english stop words taken from Lucene's StopAnalyzer
+an
+and
+are
+as
+at
+be
+but
+by
+for
+if
+in
+into
+is
+it
+no
+not
+of
+on
+or
+s
+such
+t
+that
+the
+their
+then
+there
+these
+they
+this
+to
+was
+will
+with
+
diff --git a/dspace/solr/suggestion/conf/synonyms.txt b/dspace/solr/suggestion/conf/synonyms.txt
new file mode 100644
index 0000000000..b0e31cb7ec
--- /dev/null
+++ b/dspace/solr/suggestion/conf/synonyms.txt
@@ -0,0 +1,31 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#-----------------------------------------------------------------------
+#some test synonym mappings unlikely to appear in real input text
+aaa => aaaa
+bbb => bbbb1 bbbb2
+ccc => cccc1,cccc2
+a\=>a => b\=>b
+a\,a => b\,b
+fooaaa,baraaa,bazaaa
+
+# Some synonym groups specific to this example
+GB,gib,gigabyte,gigabytes
+MB,mib,megabyte,megabytes
+Television, Televisions, TV, TVs
+#notice we use "gib" instead of "GiB" so any WordDelimiterFilter coming
+#after us won't split it into two words.
+
+# Synonym mappings can be used for spelling correction too
+pixima => pixma
+
diff --git a/dspace/solr/suggestion/core.properties b/dspace/solr/suggestion/core.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/dspace/src/main/assembly/assembly.xml b/dspace/src/main/assembly/assembly.xml
index 97cfac8ed3..420eb46314 100644
--- a/dspace/src/main/assembly/assembly.xml
+++ b/dspace/src/main/assembly/assembly.xml
@@ -62,10 +62,6 @@
          <directory>bin</directory>
          <outputDirectory>bin</outputDirectory>
       </fileSet>
-      <fileSet>
-         <directory>etc</directory>
-         <outputDirectory>etc</outputDirectory>
-      </fileSet>
       <fileSet>
          <directory>solr</directory>
          <outputDirectory>solr</outputDirectory>
@@ -95,7 +91,7 @@
          <includes>
             <include>org.dspace.modules:*:jar:*</include>
          </includes>
-        <binaries>
+         <binaries>
             <includeDependencies>true</includeDependencies>
             <outputDirectory>lib</outputDirectory>
             <unpack>false</unpack>
@@ -110,6 +106,21 @@
          </binaries>
       </moduleSet>
 
+      <!--
+      Add server-boot.jar to the 'webapps' directory
+      -->
+      <moduleSet>
+         <includes>
+            <include>org.dspace:server-boot</include>
+         </includes>
+         <binaries>
+            <includeDependencies>false</includeDependencies>
+            <outputDirectory>webapps</outputDirectory>
+            <unpack>false</unpack>
+            <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+         </binaries>
+      </moduleSet>
+
       <!--
       Take all WAR modules (in [src]/dspace/modules/) and unpack them into
       'webapps' directory
diff --git a/dspace/src/main/config/build.xml b/dspace/src/main/config/build.xml
index 940287c9d1..f588eb0238 100644
--- a/dspace/src/main/config/build.xml
+++ b/dspace/src/main/config/build.xml
@@ -687,10 +687,6 @@ Common usage:
             <fileset dir="${dspace.dir}/webapps/rdf/"/>
         </war>
 
-        <war destfile="${dspace.dir}/webapps/rest.war">
-            <fileset dir="${dspace.dir}/webapps/rest/"/>
-        </war>
-
         <war destfile="${dspace.dir}/webapps/sword.war">
             <fileset dir="${dspace.dir}/webapps/sword/" />
         </war>
diff --git a/dspace/src/main/docker-compose/README.md b/dspace/src/main/docker-compose/README.md
index 1c9acea30c..2f4c444714 100644
--- a/dspace/src/main/docker-compose/README.md
+++ b/dspace/src/main/docker-compose/README.md
@@ -33,7 +33,7 @@ Documentation for all Dockerfiles used by these compose scripts can be found in
   - Docker compose file that will download and install a default assetstore.
   - The default assetstore is the configurable entities test dataset. Useful for [testing/demos of Entities](#Ingest Option 2 Ingest Entities Test Data).
 - cli.ingest.yml
-  - Docker compose file that will run an AIP ingest into DSpace 7. Useful for testing/demos with basic Items.
+  - Docker compose file that will run an AIP ingest into DSpace. Useful for testing/demos with basic Items.
 - db.entities.yml
   - Docker compose file that pre-populate a database instance using a downloaded SQL dump.
   - The default dataset is the configurable entities test dataset. Useful for [testing/demos of Entities](#Ingest Option 2 Ingest Entities Test Data).
@@ -54,29 +54,29 @@ Documentation for all Dockerfiles used by these compose scripts can be found in
 
 ## To refresh / pull DSpace images from Dockerhub
 ```
-docker-compose -f docker-compose.yml -f docker-compose-cli.yml pull
+docker compose -f docker-compose.yml -f docker-compose-cli.yml pull
 ```
 
 ## To build DSpace images using code in your branch
 ```
-docker-compose -f docker-compose.yml -f docker-compose-cli.yml build
+docker compose -f docker-compose.yml -f docker-compose-cli.yml build
 ```
 
 OPTIONALLY, you can build DSpace images using a different JDK_VERSION like this:
 ```
-docker-compose -f docker-compose.yml -f docker-compose-cli.yml build --build-arg JDK_VERSION=17
+docker compose -f docker-compose.yml -f docker-compose-cli.yml build --build-arg JDK_VERSION=17
 ```
 Default is Java 11, but other LTS releases (e.g. 17) are also supported.
 
-## Run DSpace 7 REST from your current branch
+## Run DSpace 8 REST from your current branch
 ```
-docker-compose -p d7 up -d
+docker compose -p d8 up -d
 ```
 
-## Run DSpace 7 REST and Angular from your branch
+## Run DSpace 8 REST and Angular from your branch
 
 ```
-docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d
+docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d
 ```
 NOTE: This starts the UI in development mode. It will take a few minutes to see the UI as the Angular code needs to be compiled.
 
@@ -86,7 +86,7 @@ NOTE: This starts the UI in development mode. It will take a few minutes to see
 
 See documentation in [DSpace User Interface Docker instructions](https://github.com/DSpace/dspace-angular/blob/main/docker/README.md#run-dspace-rest-and-dspace-angular-from-local-branches).
 
-## Run DSpace 7 REST with a IIIF Image Server from your branch
+## Run DSpace 8 REST with a IIIF Image Server from your branch
 *Only useful for testing IIIF support in a development environment*
 
 This command starts our `dspace-iiif` container alongside the REST API.
@@ -94,10 +94,10 @@ That container provides a [Cantaloupe image server](https://cantaloupe-project.g
 which can be used when IIIF support is enabled in DSpace (`iiif.enabled=true`).
 
 ```
-docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-iiif.yml up -d
+docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-iiif.yml up -d
 ```
 
-## Run DSpace 7 REST and Shibboleth SP (in Apache) from your branch
+## Run DSpace 8 REST and Shibboleth SP (in Apache) from your branch
 *Only useful for testing Shibboleth in a development environment*
 
 This Shibboleth container uses https://samltest.id/ as an IdP (see `../docker/dspace-shibboleth/`).
@@ -132,17 +132,17 @@ The remainder of these instructions assume you are using ngrok (though other pro
 3. Build the Shibboleth container (if you haven't built or pulled it before):
    ```
    cd [dspace-src]
-   docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml build
+   docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml build
    ```
 
 4. Start all containers, passing your public hostname as the `DSPACE_HOSTNAME` environment variable:
    ```
-   DSPACE_HOSTNAME=[subdomain].ngrok.io docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d
+   DSPACE_HOSTNAME=[subdomain].ngrok.io docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d
    ```
    NOTE: For Windows you MUST either set the environment variable separately, or use the 'env' command provided with Git/Cygwin
    (you may already have this command if you are running Git for Windows). See https://superuser.com/a/1079563
    ```
-   env DSPACE_HOSTNAME=[subdomain].ngrok.io docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d
+   env DSPACE_HOSTNAME=[subdomain].ngrok.io docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d
    ```
 
 5. Finally, for https://samltest.id/, you need to upload your Shibboleth Metadata for the site to "trust" you.
@@ -170,7 +170,7 @@ The remainder of these instructions assume you are using ngrok (though other pro
         ```
       * Spin up the `dspace-angular` container alongside the others, e.g.
         ```
-        DSPACE_HOSTNAME=[subdomain].ngrok.io docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d
+        DSPACE_HOSTNAME=[subdomain].ngrok.io docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d
         ```
 
 ## Sample Test Data
@@ -180,17 +180,17 @@ The remainder of these instructions assume you are using ngrok (though other pro
 *Allows you to ingest a set of AIPs into your DSpace instance for testing/demo purposes.* These AIPs represent basic Communities, Collections and Items.
 
 Prerequisites
-- Start DSpace 7 using one of the options listed above
+- Start DSpace using one of the options listed above
 - Build the DSpace CLI image if needed.  See the instructions above.
 
 Create an admin account.  By default, the dspace-cli container runs the dspace command.
 ```
-docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
+docker compose -p d8 -f docker-compose-cli.yml run --rm dspace-cli create-administrator -e test@test.edu -f admin -l user -p admin -c en
 ```
 
 Download a Zip file of AIP content and ingest test data
 ```
-docker-compose -p d7 -f docker-compose-cli.yml -f dspace/src/main/docker-compose/cli.ingest.yml run --rm dspace-cli
+docker compose -p d8 -f docker-compose-cli.yml -f dspace/src/main/docker-compose/cli.ingest.yml run --rm dspace-cli
 ```
 
 ### Ingest Entities Test Data
@@ -198,18 +198,18 @@ docker-compose -p d7 -f docker-compose-cli.yml -f dspace/src/main/docker-compose
 *Allows you to load Configurable Entities test data for testing/demo purposes.*
 
 Prerequisites
-- Start DSpace 7 using one of the options listed above
+- Start DSpace using one of the options listed above
 - Build the DSpace CLI image if needed.  See the instructions above.
-- _Remove your d7 volumes if you already ingested content into your docker volumes_
+- _Remove your volumes if you already ingested content into your docker volumes_
 
 Start DSpace REST with a postgres database dump downloaded from the internet.
 ```
-docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/db.entities.yml up -d
+docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/db.entities.yml up -d
 ```
 
 Download an assetstore from a tar file on the internet.
 ```
-docker-compose -p d7 -f docker-compose-cli.yml -f dspace/src/main/docker-compose/cli.assetstore.yml run dspace-cli
+docker compose -p d8 -f docker-compose-cli.yml -f dspace/src/main/docker-compose/cli.assetstore.yml run dspace-cli
 ```
 
 ## Modify DSpace Configuration in Docker
@@ -217,26 +217,26 @@ While your Docker containers are running, you may directly modify any configurat
 `[dspace-src]/dspace/config/`. Those config changes will be synced to the container.
 (This works because our `docker-compose.yml` mounts the `[src]/dspace/config` directory from the host into the running Docker instance.)
 
-Many DSpace configuration settings will reload automatically (after a few seconds).  However, configurations which are cached by DSpace (or by Spring Boot) may require you to quickly reboot the Docker containers by running `docker-compose -p d7 down` followed by `docker-compose -p d7 up -d`.
+Many DSpace configuration settings will reload automatically (after a few seconds).  However, configurations which are cached by DSpace (or by Spring Boot) may require you to quickly reboot the Docker containers by running `docker compose -p d7 down` followed by `docker compose -p d7 up -d`.
 
 ## Running DSpace CLI scripts in Docker
 While the Docker containers are running, you can use the DSpace CLI image to run any DSpace commandline script (i.e. any command that normally can be run by `[dspace]/bin/dspace`).  The general format is:
 
 ```
-docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli [command] [parameters]
+docker compose -p d8 -f docker-compose-cli.yml run --rm dspace-cli [command] [parameters]
 ```
 
 So, for example, to reindex all content in Discovery, normally you'd run `./dspace index-discovery -b` from commandline.  Using our DSpace CLI image, that command becomes:
 
 ```
-docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli index-discovery -b
+docker compose -p d8 -f docker-compose-cli.yml run --rm dspace-cli index-discovery -b
 ```
 
 Similarly, you can see the value of any DSpace configuration (in local.cfg or dspace.cfg) by running:
 
 ```
 # Output the value of `dspace.ui.url` from running Docker instance
-docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli dsprop -p dspace.ui.url
+docker compose -p d8 -f docker-compose-cli.yml run --rm dspace-cli dsprop -p dspace.ui.url
 ```
 
 NOTE: It is also possible to run CLI scripts directly on the "dspace" container (where the backend runs)
@@ -245,7 +245,7 @@ This can be useful if you want to pass environment variables which override DSpa
 # Run the "./dspace database clean" command from the "dspace" container
 # Before doing so, it sets "db.cleanDisabled=false".
 # WARNING: This will delete all your data. It's just an example of how to do so.
-docker-compose -p d7 exec -e "db__P__cleanDisabled=false" dspace /dspace/bin/dspace database clean
+docker compose -p d8 exec -e "db__P__cleanDisabled=false" dspace /dspace/bin/dspace database clean
 ```
 
 ## Upgrading PostgreSQL in Docker
@@ -263,16 +263,16 @@ Here's how to fix those issues by migrating your old Postgres data to the new ve
 1. First, you must start up the older PostgreSQL image (to dump your existing data to a `*.sql` file)
     ```
     # This command assumes you are using the process described above to start all your containers
-    docker-compose -p d7 up -d
+    docker compose -p d8 up -d
     ```
     * If you've already accidentally updated to the new PostgreSQL image, you have a few options:
         * Pull down an older version of the image from Dockerhub (using a tag)
         * Or, temporarily rebuild your local image with the old version of Postgres. For example:
           ```
-          # This command will rebuild using PostgreSQL v11 & tag it locally as "dspace-7_x"
-          docker build --build-arg POSTGRES_VERSION=11 -t dspace/dspace-postgres-pgcrypto:dspace-7_x ./dspace/src/main/docker/dspace-postgres-pgcrypto/
+          # This command will rebuild using PostgreSQL v11 & tag it locally as "latest"
+          docker build --build-arg POSTGRES_VERSION=11 -t dspace/dspace-postgres-pgcrypto:latest ./dspace/src/main/docker/dspace-postgres-pgcrypto/
           # Then restart container with that image
-          docker-compose -p d7 up -d
+          docker compose -p d8 up -d
           ```
 2. Dump your entire "dspace" database out of the old "dspacedb" container to a local file named `pgdump.sql`
     ```
@@ -295,28 +295,28 @@ Here's how to fix those issues by migrating your old Postgres data to the new ve
 3. Now, stop all existing containers. This shuts down the old version of PostgreSQL
     ```
     # This command assumes you are using the process described above to start/stop all your containers
-    docker-compose -p d7 down
+    docker compose -p d8 down
     ```
 4. Delete the `pgdata` volume. WARNING: This deletes all your old PostgreSQL data. Make sure you have that `pgdump.sql` file FIRST!
     ```
-    # Assumes you are using `-p d7` which prefixes all volumes with `d7_`
-    docker volume rm d7_pgdata
+    # Assumes you are using `-p d8` which prefixes all volumes with `d8_`
+    docker volume rm d8_pgdata
     ```
 5. Now, pull down the latest PostgreSQL image with the NEW version of PostgreSQL.
     ```
-    docker-compose -f docker-compose.yml -f docker-compose-cli.yml pull
+    docker compose -f docker-compose.yml -f docker-compose-cli.yml pull
     ```
 6. Start everything up using our `db.restore.yml` script.  This script will recreate the database
 using the local `./pgdump.sql` file. IMPORTANT: If you renamed that "pgdump.sql" file or stored it elsewhere,
 then you MUST change the name/directory in the `db.restore.yml` script.
     ```
     # Restore database from "./pgdump.sql" (this path is hardcoded in db.restore.yml)
-    docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/db.restore.yml up -d
+    docker compose -p d8 -f docker-compose.yml -f dspace/src/main/docker-compose/db.restore.yml up -d
     ```
 7. Finally, reindex all database contents into Solr (just to be sure Solr indexes are current).
     ```
     # Run "./dspace index-discovery -b" using our CLI image
-    docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli index-discovery -b
+    docker compose -p d8 -f docker-compose-cli.yml run --rm dspace-cli index-discovery -b
     ```
 At this point in time, all your old database data should be migrated to the new Postgres
-and running at http://localhost:8080/server/
\ No newline at end of file
+and running at http://localhost:8080/server/
diff --git a/dspace/src/main/docker-compose/db.entities.yml b/dspace/src/main/docker-compose/db.entities.yml
index 3480c0df87..931d04942d 100644
--- a/dspace/src/main/docker-compose/db.entities.yml
+++ b/dspace/src/main/docker-compose/db.entities.yml
@@ -8,7 +8,7 @@
 
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto:dspace-7_x-loadsql
+    image: dspace/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql
     environment:
       # This SQL is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
       - LOADSQL=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/dspace7-entities-data.sql
@@ -17,11 +17,11 @@ services:
     # Ensure that the database is ready BEFORE starting tomcat
     # 1. While a TCP connection to dspacedb port 5432 is not available, continue to sleep
     # 2. Then, run migration latest version of database tables (run with "ignored" in case this SQL data is outdated)
-    # 3. Finally, start Tomcat
+    # 3. Finally, start DSpace
     entrypoint:
       - /bin/bash
       - '-c'
       - |
         while (!</dev/tcp/dspacedb/5432) > /dev/null 2>&1; do sleep 1; done;
         /dspace/bin/dspace database migrate ignored
-        catalina.sh run
+        java -jar /dspace/webapps/server-boot.jar --dspace.dir=/dspace
diff --git a/dspace/src/main/docker-compose/db.restore.yml b/dspace/src/main/docker-compose/db.restore.yml
index 09990e6756..ffeca1e598 100644
--- a/dspace/src/main/docker-compose/db.restore.yml
+++ b/dspace/src/main/docker-compose/db.restore.yml
@@ -12,7 +12,7 @@
 # This can be used to restore a "dspacedb" container from a pg_dump, or during upgrade to a new version of PostgreSQL.
 services:
   dspacedb:
-    image: dspace/dspace-postgres-pgcrypto:dspace-7_x-loadsql
+    image: dspace/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}-loadsql
     environment:
       # Location where the dump SQL file will be available on the running container
       - LOCALSQL=/tmp/pgdump.sql
diff --git a/dspace/src/main/docker-compose/docker-compose-angular.yml b/dspace/src/main/docker-compose/docker-compose-angular.yml
index c9b87c904f..dc837c5c99 100644
--- a/dspace/src/main/docker-compose/docker-compose-angular.yml
+++ b/dspace/src/main/docker-compose/docker-compose-angular.yml
@@ -26,7 +26,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x
+    image: dspace/dspace-angular:${DSPACE_VER:-latest}
     ports:
     - published: 4000
       target: 4000
diff --git a/dspace/src/main/docker/README.md b/dspace/src/main/docker/README.md
index ac1b4cb923..c737afd336 100644
--- a/dspace/src/main/docker/README.md
+++ b/dspace/src/main/docker/README.md
@@ -16,72 +16,63 @@ Caching these Maven dependencies provides a speed increase to all later builds b
 are only downloaded once.
 
 ```
-docker build -t dspace/dspace-dependencies:dspace-7_x -f Dockerfile.dependencies .
+docker build -t dspace/dspace-dependencies:latest -f Dockerfile.dependencies .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
-A corresponding image exists for DSpace 4-6.
-
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-dependencies:dspace-7_x
+docker push dspace/dspace-dependencies:latest
 ```
 
 ## Dockerfile.test (in root folder)
 
-This Dockerfile builds a DSpace 7 backend image (for testing/development).
-This image deploys two DSpace webapps to Tomcat running in Docker:
-1. The DSpace 7 REST API (at `http://localhost:8080/server`)
-2. The legacy (v6) REST API (at `http://localhost:8080/rest`), deployed without requiring HTTPS access.
+This Dockerfile builds a DSpace REST API backend image (for testing/development).
+This image deploys one webapp to Tomcat running in Docker:
+1. The DSpace REST API (at `http://localhost:8080/server`)
 This image also sets up debugging in Tomcat for development.
 
 ```
-docker build -t dspace/dspace:dspace-7_x-test -f Dockerfile.test .
+docker build -t dspace/dspace:latest-test -f Dockerfile.test .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
-A corresponding image exists for DSpace 4-6.
-
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace:dspace-7_x-test
+docker push dspace/dspace:latest-test
 ```
 
 ## Dockerfile (in root folder)
 
-This Dockerfile builds a DSpace 7 backend image.
+This Dockerfile builds a DSpace REST API backend image.
 This image deploys one DSpace webapp to Tomcat running in Docker:
-1. The DSpace 7 REST API (at `http://localhost:8080/server`)
+1. The DSpace REST API (at `http://localhost:8080/server`)
 
 ```
-docker build -t dspace/dspace:dspace-7_x -f Dockerfile .
+docker build -t dspace/dspace:latest -f Dockerfile .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
-A corresponding image exists for DSpace 4-6.
-
 Admins to our DockerHub repo can publish with the following command.
 ```
-docker push dspace/dspace:dspace-7_x
+docker push dspace/dspace:latest
 ```
 
 ## Dockerfile.cli (in root folder)
 
-This Dockerfile builds a DSpace 7 CLI (command line interface) image, which can be used to run DSpace's commandline tools via Docker.
+This Dockerfile builds a DSpace CLI (command line interface) image, which can be used to run DSpace's commandline tools via Docker.
 ```
-docker build -t dspace/dspace-cli:dspace-7_x -f Dockerfile.cli .
+docker build -t dspace/dspace-cli:latest -f Dockerfile.cli .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
-A corresponding image exists for DSpace 6.
-
 Admins to our DockerHub repo can publish with the following command.
 ```
-docker push dspace/dspace-cli:dspace-7_x
+docker push dspace/dspace-cli:latest
 ```
 
 ## ./dspace-postgres-pgcrypto/Dockerfile
@@ -92,20 +83,18 @@ This image is built *automatically* after each commit is made to the `main` bran
 How to build manually:
 ```
 cd dspace/src/main/docker/dspace-postgres-pgcrypto
-docker build -t dspace/dspace-postgres-pgcrypto:dspace-7_x .
+docker build -t dspace/dspace-postgres-pgcrypto:latest .
 ```
 
 It is also possible to change the version of PostgreSQL or the PostgreSQL user's password during the build:
 ```
 cd dspace/src/main/docker/dspace-postgres-pgcrypto
-docker build -t dspace/dspace-postgres-pgcrypto:dspace-7_x --build-arg POSTGRES_VERSION=11 --build-arg POSTGRES_PASSWORD=mypass .
+docker build -t dspace/dspace-postgres-pgcrypto:latest --build-arg POSTGRES_VERSION=11 --build-arg POSTGRES_PASSWORD=mypass .
 ```
 
-A copy of this file exists in the DSpace 6 branch.  A specialized version of this file exists for DSpace 4 in DSpace-Docker-Images.
-
 Admins to our DockerHub repo can (manually) publish with the following command.
 ```
-docker push dspace/dspace-postgres-pgcrypto:dspace-7_x
+docker push dspace/dspace-postgres-pgcrypto:latest
 ```
 
 ## ./dspace-postgres-pgcrypto-curl/Dockerfile
@@ -118,17 +107,15 @@ This image is built *automatically* after each commit is made to the `main` bran
 How to build manually:
 ```
 cd dspace/src/main/docker/dspace-postgres-pgcrypto-curl
-docker build -t dspace/dspace-postgres-pgcrypto:dspace-7_x-loadsql .
+docker build -t dspace/dspace-postgres-pgcrypto:latest-loadsql .
 ```
 
 Similar to `dspace-postgres-pgcrypto` above, you can also modify the version of PostgreSQL or the PostgreSQL user's password.
 See examples above.
 
-A copy of this file exists in the DSpace 6 branch.
-
 Admins to our DockerHub repo can (manually) publish with the following command.
 ```
-docker push dspace/dspace-postgres-pgcrypto:dspace-7_x-loadsql
+docker push dspace/dspace-postgres-pgcrypto:latest-loadsql
 ```
 
 ## ./dspace-shibboleth/Dockerfile
@@ -158,15 +145,15 @@ can be pulled / built following the [docker compose resources](../docker-compose
 documentation. Or, to just build and/or run Solr:
 
 ```bash
-docker-compose build dspacesolr
-docker-compose -p d7 up -d dspacesolr
+docker compose build dspacesolr
+docker compose -p d8 up -d dspacesolr
 ```
 
 If you're making iterative changes to the DSpace Solr configsets you'll need to rebuild /
 restart the `dspacesolr` container for the changes to be deployed. From DSpace root:
 
 ```bash
-docker-compose -p d7 up --detach --build dspacesolr
+docker compose -p d8 up --detach --build dspacesolr
 ```
 
 ## ./test/ folder
diff --git a/dspace/src/main/docker/dspace-solr/Dockerfile b/dspace/src/main/docker/dspace-solr/Dockerfile
index eb8e93493f..289949922c 100644
--- a/dspace/src/main/docker/dspace-solr/Dockerfile
+++ b/dspace/src/main/docker/dspace-solr/Dockerfile
@@ -17,14 +17,18 @@ FROM solr:${SOLR_VERSION}-slim
 ENV AUTHORITY_CONFIGSET_PATH=/opt/solr/server/solr/configsets/authority/conf \
     OAI_CONFIGSET_PATH=/opt/solr/server/solr/configsets/oai/conf \
     SEARCH_CONFIGSET_PATH=/opt/solr/server/solr/configsets/search/conf \
-    STATISTICS_CONFIGSET_PATH=/opt/solr/server/solr/configsets/statistics/conf
-
+    STATISTICS_CONFIGSET_PATH=/opt/solr/server/solr/configsets/statistics/conf \
+    QAEVENT_CONFIGSET_PATH=/opt/solr/server/solr/configsets/qaevent/conf  \
+    SUGGESTION_CONFIGSET_PATH=/opt/solr/server/solr/configsets/suggestion/conf
+    
 USER root
 
 RUN mkdir -p $AUTHORITY_CONFIGSET_PATH && \
     mkdir -p $OAI_CONFIGSET_PATH && \
     mkdir -p $SEARCH_CONFIGSET_PATH && \
-    mkdir -p $STATISTICS_CONFIGSET_PATH
+    mkdir -p $STATISTICS_CONFIGSET_PATH && \
+    mkdir -p $QAEVENT_CONFIGSET_PATH && \
+    mkdir -p $SUGGESTION_CONFIGSET_PATH
 
 # NOTE: "solrconfigs" MUST be passed in by docker-compose via "additional_contexts"
 # OR via "docker build --build-context solrconfigs=[path-to-dspace/solr]"
@@ -32,6 +36,8 @@ COPY --from=solrconfigs authority/conf/* $AUTHORITY_CONFIGSET_PATH/
 COPY --from=solrconfigs oai/conf/* $OAI_CONFIGSET_PATH/
 COPY --from=solrconfigs search/conf/* $SEARCH_CONFIGSET_PATH/
 COPY --from=solrconfigs statistics/conf/* $STATISTICS_CONFIGSET_PATH/
+COPY --from=solrconfigs qaevent/conf/* $QAEVENT_CONFIGSET_PATH/
+COPY --from=solrconfigs suggestion/conf/* $SUGGESTION_CONFIGSET_PATH/
 
 RUN chown -R solr:solr /opt/solr/server/solr/configsets
 
diff --git a/dspace/src/main/docker/test/rest_web.xml b/dspace/src/main/docker/test/rest_web.xml
deleted file mode 100644
index 05a6268692..0000000000
--- a/dspace/src/main/docker/test/rest_web.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    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/
-
--->
-<!-- 
-    THIS FILE EXISTS TO SIMPLIFY TESTING IN DOCKER.
-    This file overrides the requirement to connect to the legacy rest service over https.
- -->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://java.sun.com/xml/ns/javaee"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-         id="WebApp_ID" version="2.5">
-
-    <filter>
-        <filter-name>dspace.request</filter-name>
-        <filter-class>org.dspace.utils.servlet.DSpaceWebappServletFilter</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>dspace.request</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-    <filter>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-    </filter>
-
-    <filter-mapping>
-        <filter-name>springSecurityFilterChain</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-
-    <servlet>
-        <servlet-name>DSpace REST API</servlet-name>
-        <servlet-class>
-            org.glassfish.jersey.servlet.ServletContainer
-        </servlet-class>
-        <init-param>
-            <param-name>javax.ws.rs.Application</param-name>
-            <param-value>org.dspace.rest.DSpaceRestApplication</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>DSpace REST API</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>default</servlet-name>
-        <url-pattern>/static/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- Security settings and mapping -->
-    <!-- 
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>DSpace REST API</web-resource-name>
-            <url-pattern>/*</url-pattern>
-        </web-resource-collection>
-        <user-data-constraint>
-            <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-        </user-data-constraint>
-    </security-constraint>
-     -->
-
-    <!-- ConfigurationService initialization for dspace.dir -->
-    <context-param>
-        <description>
-            The location of the DSpace home directory
-        </description>
-        <param-name>dspace.dir</param-name>
-        <param-value>${dspace.dir}</param-value>
-    </context-param>
-
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>
-            /WEB-INF/applicationContext.xml,
-            /WEB-INF/security-applicationContext.xml
-        </param-value>
-    </context-param>
-
-    <listener>
-        <listener-class>org.dspace.app.util.DSpaceContextListener</listener-class>
-    </listener>
-
-    <!-- kernel start listener (from impl)
-        The following listener can be used instead of the filter below, it is simpler, cleaner
-        and eliminates the need for a DSpaceKernelServletFilter filter to be involved with the
-        request cycle.
-    -->
-    <listener>
-        <listener-class>org.dspace.servicemanager.servlet.DSpaceKernelServletContextListener</listener-class>
-    </listener>
-
-    <listener>
-        <listener-class>
-            org.springframework.web.context.ContextLoaderListener
-        </listener-class>
-    </listener>
-
-    <listener>
-        <listener-class>org.dspace.app.util.DSpaceWebappListener</listener-class>
-    </listener>
-
-
-</web-app>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ae83442235..fa401be71b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,12 +4,12 @@
     <groupId>org.dspace</groupId>
     <artifactId>dspace-parent</artifactId>
     <packaging>pom</packaging>
-    <version>7.6.2-SNAPSHOT</version>
+    <version>9.0-SNAPSHOT</version>
     <name>DSpace Parent Project</name>
     <description>
    	DSpace open source software is a turnkey institutional repository application.
     </description>
-    <url>https://github.com/dspace/DSpace</url>
+    <url>https://github.com/DSpace/DSpace</url>
 
     <organization>
         <name>LYRASIS</name>
@@ -18,47 +18,47 @@
 
     <properties>
         <!--=== GENERAL / DSPACE-API DEPENDENCIES ===-->
-        <java.version>11</java.version>
-        <spring.version>5.3.34</spring.version>
-        <spring-boot.version>2.7.18</spring-boot.version>
-        <spring-security.version>5.7.11</spring-security.version> <!-- sync with version used by spring-boot-->
-        <hibernate.version>5.6.15.Final</hibernate.version>
-        <hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
-        <postgresql.driver.version>42.7.3</postgresql.driver.version>
-        <solr.client.version>8.11.3</solr.client.version>
+        <java.version>17</java.version>
+        <spring.version>6.1.14</spring.version>
+        <spring-boot.version>3.3.5</spring-boot.version>
+        <spring-security.version>6.3.4</spring-security.version> <!-- sync with version used by spring-boot-->
+        <hibernate.version>6.4.8.Final</hibernate.version>
+        <hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
+        <postgresql.driver.version>42.7.4</postgresql.driver.version>
+        <flyway.version>10.20.1</flyway.version>
+        <solr.client.version>8.11.4</solr.client.version>
 
         <ehcache.version>3.10.8</ehcache.version>
-        <errorprone.version>2.10.0</errorprone.version>
+        <errorprone.version>2.35.1</errorprone.version>
         <!-- NOTE: when updating jackson.version, also sync jackson-databind.version below -->
-        <jackson.version>2.16.0</jackson.version>
-        <jackson-databind.version>2.16.0</jackson-databind.version>
-        <javax-annotation.version>1.3.2</javax-annotation.version>
-        <jaxb-api.version>2.3.1</jaxb-api.version>
-        <jaxb-runtime.version>2.3.9</jaxb-runtime.version>
+        <jackson.version>2.18.1</jackson.version>
+        <jackson-databind.version>2.18.1</jackson-databind.version>
+        <jakarta-annotation.version>2.1.1</jakarta-annotation.version>
+        <jaxb-api.version>4.0.2</jaxb-api.version>
+        <jaxb-runtime.version>4.0.5</jaxb-runtime.version>
         <jcache-version>1.1.1</jcache-version>
         <!-- NOTE: Jetty needed for Solr, Handle Server & tests -->
-        <jetty.version>9.4.54.v20240208</jetty.version>
+        <jetty.version>9.4.56.v20240826</jetty.version>
         <log4j.version>2.23.1</log4j.version>
         <pdfbox-version>2.0.31</pdfbox-version>
         <rome.version>1.19.0</rome.version>
-        <slf4j.version>1.7.36</slf4j.version>
+        <slf4j.version>2.0.11</slf4j.version>
         <tika.version>2.9.2</tika.version>
-        <!-- Sync with whatever version Tika uses -->
+        <!-- Sync BouncyCastle & ASM with whatever version Tika uses -->
         <bouncycastle.version>1.78.1</bouncycastle.version>
-
+        <asm.version>8.0.1</asm.version>
+        <!-- Jersey is used to integrate with external sources/services -->
+        <jersey.version>3.1.5</jersey.version>
         <!--=== SERVER WEBAPP DEPENDENCIES ===-->
         <!-- Library for reading JSON documents: https://github.com/json-path/JsonPath (used by Server webapp) -->
         <json-path.version>2.9.0</json-path.version>
         <!-- Library for managing JSON Web Tokens (JWT): https://bitbucket.org/connect2id/nimbus-jose-jwt/wiki/Home
              (used by Server webapp) -->
-        <nimbus-jose-jwt.version>7.9</nimbus-jose-jwt.version>
+        <nimbus-jose-jwt.version>9.45</nimbus-jose-jwt.version>
 
         <!--=== OTHER MODULE-SPECIFIC DEPENDENCIES ===-->
-        <!-- PIN Jena to 2.x until both RDF and SWORDv2 can be updated to Jena 3. Requires package renaming, see
-             https://jena.apache.org/documentation/migrate_jena2_jena3.html -->
-        <jena.version>2.13.0</jena.version>
-        <!-- Used by (now obsolete) 'dspace-rest' WAR -->
-        <jersey.version>2.39.1</jersey.version>
+        <!-- Jena is used by both RDF and SWORDv2 -->
+        <jena.version>4.9.0</jena.version>
 
         <!--=== MAVEN SETTINGS ===-->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -89,7 +89,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.5.0</version>
                     <executions>
                         <execution>
                             <id>enforce-java</id>
@@ -102,7 +102,7 @@
                                         <version>${java.version}</version>
                                     </requireJavaVersion>
                                     <requireMavenVersion>
-                                        <version>[3.0.5,)</version>
+                                        <version>[3.8,)</version>
                                     </requireMavenVersion>
                                 </rules>
                             </configuration>
@@ -140,9 +140,9 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.13.0</version>
                     <configuration>
-                        <release>11</release>
+                        <release>${java.version}</release>
                         <!-- Turn on http://errorprone.info (requires fork=true & below compilerArgs)-->
                         <fork>true</fork>
                         <compilerArgs>
@@ -159,6 +159,9 @@
                             <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                             <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED</arg>
                             <arg>-Xpkginfo:always</arg>
+                            <!-- Allows for the Reflection API to retrieve parameter names from methods. For example,
+                                 it enables @PathVariable annotations to use parameter names automatically. -->
+                            <arg>-parameters</arg>
                         </compilerArgs>
                         <annotationProcessorPaths>
                             <path>
@@ -173,7 +176,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.4.2</version>
                     <configuration>
                         <archive>
                             <manifest>
@@ -187,7 +190,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.3</version>
+                    <version>3.4.0</version>
                     <configuration>
                         <failOnMissingWebXml>false</failOnMissingWebXml>
                         <!-- Filter the web.xml (needed for IDE compatibility/debugging) -->
@@ -204,7 +207,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.5.2</version>
                     <configuration>
                         <!-- Allow for the ability to pass JVM memory flags for Unit Tests. Since
                              maven-surefire-plugin forks a new JVM, it ignores MAVEN_OPTS.-->
@@ -219,6 +222,9 @@
                         <trimStackTrace>false</trimStackTrace>
                         <!-- Whether to skip unit tests or not -->
                         <skipTests>${skipUnitTests}</skipTests>
+                        <!-- Do not fail immediately if a test specified via "-Dtest=[testClass]" isn't found.
+                             This allows the build to continue and keep trying to run that test in other modules. -->
+                        <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
                         <!--
                         Enable to debug Maven Surefire tests in remote proces
                         <debugForkedProcess>true</debugForkedProcess>
@@ -228,7 +234,7 @@
                 <!-- Used to run Integration tests (when enabled by -DskipIntegrationTests=false) -->
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.5.2</version>
                     <configuration>
                         <!-- Allow for the ability to pass JVM memory flags for Unit Tests. Since
                              maven-failsafe-plugin forks a new JVM, it ignores MAVEN_OPTS.-->
@@ -242,6 +248,9 @@
                         <trimStackTrace>false</trimStackTrace>
                         <!-- Whether to skip integration tests or not -->
                         <skipTests>${skipIntegrationTests}</skipTests>
+                        <!-- Do not fail immediately if a test specified via "-Dit.test=[testClass]" isn't found.
+                             This allows the build to continue and keep trying to run that test in other modules. -->
+                        <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
                     </configuration>
                     <executions>
                         <execution>
@@ -257,7 +266,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>3.3.1</version>
+                    <version>3.6.0</version>
                     <executions>
                         <execution>
                             <id>verify-style</id>
@@ -273,7 +282,6 @@
                             <sourceDirectory>src/main/java</sourceDirectory>
                         </sourceDirectories>
                         <configLocation>${root.basedir}/checkstyle.xml</configLocation>
-                        <encoding>${project.build.sourceEncoding}</encoding>
                         <logViolationsToConsole>true</logViolationsToConsole>
                         <failOnViolation>true</failOnViolation>
                         <!-- Enable checks on all test source files -->
@@ -287,14 +295,14 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.38</version>
+                            <version>10.19.0</version>
                         </dependency>
                     </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>4.8.2.0</version>
+                    <version>4.8.6.5</version>
                     <configuration>
                         <effort>Max</effort>
                         <threshold>Low</threshold>
@@ -304,7 +312,7 @@
                         <dependency>
                             <groupId>com.github.spotbugs</groupId>
                             <artifactId>spotbugs</artifactId>
-                            <version>4.8.2</version>
+                            <version>4.8.6</version>
                         </dependency>
                     </dependencies>
                     <executions>
@@ -320,7 +328,7 @@
                 <!-- This additional configuration also cleans sub-modules -->
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.4.0</version>
                     <configuration>
                         <filesets>
                             <fileset>
@@ -334,17 +342,17 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.6.0</version>
+                    <version>3.7.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.1.2</version>
+                    <version>3.8.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <!-- Used to validate License Headers (see build process) -->
                 <plugin>
@@ -356,23 +364,28 @@
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.8</version>
+                    <version>1.7.0</version>
                 </plugin>
                 <!-- Used to generate JavaDocs for new releases (see release profile). -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.11.1</version>
                     <configuration>
                         <!-- Never fail a build based on Javadoc errors -->
                         <failOnError>false</failOnError>
+                        <detectLinks />
+                        <links>
+                          <link>https://docs.spring.io/spring-framework/docs/current/javadoc-api/</link>
+                          <link>https://docs.spring.io/spring-security/site/docs/current/api/</link>
+                        </links>
                     </configuration>
                 </plugin>
                 <!-- Used to generate source JARs for new releases (see release profile). -->
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <!-- Used for custom Groovy code that fills out the 'agnostic.build.dir' needed to
                      set 'dspace.dir' for our testing environment -->
@@ -385,13 +398,13 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-gpg-plugin</artifactId>
-                    <version>1.6</version>
+                    <version>3.2.7</version>
                 </plugin>
                 <!-- Used for code coverage reporting (see 'measure-test-coverage' profile) -->
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.5</version>
+                    <version>0.8.12</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -403,7 +416,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.1.1</version>
                 <configuration>
                     <!-- During release:prepare and release:perform, pass the "release" property to enable the
                      "release" profile (and enable/disable other profiles based on whether they need releasing) -->
@@ -471,7 +484,7 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xml-maven-plugin</artifactId>
-                <version>1.0.2</version>
+                <version>1.1.0</version>
                 <executions>
                     <execution>
                         <id>validate-ALL-xml-and-xsl</id>
@@ -679,7 +692,7 @@
                     <plugin>
                         <groupId>org.codehaus.mojo</groupId>
                         <artifactId>license-maven-plugin</artifactId>
-                        <version>2.0.0</version>
+                        <version>2.4.0</version>
                         <!-- This plugin only needs to be run on the Parent POM
                              as it aggregates results from all child POMs. -->
                         <inherited>false</inherited>
@@ -705,7 +718,7 @@
                                         <licenseMerge>Apache Software License, Version 2.0|The SAX License|The W3C License</licenseMerge>
                                         <!-- JDOM uses this license, but it's essentially just Apache -->
                                         <licenseMerge>Apache Software License, Version 2.0|Similar to Apache License but with the acknowledgment clause removed</licenseMerge>
-                                        <licenseMerge>BSD License|The BSD License|BSD licence|BSD license|BSD|BSD-style license|New BSD License|New BSD license|Revised BSD License|BSD 2-Clause license|3-Clause BSD License|BSD 2-Clause|BSD 3-clause New License|BSD Licence 3|BSD-2-Clause|BSD-3-Clause|Modified BSD|The New BSD License|The BSD 3-Clause License (BSD3)|BSD License 3</licenseMerge>
+                                        <licenseMerge>BSD License|The BSD License|BSD licence|BSD license|BSD|BSD-style license|New BSD License|New BSD license|Revised BSD License|BSD 2-Clause license|3-Clause BSD License|BSD 2-Clause|BSD 3-clause New License|BSD Licence 3|BSD-2-Clause|BSD-3-Clause|Modified BSD|The New BSD License|The BSD 3-Clause License (BSD3)|BSD License 3|BSD License 2.0</licenseMerge>
                                         <!-- DSpace uses a BSD License -->
                                         <licenseMerge>BSD License|DSpace BSD License|DSpace Sourcecode License</licenseMerge>
                                         <!-- Coverity uses modified BSD: https://github.com/coverity/coverity-security-library -->
@@ -726,20 +739,24 @@
                                         <!-- JBoss Transaction API claims this license, but it is dual licensed with CDDL being one: https://github.com/jboss/jboss-transaction-api_spec -->
                                         <licenseMerge>Common Development and Distribution License (CDDL)|GNU General Public License, Version 2 with the Classpath Exception</licenseMerge>
                                         <licenseMerge>Eclipse Distribution License, Version 1.0|Eclipse Distribution License (EDL), Version 1.0|Eclipse Distribution License - v 1.0|Eclipse Distribution License v. 1.0|EDL 1.0</licenseMerge>
-                                        <licenseMerge>Eclipse Public License|Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|EPL 1.0 license|Eclipse Public License (EPL), Version 1.0|Eclipse Public License 1.0|Eclipse Public License v1.0|Eclipse Public License, Version 1.0|EPL 1.0|EPL 2.0|Eclipse Public License - v 2.0</licenseMerge>
+                                        <licenseMerge>Eclipse Public License|Eclipse Public License - Version 1.0|Eclipse Public License - v 1.0|EPL 1.0 license|Eclipse Public License (EPL), Version 1.0|Eclipse Public License 1.0|Eclipse Public License v1.0|Eclipse Public License, Version 1.0|EPL 1.0|EPL 2.0|Eclipse Public License - v 2.0|EPL-2.0|Eclipse Public License 2.0|Eclipse Public License v. 2.0|Eclipse Public License, Version 2.0</licenseMerge>
                                         <!-- JUnit claims this license but is actually Eclipse Public License: http://junit.org/license.html -->
                                         <licenseMerge>Eclipse Public License|Common Public License Version 1.0</licenseMerge>
                                         <!-- Jersey is dual licensed as EPL but lists its main license as GPL: https://github.com/eclipse-ee4j/jersey#licensing-and-governance -->
                                         <licenseMerge>Eclipse Public License|The GNU General Public License (GPL), Version 2, With Classpath Exception</licenseMerge>
+                                        <!-- Jakarta Expression Language is dual licensed as EPL and GPL: https://projects.eclipse.org/projects/ee4j.el -->
+                                        <licenseMerge>Eclipse Public License|GNU General Public License, version 2 with the GNU Classpath Exception</licenseMerge>
+                                        <!-- Jakarta RESTful web services is dual licensed as EPL and GPL: https://github.com/jakartaee/rest -->
+                                        <licenseMerge>Eclipse Public License|GPL-2.0-with-classpath-exception</licenseMerge>
                                         <licenseMerge>GNU Lesser General Public License (LGPL)|The GNU Lesser General Public License, Version 2.1|GNU Lesser General Public License (LGPL), Version 2.1|GNU LESSER GENERAL PUBLIC LICENSE, Version 2.1|GNU Lesser General Public License, version 2.1|GNU LESSER GENERAL PUBLIC LICENSE|GNU Lesser General Public License|GNU Lesser Public License|GNU Lesser General Public License, Version 2.1|Lesser General Public License (LGPL) v 2.1|LGPL 2.1|LGPL 2.1 license|LGPL 3.0 license|LGPL, v2.1 or later|LGPL|LGPL, version 2.1|lgpl|Lesser General Public License, version 3 or greater</licenseMerge>
                                         <!-- Hibernate ORM claims this license, but it's really regular LGPL: https://hibernate.org/community/license/ -->
                                         <licenseMerge>GNU Lesser General Public License (LGPL)|GNU Library General Public License v2.1 or later</licenseMerge>
-                                        <licenseMerge>MIT License|The MIT License|MIT LICENSE|MIT|MIT license|MIT License (MIT)</licenseMerge>
+                                        <licenseMerge>MIT License|The MIT License|MIT LICENSE|MIT|MIT license|MIT License (MIT)|The MIT License (MIT)</licenseMerge>
                                         <!-- BouncyCastle uses an MIT-style license: https://www.bouncycastle.org/licence.html -->
                                         <licenseMerge>MIT License|Bouncy Castle Licence</licenseMerge>
                                         <!-- netCDF tools uses an MIT-style license -->
                                         <licenseMerge>MIT License|(MIT-style) netCDF C library license</licenseMerge>
-                                        <licenseMerge>Mozilla Public License|Mozilla Public License version 1.1|Mozilla Public License 1.1 (MPL 1.1)|MPL 1.1|Mozilla Public License Version 2.0|Mozilla Public License, Version 2.0</licenseMerge>
+                                        <licenseMerge>Mozilla Public License|Mozilla Public License version 1.1|Mozilla Public License 1.1 (MPL 1.1)|MPL 1.1|Mozilla Public License Version 2.0|Mozilla Public License, Version 2.0|Mozilla Public License Version 1.1</licenseMerge>
                                         <!-- H2 Database claims this license, but for our purposes it's MPL: http://www.h2database.com -->
                                         <licenseMerge>Mozilla Public License|MPL 2.0, and EPL 1.0|MPL 2.0</licenseMerge>
                                         <!-- "concurrent.concurrent" claims this license, but is actually Public Domain: http://mvnrepository.com/artifact/concurrent/concurrent/ -->
@@ -750,6 +767,8 @@
                                     <!-- For Licenses which are "Unknown" by Maven, load them from a properties file -->
                                     <useMissingFile>true</useMissingFile>
                                     <missingFile>src/main/license/LICENSES_THIRD_PARTY.properties</missingFile>
+                                    <!-- Use the same properties file to override licenses listed in that file -->
+                                    <overrideUrl>file:${root.basedir}/src/main/license/LICENSES_THIRD_PARTY.properties</overrideUrl>
                                 </configuration>
                             </execution>
                         </executions>
@@ -855,40 +874,6 @@
             </modules>
         </profile>
 
-       <!-- REST Jersey (Deprecated REST API from DSpace 6.x or below) -->
-       <!-- As this module is deprecated, it only builds if you activate it via -Pdspace-rest -->
-       <profile>
-           <id>dspace-rest</id>
-           <activation>
-               <activeByDefault>false</activeByDefault>
-               <!-- Enable if we are doing a release (-Drelease), to tag/release this optional module -->
-               <property>
-                   <name>release</name>
-               </property>
-           </activation>
-           <modules>
-               <module>dspace-rest</module>
-           </modules>
-           <dependencyManagement>
-               <dependencies>
-                   <dependency>
-                       <groupId>org.dspace</groupId>
-                       <artifactId>dspace-rest</artifactId>
-                       <version>7.6.2-SNAPSHOT</version>
-                       <type>jar</type>
-                       <classifier>classes</classifier>
-                   </dependency>
-                   <dependency>
-                       <groupId>org.dspace</groupId>
-                       <artifactId>dspace-rest</artifactId>
-                       <version>7.6.2-SNAPSHOT</version>
-                       <type>war</type>
-                   </dependency>
-               </dependencies>
-           </dependencyManagement>
-       </profile>
-
-
         <!--
            Builds SWORD extension for DSpace
         -->
@@ -1032,76 +1017,68 @@
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api</artifactId>
                 <type>test-jar</type>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace.modules</groupId>
                 <artifactId>additions</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-sword</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-swordv2</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-oai</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-services</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
                 <type>test-jar</type>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-rdf</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-iiif</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-server-webapp</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
-                <type>jar</type>
-                <classifier>classes</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.dspace</groupId>
-                <artifactId>dspace-server-webapp</artifactId>
-                <version>7.6.2-SNAPSHOT</version>
-                <type>war</type>
+                <version>9.0-SNAPSHOT</version>
             </dependency>
             <!-- DSpace API Localization Packages -->
             <dependency>
                 <groupId>org.dspace</groupId>
                 <artifactId>dspace-api-lang</artifactId>
-                <version>[7.0.0,8.0.0)</version>
+                <version>[8.0.0,9.0.0)</version>
             </dependency>
 
             <!-- DSpace third Party Dependencies -->
@@ -1113,19 +1090,19 @@
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-core</artifactId>
                 <version>${hibernate.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-jpamodelgen</artifactId>
                 <version>${hibernate.version}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.orm</groupId>
                 <artifactId>hibernate-jcache</artifactId>
                 <version>${hibernate.version}</version>
             </dependency>
@@ -1137,7 +1114,7 @@
             </dependency>
 
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>
                 <!-- This artifact doesn't track the main Hibernate version. -->
                 <version>${hibernate-validator.version}</version>
@@ -1150,6 +1127,13 @@
                 <version>3.4.3.Final</version>
             </dependency>
 
+            <!-- Hibernate & Solr disagree on the version of antlr. So, specify the latest version -->
+            <dependency>
+                <groupId>org.antlr</groupId>
+                <artifactId>antlr4-runtime</artifactId>
+                <version>4.13.1</version>
+            </dependency>
+
             <!-- Rome is used for RSS / ATOM syndication feeds -->
             <dependency>
                 <groupId>com.rometools</groupId>
@@ -1293,6 +1277,12 @@
                 <groupId>org.apache.tika</groupId>
                 <artifactId>tika-parsers-standard-package</artifactId>
                 <version>${tika.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <!-- Tika brings in multiple versions of this. Select the latest version. Always sync with Tika version -->
             <dependency>
@@ -1322,7 +1312,37 @@
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>
-                <version>8.0.1</version>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-analysis</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-commons</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.ow2.asm</groupId>
+                <artifactId>asm-tree</artifactId>
+                <version>${asm.version}</version>
+            </dependency>
+
+            <!-- Solr-core and Postgres disagree on versions of Checker Qual -->
+            <dependency>
+                <groupId>org.checkerframework</groupId>
+                <artifactId>checker-qual</artifactId>
+                <version>3.48.2</version>
+            </dependency>
+
+            <!-- Several dependencies disagree on version of GSON including Jena, Google-OAuth-Client
+                 and OpenAIRE Broker-Client -->
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>2.10.1</version>
             </dependency>
 
             <!-- Reminder: Keep icu4j (in Parent POM) synced with version used by lucene-analyzers-icu below,
@@ -1357,97 +1377,69 @@
                 <artifactId>apache-jena-libs</artifactId>
                 <type>pom</type>
                 <version>${jena.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                    <!-- Newer version brought in by Tika -->
-                    <exclusion>
-                        <groupId>org.apache.commons</groupId>
-                        <artifactId>commons-csv</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
             <dependency>
                 <groupId>net.handle</groupId>
                 <artifactId>handle</artifactId>
                 <version>9.3.1</version>
-		<exclusions>
-                    <!-- A later version is brought in by google-oauth-client -->
-                    <exclusion>
-                        <groupId>com.google.code.gson</groupId>
-                        <artifactId>gson</artifactId>
-                    </exclusion>
-                </exclusions>
             </dependency>
-            <!-- Required to run Handle Server -->
+            <!-- Only necessary to run Handle Server from commandline. Therefore, a runtime dependency. -->
             <dependency>
                 <groupId>net.cnri</groupId>
                 <artifactId>cnri-servlet-container</artifactId>
-                <version>3.0.0</version>
+                <version>3.1.0</version>
+                <scope>runtime</scope>
             </dependency>
-            <!-- Jetty is needed to run Handle Server (and tests in some modules)
-                 Solr and Handle Server disagree on version of Jetty, so we force a specific version here. -->
+            <!-- Jetty is ONLY needed to run Handle Server from commandline ONLY. Therefore, a runtime dependency. -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-server</artifactId>
                 <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-alpn-java-server</artifactId>
-                <version>${jetty.version}</version>
-            </dependency>
+            <!-- The below Jetty dependency versions are only specified to avoid various dependency convergence errors
+                 between Solr, CNRI Handle Server, and Jetty-Server (see above). We do NOT use Jetty directly. -->
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-deploy</artifactId>
                 <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-http</artifactId>
                 <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-io</artifactId>
                 <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
                 <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-servlets</artifactId>
-                <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-util</artifactId>
                 <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-webapp</artifactId>
                 <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-xml</artifactId>
-                <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty.http2</groupId>
                 <artifactId>http2-common</artifactId>
                 <version>${jetty.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.eclipse.jetty.http2</groupId>
-                <artifactId>http2-server</artifactId>
-                <version>${jetty.version}</version>
+                <scope>runtime</scope>
             </dependency>
 
             <dependency>
@@ -1465,12 +1457,12 @@
             <dependency>
                 <groupId>commons-cli</groupId>
                 <artifactId>commons-cli</artifactId>
-                <version>1.6.0</version>
+                <version>1.9.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.16.0</version>
+                <version>1.17.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -1488,39 +1480,46 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-configuration2</artifactId>
-                <version>2.10.1</version>
+                <version>2.11.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-dbcp2</artifactId>
-                <version>2.11.0</version>
-            </dependency>
-            <dependency>
-                <groupId>commons-fileupload</groupId>
-                <artifactId>commons-fileupload</artifactId>
-                <version>1.5</version>
+                <version>2.12.0</version>
+                <exclusions>
+                    <!-- Newer version is pulled in by Hibernate -->
+                    <exclusion>
+                        <groupId>jakarta.transaction</groupId>
+                        <artifactId>jakarta.transaction-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.15.1</version>
+                <version>2.17.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
-                <version>3.14.0</version>
+                <version>3.17.0</version>
             </dependency>
-            <!-- NOTE: We don't use commons-logging or commons-compress directly,
+            <!-- NOTE: We don't use commons-logging, commons-compress or commons-csv directly,
                  but many dependencies rely on them. Only here specified to avoid dependency convergence issues. -->
             <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging</artifactId>
-                <version>1.3.0</version>
+                <version>1.3.4</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-compress</artifactId>
-                <version>1.26.0</version>
+                <version>1.27.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-csv</artifactId>
+                <version>1.12.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -1530,12 +1529,12 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.10.0</version>
+                <version>1.12.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-validator</groupId>
                 <artifactId>commons-validator</artifactId>
-                <version>1.7</version>
+                <version>1.9.0</version>
             </dependency>
             <dependency>
                 <groupId>joda-time</groupId>
@@ -1543,14 +1542,32 @@
                 <version>2.12.5</version>
             </dependency>
             <dependency>
-                <groupId>com.sun.mail</groupId>
-                <artifactId>javax.mail</artifactId>
-                <version>1.6.2</version>
+                <groupId>jakarta.activation</groupId>
+                <artifactId>jakarta.activation-api</artifactId>
+                <version>2.1.3</version>
+            </dependency>
+            <!-- Jakarta mail API definition -->
+            <dependency>
+                <groupId>jakarta.mail</groupId>
+                <artifactId>jakarta.mail-api</artifactId>
+                <version>2.1.3</version>
+                <scope>provided</scope>
+            </dependency>
+            <!-- Jakarta mail default implementation/provider -->
+            <dependency>
+                <groupId>org.eclipse.angus</groupId>
+                <artifactId>jakarta.mail</artifactId>
+                <version>2.0.3</version>
             </dependency>
             <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>javax.servlet-api</artifactId>
-                <version>3.1.0</version>
+                <groupId>jakarta.servlet</groupId>
+                <artifactId>jakarta.servlet-api</artifactId>
+                <version>6.1.0</version>
+            </dependency>
+            <dependency>
+                <groupId>jakarta.el</groupId>
+                <artifactId>jakarta.el-api</artifactId>
+                <version>5.0.1</version>
             </dependency>
 
             <!-- Jaxen is needed by xoai and sword2-server, but they disagree on the versions -->
@@ -1678,6 +1695,12 @@
                 <version>${errorprone.version}</version>
                 <scope>compile</scope>
             </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>${errorprone.version}</version>
+                <scope>compile</scope>
+            </dependency>
             <!-- JUnit, Mockito and Hamcrest are used for Unit/Integration tests -->
             <dependency>
                 <groupId>org.hamcrest</groupId>
@@ -1707,7 +1730,7 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>2.2.224</version>
+                <version>2.3.232</version>
                 <scope>test</scope>
             </dependency>
             <!-- Google Analytics -->
@@ -1762,11 +1785,6 @@
             </dependency>
 
             <!-- Converge miscellaneous transitive dependencies. -->
-            <dependency>
-                <groupId>com.fasterxml</groupId>
-                <artifactId>classmate</artifactId>
-                <version>1.6.0</version>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.core</groupId>
                 <artifactId>jackson-annotations</artifactId>
@@ -1782,6 +1800,11 @@
                 <artifactId>jackson-databind</artifactId>
                 <version>${jackson-databind.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson-databind.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -1798,6 +1821,12 @@
                 <groupId>xom</groupId>
                 <artifactId>xom</artifactId>
                 <version>1.3.9</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>xml-apis</groupId>
+                        <artifactId>xml-apis</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- json-path is needed by Spring HATEOAS -->
@@ -1816,8 +1845,8 @@
 
             <!-- JAXB API and implementation (no longer bundled as of Java 11) -->
             <dependency>
-                <groupId>javax.xml.bind</groupId>
-                <artifactId>jaxb-api</artifactId>
+                <groupId>jakarta.xml.bind</groupId>
+                <artifactId>jakarta.xml.bind-api</artifactId>
                 <version>${jaxb-api.version}</version>
             </dependency>
             <dependency>
@@ -1827,16 +1856,16 @@
                 <scope>runtime</scope>
             </dependency>
             <dependency>
-                <groupId>javax.annotation</groupId>
-                <artifactId>javax.annotation-api</artifactId>
-                <version>${javax-annotation.version}</version>
+                <groupId>jakarta.annotation</groupId>
+                <artifactId>jakarta.annotation-api</artifactId>
+                <version>${jakarta-annotation.version}</version>
             </dependency>
             <!-- mockito-inline and hibernate-ehcache pull in different versions of byte-buddy. Specify which we want. -->
             <!-- TODO: We might be able to remove this after hibernate-ehcache is replaced by hibernate-jcache -->
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
-                <version>1.11.13</version>
+                <version>1.15.10</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -1940,7 +1969,7 @@
         <connection>scm:git:git@github.com:DSpace/DSpace.git</connection>
         <developerConnection>scm:git:git@github.com:DSpace/DSpace.git</developerConnection>
         <url>git@github.com:DSpace/DSpace.git</url>
-        <tag>dspace-7_x</tag>
+        <tag>HEAD</tag>
     </scm>
 
 
@@ -1960,8 +1989,11 @@
     <repositories>
         <!-- Check Maven Central first (before other repos below) -->
         <repository>
-            <id>maven-central</id>
+            <id>central</id>
             <url>https://repo.maven.apache.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
         <!-- Enable access to artifacts in Sonatype's snapshot repo for Snapshots ONLY -->
         <repository>
@@ -1979,6 +2011,9 @@
         <repository>
             <id>handle.net</id>
             <url>https://handle.net/maven</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>
 </project>
diff --git a/src/main/license/LICENSES_THIRD_PARTY.properties b/src/main/license/LICENSES_THIRD_PARTY.properties
index e893f9b85e..e76edffc55 100644
--- a/src/main/license/LICENSES_THIRD_PARTY.properties
+++ b/src/main/license/LICENSES_THIRD_PARTY.properties
@@ -13,89 +13,17 @@
 # 1) PLEASE CHECK THE "[src]/LICENSES_THIRD_PARTY" FILE FOR SPECIFIC LICENSE NAMES!
 # 2) Also please add a link/URL to where you looked up the license
 
-# http://asm.ow2.org/
-asm--asm--3.1=BSD License
-
-# http://www.h2database.com/html/license.html
-com.h2database--h2--1.4.187=Mozilla Public License
-
-# https://projects.apache.org/projects/commons_jexl.html
-commons-jexl--commons-jexl--1.0=Apache Software License, Version 2.0
-
-concurrent--concurrent--1.3.4=Public Domain
-
-# http://dom4j.sourceforge.net/dom4j-1.6.1/license.html
-dom4j--dom4j--1.6.1=BSD License
-
-# http://jakarta.apache.org/regexp/
-jakarta-regexp--jakarta-regexp--1.4=Apache Software License, Version 2.0
-
-# https://java.net/projects/servlet-spec/
-javax.servlet--jsp-api--2.0=Common Development and Distribution License (CDDL)
-javax.servlet--jstl--1.2=Common Development and Distribution License (CDDL)
-javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL)
+# https://github.com/albfernandez/juniversalchardet/blob/main/LICENSE
+com.github.albfernandez--juniversalchardet--2.4.0=Mozilla Public License
 
 # https://github.com/jankotek/JDBM3
 jdbm--jdbm--1.0=Apache Software License, Version 2.0
 
-# https://github.com/hunterhacker/jdom/blob/master/LICENSE.txt
-# http://www.jdom.org/docs/faq.html#a0030
-jdom--jdom--1.0=JDOM License (Apache-style license)
-jdom--jdom--1.1.3=JDOM License (Apache-style license)
-
 # https://github.com/stephenc/jcip-annotations/blob/master/LICENSE.txt
 net.jcip--jcip-annotations--1.0=Apache Software License, Version 2.0
 
-# http://ant.apache.org/
-org.apache.ant--ant--1.7.0=Apache Software License, Version 2.0
-org.apache.ant--ant-launcher--1.7.0=Apache Software License, Version 2.0
-
-# http://zookeeper.apache.org/
-org.apache.zookeeper--zookeeper--3.4.6=Apache Software License, Version 2.0
-
-# http://jettison.codehaus.org/
-org.codehaus.jettison--jettison--1.1=Apache Software License, Version 2.0
-
-# DSpace Licenses are all BSD
-org.dspace--handle--6.2=BSD License
-org.dspace--jargon--1.4.25=BSD License
-org.dspace--mets--1.5.2=BSD License
-org.dspace--oclc-harvester2--0.1.12=BSD License
-
-# https://github.com/hibernate/hibernate-jpa-api
-org.hibernate.javax.persistence--hibernate-jpa-2.0-api--1.0.1.Final=Eclipse Public License
-
-# Swingworker: https://java.net/projects/swingworker
-org.jdesktop--swing-worker--1.1=GNU Lesser General Public License (LGPL)
-
-# https://java.net/projects/tiger-types
-org.jvnet--tiger-types--1.4=Common Development and Distribution License (CDDL)
-
-# https://maven-repository.com/
-org.restlet.jee--org.restlet--2.1.1=Apache Software License, Version 2.0
-org.restlet.jee--org.restlet.ext.servlet--2.1.1=Apache Software License, Version 2.0
-
-# http://swordapp.org/
-org.swordapp--sword-common--1.1=Apache Software License, Version 2.0
-
-# Apache Jakarta ORO: http://svn.apache.org/repos/asf/jakarta/oro/trunk/LICENSE
-oro--oro--2.0.8=Apache Software License, Version 2.0
-
-# http://rometools.org/
-rome--rome--1.0=Apache Software License, Version 2.0
-
-# https://tomcat.apache.org/taglibs/license.html
-taglibs--standard--1.1.2=Apache Software License, Version 2.0
-
-# Apache XML (xalan): http://xml.apache.org/xalan-j/#license
-xalan--xalan--2.7.0=Apache Software License, Version 2.0
-
-# Apache Xerces: http://xerces.apache.org/
-xerces--xmlParserAPIs--2.6.2=Apache Software License, Version 2.0
-
-# Apache XML Commons: http://xerces.apache.org/xml-commons/licenses.html
-xml-apis--xml-apis--1.4.01=Apache Software License, Version 2.0
-xml-apis--xmlParserAPIs--2.0.2=Apache Software License, Version 2.0
-
-# http://www.xom.nu/
-xom--xom--1.1=GNU Lesser General Public License (LGPL)
+# Jersey is dual licensed EPL and GPL. We use EPL
+# https://eclipse-ee4j.github.io/jersey.github.io/license.html
+org.glassfish.jersey.core--jersey-client--3.1.5=Eclipse Public License
+org.glassfish.jersey.inject--jersey-hk2--3.1.5=Eclipse Public License
+org.glassfish.jersey.media--jersey-media-multipart--3.1.3=Eclipse Public License
\ No newline at end of file