Merged in task/dspace-cris-2024_02_x/DSC-2456 (pull request DSpace#4325)

vins01-4science · AdamF42 · commit 60bebb604143 · 2025-07-25T09:04:57.000Z
DSC-2456

Approved-by: Fapohunda, Adamo
diff --git a/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/transform/StringJsonValueMappingMetadataProcessorService.java b/dspace-api/src/main/java/org/dspace/importer/external/metadatamapping/transform/StringJsonValueMappingMetadataProcessorService.java
@@ -7,8 +7,6 @@
  */
 package org.dspace.importer.external.metadatamapping.transform;
 
-import static java.util.Optional.ofNullable;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Optional;
@@ -45,13 +43,13 @@ public class StringJsonValueMappingMetadataProcessorService implements JsonPathM
     @Override
     public Collection<String> processMetadata(String json) {
         JsonNode rootNode = convertStringJsonToJsonNode(json);
-        Optional<JsonNode> abstractNode = Optional.of(rootNode.at(path));
-        Collection<String> values = new ArrayList<>();
+        Optional<JsonNode> abstractNode = Optional.ofNullable(rootNode.at(path));
+        Collection<String> values = new ArrayList<>(1);
 
         if (abstractNode.isPresent() && abstractNode.get().getNodeType().equals(JsonNodeType.STRING)) {
 
             String stringValue = abstractNode.get().asText();
-            values.add(ofNullable(stringValue)
+            values.add(Optional.ofNullable(stringValue)
                          .map(value -> valueMapConverter != null ? valueMapConverter.getValue(value) : value)
                          .orElse(valueMapConverter.getValue(null)));
         }
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
@@ -162,8 +162,8 @@ private ArrayList<ImportRecord> getRecords() {
                 "State of Awareness of Freshers’ Groups Chortkiv State"
                 + " Medical College of Prevention of Iodine Deficiency Diseases");
         MetadatumDTO author = createMetadatumDTO("dc", "contributor", "author", "Senyuk, L.V.");
-        // is expected the dc.type to be mapped from journal-article to Article
-        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "Article");
+        // is expected the dc.type to be mapped from journal-article to text::journal::journal article
+        MetadatumDTO type = createMetadatumDTO("dc", "type", null, "text::journal::journal article");
         MetadatumDTO date = createMetadatumDTO("dc", "date", "issued", "2016-05-19");
         MetadatumDTO ispartof = createMetadatumDTO("dc", "relation", "ispartof",
                                    "Ukraïnsʹkij žurnal medicini, bìologìï ta sportu");
@@ -192,8 +192,8 @@ private ArrayList<ImportRecord> getRecords() {
         MetadatumDTO title2 = createMetadatumDTO("dc", "title", null,
                 "Ischemic Heart Disease and Role of Nurse of Cardiology Department");
         MetadatumDTO author2 = createMetadatumDTO("dc", "contributor", "author", "Kozak, K. І.");
-        // is expected the dc.type to be mapped from journal-article to Article
-        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "Article");
+        // is expected the dc.type to be mapped from journal-article to text::journal::journal article
+        MetadatumDTO type2 = createMetadatumDTO("dc", "type", null, "text::journal::journal article");
         MetadatumDTO date2 = createMetadatumDTO("dc", "date", "issued", "2016-05-19");
         MetadatumDTO ispartof2 = createMetadatumDTO("dc", "relation", "ispartof",
                                      "Ukraïnsʹkij žurnal medicini, bìologìï ta sportu");
diff --git a/dspace-server-webapp/src/test/java/org/dspace/authority/CrisConsumerIT.java b/dspace-server-webapp/src/test/java/org/dspace/authority/CrisConsumerIT.java
@@ -685,7 +685,6 @@ public void testItemWithWillBeGeneratedAuthority() throws Exception {
             .build();
 
         Item publication = ItemBuilder.createItem(context, publicationCollection)
-            .withEntityType("Publication")
             .withAuthor("Walter White", AuthorityValueService.GENERATE + "ORCID::0000-0002-9079-593X")
             .build();
 
@@ -714,7 +713,6 @@ public void testItemWithWillBeGeneratedAuthorityAndNoRelatedItemFound() throws E
         createCollection("Collection of persons", "Person", subCommunity);
 
         Item publication = ItemBuilder.createItem(context, publicationCollection)
-            .withEntityType("Publication")
             .withAuthor("Walter White", AuthorityValueService.GENERATE + "ORCID::0000-0002-9079-593X")
             .build();
 
@@ -745,7 +743,6 @@ public void testItemWithWillBeReferencedAuthority() throws Exception {
             .build();
 
         Item publication = ItemBuilder.createItem(context, publicationCollection)
-            .withEntityType("Publication")
             .withAuthor("Walter White", AuthorityValueService.REFERENCE + "ORCID::0000-0002-9079-593X")
             .build();
 
@@ -776,7 +773,6 @@ public void testItemWithWillBeReferencedAuthorityAndNoRelatedItemFound() throws
         createCollection("Collection of persons", "Person", subCommunity);
 
         Item publication = ItemBuilder.createItem(context, publicationCollection)
-            .withEntityType("Publication")
             .withAuthor("Walter White", AuthorityValueService.REFERENCE + "ORCID::0000-0002-9079-593X")
             .build();
 
@@ -1040,7 +1036,6 @@ public void testItemWithWillBeReferencedAuthorityAndValueOverwriting() throws Ex
             .build();
 
         Item publication = ItemBuilder.createItem(context, publicationCollection)
-            .withEntityType("Publication")
             .withAuthor("Walter White", AuthorityValueService.REFERENCE + "ORCID::0000-0002-9079-593X")
             .build();
 
diff --git a/dspace/config/crosswalks/mapConverter-crossref-to-coar-publication-type.properties b/dspace/config/crosswalks/mapConverter-crossref-to-coar-publication-type.properties
@@ -0,0 +1,29 @@
+# based on Crossref content type at https://crossref.gitlab.io/knowledge_base/docs/topics/content-types/#types-in-cayenne-rest-api
+# Mapping between work type supported by Crossref and the COAR common publication's types
+journal-article = text::journal::journal article
+journal-issue = text::journal::other periodical
+journal-volume = text::journal::other periodical
+journal = text::journal
+proceedings-article = text::conference output::conference paper
+proceedings = text::conference output
+dataset = other
+component = other
+report = text::report
+report-series = other
+standard = other
+standard-series = other
+edited-book = other
+monograph = other
+reference-book = other
+book = text::book
+book-series = other
+book-set = other
+book-chapter = text::book::book part
+book-section = text::book::book part
+book-part = text::book::book part
+book-track = other
+reference-entry = other
+dissertation = text::thesis
+posted-content = other
+peer-review = text::review::peer review
+other = other
diff --git a/dspace/config/spring/api/crossref-integration.xml b/dspace/config/spring/api/crossref-integration.xml
@@ -49,13 +49,13 @@
         <constructor-arg value="dc.relation.ispartof"/>
     </bean>
 
-    <bean name="mapConverterCrossRefToDSpacePublicationType" class="org.dspace.util.SimpleMapConverter" init-method="init">
-        <property name="converterNameFile" value="mapConverter-crossref-to-dspace-publication-type.properties" />
+    <bean name="mapConverterCrossRefToCoarPublicationType" class="org.dspace.util.SimpleMapConverter" init-method="init">
+        <property name="converterNameFile" value="mapConverter-crossref-to-coar-publication-type.properties" />
         <property name="configurationService" ref="org.dspace.services.ConfigurationService" />
-        <property name="defaultValue" value="Other"/>
+        <property name="defaultValue" value="other"/>
     </bean>
     <bean id="crossrefTypeValueMapping" class="org.dspace.importer.external.metadatamapping.transform.StringJsonValueMappingMetadataProcessorService">
-        <property name="valueMapConverter" ref="mapConverterCrossRefToDSpacePublicationType"/>
+        <property name="valueMapConverter" ref="mapConverterCrossRefToCoarPublicationType"/>
         <property name="path" value="/type"/>
     </bean>
     <bean id="crossrefDoiTypeContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
