hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'coar-notify-7' of https://bitbucket.org/4Science/dspace-cris into CST-10640_new

Browse Source
This commit is contained in:
Andrea Bollini
2023-11-11 17:39:39 +01:00
parent c0d3b21732 f2cc19f4a1
commit af0686d50f
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/qaevent/service/impl/QAEventServiceImpl.java
View File

@@ -85,7 +85,7 @@ public class QAEventServiceImpl implements QAEventService {
@Autowired @Autowired
private QAEventsDaoImpl qaEventsDao; private QAEventsDaoImpl qaEventsDao;
@Autowired @Autowired(required = false)
@Qualifier("qaAutomaticProcessingMap") @Qualifier("qaAutomaticProcessingMap")
private Map<String, QAEventAutomaticProcessingEvaluation> qaAutomaticProcessingMap; private Map<String, QAEventAutomaticProcessingEvaluation> qaAutomaticProcessingMap;

4
dspace-server-webapp/src/test/java/org/dspace/app/rest/SubmissionCOARNotifyRestRepositoryIT.java
View File

@@ -42,7 +42,7 @@ public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerInte
.andExpect(content().contentType(contentType)) .andExpect(content().contentType(contentType))
.andExpect(jsonPath("$._embedded.submissioncoarnotifyconfigs", Matchers.containsInAnyOrder( .andExpect(jsonPath("$._embedded.submissioncoarnotifyconfigs", Matchers.containsInAnyOrder(
SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify", SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify",
List.of("review", "endorsement", "ingest")) List.of("request-review", "request-endorsement", "request-ingest"))
))); )));
} }
@@ -69,7 +69,7 @@ public class SubmissionCOARNotifyRestRepositoryIT extends AbstractControllerInte
.andExpect(content().contentType(contentType)) .andExpect(content().contentType(contentType))
.andExpect(jsonPath("$", Matchers.is( .andExpect(jsonPath("$", Matchers.is(
SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify", SubmissionCOARNotifyMatcher.matchCOARNotifyEntry("coarnotify",
List.of("review", "endorsement", "ingest")) List.of("request-review", "request-endorsement", "request-ingest"))
))); )));
} }

6
dspace/config/spring/api/coar-notify.xml
View File

@@ -10,9 +10,9 @@
<map> <map>
<entry key="coarnotify"> <entry key="coarnotify">
<list> <list>
<value>review</value> <value>request-review</value>
<value>endorsement</value> <value>request-endorsement</value>
<value>ingest</value> <value>request-ingest</value>
</list> </list>
</entry> </entry>
</map> </map>