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 index 7f3a29e895..5584f9f8ab 100644 --- 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 @@ -78,7 +78,7 @@ public class QAEventServiceImpl implements QAEventService { @Autowired private QAEventsDaoImpl qaEventsDao; - @Autowired(required=false) + @Autowired(required = false) @Qualifier("qaAutomaticProcessingMap") private Map qaAutomaticProcessingMap; 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 index 89c2a0cbea..65ec92b99f 100644 --- 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 @@ -30,7 +30,7 @@ public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerInte @Test public void findAllTestUnAuthorized() throws Exception { getClient().perform(get("/api/config/submissioncoarnotifyconfigs")) - .andExpect(status().isUnauthorized()); + .andExpect(status().isUnauthorized()); } @Test @@ -38,18 +38,18 @@ public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerInte 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("review", "endorsement", "ingest")) - ))); + .andExpect(status().isOk()) + .andExpect(content().contentType(contentType)) + .andExpect(jsonPath("$._embedded.submissioncoarnotifyconfigs", Matchers.containsInAnyOrder( + SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify", + List.of("request-review", "request-endorsement", "request-ingest")) + ))); } @Test public void findOneTestUnAuthorized() throws Exception { getClient().perform(get("/api/config/submissioncoarnotifyconfigs/coarnotify")) - .andExpect(status().isUnauthorized()); + .andExpect(status().isUnauthorized()); } @Test @@ -57,7 +57,7 @@ public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerInte String epersonToken = getAuthToken(eperson.getEmail(), password); getClient(epersonToken).perform(get("/api/config/submissioncoarnotifyconfigs/non-existing-coar")) - .andExpect(status().isNotFound()); + .andExpect(status().isNotFound()); } @Test @@ -65,12 +65,12 @@ public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerInte 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("review", "endorsement", "ingest")) - ))); + .andExpect(status().isOk()) + .andExpect(content().contentType(contentType)) + .andExpect(jsonPath("$", Matchers.is( + SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify", + List.of("request-review", "request-endorsement", "request-ingest")) + ))); } } diff --git a/dspace/config/spring/api/coar-notify.xml b/dspace/config/spring/api/coar-notify.xml index 1d2d18f6f7..a93950f037 100644 --- a/dspace/config/spring/api/coar-notify.xml +++ b/dspace/config/spring/api/coar-notify.xml @@ -10,9 +10,9 @@ - review - endorsement - ingest + request-review + request-endorsement + request-ingest