From 9149133d101aecd9d306fc71a02751ebaae707ea Mon Sep 17 00:00:00 2001
From: Yana De Pauw <yana@atmire.com>
Date: Tue, 1 Oct 2024 11:16:39 +0200
Subject: [PATCH] 118436: Update live import mapping for additional import
 sources

---
 .../OpenAIREPublicationFieldMapping.java      |   4 +-
 .../external/ror/service/RorFieldMapping.java |   4 +-
 .../api/live-import-metadata-field-config.xml |  36 ++++
 .../spring/api/openaire-integration.xml       | 176 +++---------------
 dspace/config/spring/api/ror-integration.xml  |  75 +++-----
 5 files changed, 83 insertions(+), 212 deletions(-)

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
index cf326fb63d71..663485cbdb17 100644
--- 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
@@ -7,7 +7,7 @@
  */
 package org.dspace.importer.external.openaire.metadatamapping;
 
-import java.util.Map;
+import java.util.List;
 
 import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
@@ -23,7 +23,7 @@ public class OpenAIREPublicationFieldMapping extends AbstractMetadataFieldMappin
 
     @Override
     @Resource(name = "openairePublicationsMetadataFieldMap")
-    public void setMetadataFieldMap(Map metadataFieldMap) {
+    public void setMetadataFieldMap(List metadataFieldMap) {
         super.setMetadataFieldMap(metadataFieldMap);
     }
 }
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
index 3096a92f95dd..62c8c4d555cc 100644
--- 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
@@ -7,7 +7,7 @@
  */
 package org.dspace.importer.external.ror.service;
 
-import java.util.Map;
+import java.util.List;
 
 import jakarta.annotation.Resource;
 import org.dspace.importer.external.metadatamapping.AbstractMetadataFieldMapping;
@@ -31,7 +31,7 @@ public class RorFieldMapping extends AbstractMetadataFieldMapping {
      */
     @Override
     @Resource(name = "rorMetadataFieldMap")
-    public void setMetadataFieldMap(Map metadataFieldMap) {
+    public void setMetadataFieldMap(List metadataFieldMap) {
         super.setMetadataFieldMap(metadataFieldMap);
     }
 
diff --git a/dspace/config/spring/api/live-import-metadata-field-config.xml b/dspace/config/spring/api/live-import-metadata-field-config.xml
index 02023e0d355e..bc935b820634 100644
--- a/dspace/config/spring/api/live-import-metadata-field-config.xml
+++ b/dspace/config/spring/api/live-import-metadata-field-config.xml
@@ -147,4 +147,40 @@
         <constructor-arg value="person.identifier.rid"/>
     </bean>
 
+    <bean id="organization.legalName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.legalName"/>
+    </bean>
+
+    <bean id="organization.identifier.ror" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.identifier.ror"/>
+    </bean>
+
+    <bean id="organization.alternateName" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.alternateName"/>
+    </bean>
+
+    <bean id="organization.url" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.url"/>
+    </bean>
+
+    <bean id="organization.address.addressCountry" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.address.addressCountry"/>
+    </bean>
+
+    <bean id="organization.foundingDate" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.foundingDate"/>
+    </bean>
+
+    <bean id="organization.identifier.crossrefid" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.identifier.crossrefid"/>
+    </bean>
+
+    <bean id="organization.identifier.isni" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.identifier.isni"/>
+    </bean>
+    
+    <bean id="organization.parentOrganization" class="org.dspace.importer.external.metadatamapping.MetadataFieldConfig">
+        <constructor-arg value="organization.parentOrganization"/>
+    </bean>
+
 </beans>
diff --git a/dspace/config/spring/api/openaire-integration.xml b/dspace/config/spring/api/openaire-integration.xml
index 8e4becddc5cb..af12d1ed401a 100644
--- a/dspace/config/spring/api/openaire-integration.xml
+++ b/dspace/config/spring/api/openaire-integration.xml
@@ -11,98 +11,71 @@
     <context:annotation-config/>
     <!-- allows us to use spring annotations in beans -->
 
-    <util:map id="openairePublicationsMetadataFieldMap" key-type="org.dspace.importer.external.metadatamapping.MetadataFieldConfig"
+    <util:list id="openairePublicationsMetadataFieldMap"
               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>
+        <description>Defines which metadatum is mapped on which metadatum.</description>
+        <ref bean="openaireTitleContrib"/>
+        <ref bean="openaireSummaryContrib"/>
+        <ref bean="openairePublishedContrib"/>
+        <ref bean="openaireDoiContrib"/>
+        <ref bean="openaireJournalContrib"/>
+        <ref bean="openaireCategoryTermContrib"/>
+        <ref bean="openaireAuthorContrib"/>
+        <ref bean="openaireOtherContrib"/>
+    </util:list>
 
 
     <bean id="openaireOtherContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleXpathMetadatumContributor">
-        <property name="field" ref="openaire.identifier.other"/>
+        <property name="field" ref="dc.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="field" ref="dc.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="field" ref="dc.description.abstract"/>
         <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="field" ref="dc.date.issued"/>
         <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="field" ref="dc.identifier"/>
         <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="field" ref="dc.source"/>
         <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="field" ref="dc.subject"/>
         <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="field" ref="dc.contributor.author"/>
         <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">
@@ -111,117 +84,10 @@
         <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
+</beans>
diff --git a/dspace/config/spring/api/ror-integration.xml b/dspace/config/spring/api/ror-integration.xml
index ff554612052e..6ce9ef576487 100644
--- a/dspace/config/spring/api/ror-integration.xml
+++ b/dspace/config/spring/api/ror-integration.xml
@@ -11,101 +11,70 @@
     <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>
+     <util:list id="rorMetadataFieldMap" value-type="org.dspace.importer.external.metadatamapping.contributor.MetadataContributor">
+        <ref bean="rorTitleContrib"/>
+        <ref bean="rorIdentifierContrib"/>
+        <ref bean="rorLinksContrib"/>
+        <ref bean="rorTypesContrib"/>
+        <ref bean="rorAcronymContrib"/>
+        <ref bean="rorCountryContrib"/>
+        <ref bean="rorEstablishedContrib"/>
+        <ref bean="rorFundRefContrib"/>
+        <ref bean="rorISNIContrib"/>
+        <ref bean="rorParentContrib"/>
+    </util:list>
 
     <bean id="rorTitleContrib" class="org.dspace.importer.external.metadatamapping.contributor.SimpleJsonPathMetadataContributor">
-        <property name="field" ref="ror.title"/>
+        <property name="field" ref="organization.legalName"/>
         <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="field" ref="organization.identifier.ror"/>
         <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="field" ref="organization.alternateName"/>
         <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="field" ref="organization.url"/>
         <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="field" ref="dc.type"/>
         <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="field" ref="organization.address.addressCountry"/>
         <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="field" ref="organization.foundingDate"/>
         <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="field" ref="organization.identifier.crossrefid"/>
         <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="field" ref="organization.identifier.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="field" ref="organization.parentOrganization"/>
         <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>