Merge branch 'dspace-cris-2023_02_x' into main-cris

# Conflicts: # dspace-api/pom.xml # dspace-iiif/pom.xml # dspace-oai/pom.xml # dspace-rdf/pom.xml # dspace-rest/pom.xml # dspace-server-webapp/pom.xml # dspace-services/pom.xml # dspace-sword/pom.xml # dspace-swordv2/pom.xml # dspace/modules/additions/pom.xml # dspace/modules/pom.xml # dspace/modules/rest/pom.xml # dspace/modules/server-boot/pom.xml # dspace/modules/server/pom.xml # dspace/pom.xml # pom.xml
4Science · Mar 12, 2024 · 73beed3 · 73beed3
2 parents 029adbc + cae9dfe
commit 73beed3
Show file tree

Hide file tree

Showing 21 changed files with 2,984 additions and 402 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/content/authority/DSpaceControlledVocabulary.java b/dspace-api/src/main/java/org/dspace/content/authority/DSpaceControlledVocabulary.java
@@ -93,6 +93,7 @@ public boolean isPublic() {
 
     @Override
     public boolean storeAuthorityInMetadata() {
+        init();
         return storeAuthority;
     }
 

diff --git a/dspace-api/src/main/java/org/dspace/content/enhancer/impl/RelatedEntityItemEnhancer.java b/dspace-api/src/main/java/org/dspace/content/enhancer/impl/RelatedEntityItemEnhancer.java
diff --git a/dspace-api/src/test/data/dspaceFolder/config/local.cfg b/dspace-api/src/test/data/dspaceFolder/config/local.cfg
@@ -226,4 +226,5 @@ choices.presentation.dspace.object.owner = suggest
 authority.controlled.dspace.object.owner = true
 
 # force the event system to work synchronously during test
-system-event.thread.size = 0
+system-event.thread.size = 0
+vocabulary.plugin.srsc-noauthority.authority.store = false
diff --git a/...ce-api/src/test/data/dspaceFolder/config/spring/api/extra-metadata-enhancers-for-test.xml b/...ce-api/src/test/data/dspaceFolder/config/spring/api/extra-metadata-enhancers-for-test.xml
@@ -0,0 +1,40 @@
+<?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-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 />
+
+    <bean class="org.dspace.content.enhancer.impl.RelatedEntityItemEnhancer" >
+        <property name="sourceEntityType" value="TestEntity" />
+        <property name="sourceItemMetadataFields">
+            <list>
+                <value>dc.contributor.author</value>
+                <value>dc.contributor.editor</value>
+            </list>
+        </property>
+        <property name="relatedItemMetadataFields">
+            <list>
+                <value>person.affiliation.name</value>
+                <value>person.identifier.orcid</value>
+            </list>
+        </property>
+        <property name="virtualQualifier" value="testmultival" />
+    </bean>
+
+</beans>
diff --git a/dspace-api/src/test/java/org/dspace/app/bulkimport/service/BulkImportWorkbookBuilderIT.java b/dspace-api/src/test/java/org/dspace/app/bulkimport/service/BulkImportWorkbookBuilderIT.java
@@ -221,7 +221,7 @@ public void testWorkbookBuildingFromItemDtos() throws Exception {
             with("dc.contributor.author", "White, Walter", authorId, 600),
             with("oairecerif.author.affiliation", PLACEHOLDER_PARENT_METADATA_VALUE),
             with("cris.virtual.department", PLACEHOLDER_PARENT_METADATA_VALUE),
-            with("cris.virtual.author-orcid", PLACEHOLDER_PARENT_METADATA_VALUE)));
+            with("cris.virtual.orcid", PLACEHOLDER_PARENT_METADATA_VALUE)));
 
         assertThat(getItemBitstreamsByBundle(firstItem, "ORIGINAL"), contains(
             bitstreamWith("Bitstream 1", "First bitstream content"),
@@ -242,8 +242,8 @@ public void testWorkbookBuildingFromItemDtos() throws Exception {
             with("oairecerif.author.affiliation", "Company", 1),
             with("cris.virtual.department", PLACEHOLDER_PARENT_METADATA_VALUE),
             with("cris.virtual.department", PLACEHOLDER_PARENT_METADATA_VALUE),
-            with("cris.virtual.author-orcid", PLACEHOLDER_PARENT_METADATA_VALUE),
-            with("cris.virtual.author-orcid", PLACEHOLDER_PARENT_METADATA_VALUE)
+            with("cris.virtual.orcid", PLACEHOLDER_PARENT_METADATA_VALUE),
+            with("cris.virtual.orcid", PLACEHOLDER_PARENT_METADATA_VALUE)
         ));
 
         assertThat(getItemBitstreamsByBundle(secondItem, "ORIGINAL"), contains(

diff --git a/dspace-api/src/test/java/org/dspace/app/matcher/MetadataValueMatcher.java b/dspace-api/src/test/java/org/dspace/app/matcher/MetadataValueMatcher.java
@@ -72,7 +72,8 @@ protected boolean matchesSafely(MetadataValue metadataValue) {
             Objects.equals(metadataValue.getMetadataField().toString('.'), field) &&
             Objects.equals(metadataValue.getLanguage(), language) &&
             Objects.equals(metadataValue.getAuthority(), authority) &&
-            Objects.equals(metadataValue.getPlace(), place) &&
+                (Objects.isNull(place)
+                        || Objects.equals(metadataValue.getPlace(), place)) &&
             Objects.equals(metadataValue.getConfidence(), confidence) &&
             Objects.equals(metadataValue.getSecurityLevel(), securityLevel);
     }
@@ -91,6 +92,10 @@ public static MetadataValueMatcher with(String field, String value) {
         return with(field, value, null, null, 0, -1);
     }
 
+    public static MetadataValueMatcher withNoPlace(String field, String value) {
+        return with(field, value, null, null, null, -1);
+    }
+
     public static MetadataValueMatcher withSecurity(String field, String value, Integer securityLevel) {
         return with(field, value, null, null, 0, -1, securityLevel);
     }