Merged in task/dspace-cris-2023_02_x/DSC-2304 (pull request DSpace#5122)

fix(DOI): Fixes NULLPointer during discard of submission with DOI. Adds doi configuration for submissions and edits the datacite template

Approved-by: Fapohunda, Adamo

Author: vins01-4science

dspace-api/src/main/java/org/dspace/identifier/DOIIdentifierProvider.java

@@ -1040,16 +1040,20 @@ public String getDOIOutOfObject(Context context, DSpaceObject dso) throws DOIIde
         List<MetadataValue> metadata = itemService.getMetadata(item, MD_SCHEMA, DOI_ELEMENT, DOI_QUALIFIER, null);
         String resolverBaseUrl = getResolverBaseUrl(context, item);
         for (MetadataValue id : metadata) {
-            if (id.getValue().startsWith(resolverBaseUrl)) {
+            if (resolverBaseUrl != null && id.getValue().startsWith(resolverBaseUrl)) {
                 return doiService.DOIFromExternalFormat(id.getValue());
             }
         }
         return null;
     }
 
     private String getResolverBaseUrl(Context context, Item item) {
-        return DoiGenerationStrategy.getApplicableStrategy(context, doiGenerationStrategies, item)
-                                    .getDOIResolverAndPrefix(context, item, getPrefix());
+        DoiGenerationStrategy applicableStrategy =
+            DoiGenerationStrategy.getApplicableStrategy(context, doiGenerationStrategies, item);
+        if (applicableStrategy != null) {
+            return applicableStrategy.getDOIResolverAndPrefix(context, item, getPrefix());
+        }
+        return null;
     }
 
     /**

dspace/config/crosswalks/template/publication-datacite-xml.template

@@ -31,6 +31,9 @@
   <titles>
     <title>@dc.title@</title>
   </titles>
+  @if.not.metadata.dc-publisher.start@
+   <publisher>(:unav)</publisher>
+  @if.not.metadata.dc-publisher.end@
   @if.metadata.dc-publisher.start@
   <publisher
   @relation.dc-publisher.start@

dspace/config/dspace.cfg

@@ -992,6 +992,7 @@ org.dspace.app.batchitemimport.work.dir = ${dspace.dir}/imports
 # Following are configuration values for the EZID DOI provider, with appropriate
 # values for testing.  Replace the values with your assigned "shoulder" and
 # credentials.
+doi.datacite.host = mds.test.datacite.org
 #identifier.doi.ezid.shoulder = 10.5072/FK2/
 #identifier.doi.ezid.user = apitest
 #identifier.doi.ezid.password = apitest
@@ -1988,6 +1989,16 @@ system-event.thread.size = 2
 #------------------------------------------------------------------#
 orchestrator.ignore-script = process-cleaner, item-export, bulk-item-export, cris-layout-tool, export-cris-layout-tool, deduplication-merge-items, bulk-access-control, export-schema, dspace-object-deletion
 
+#------------------------------------------------------------------#
+#----------------DOI GENERATOR CONFIGURATIONS-----------------------#
+#------------------------------------------------------------------#
+#                                                                  #
+# Configurations for the DOI Generator Module                      #
+#                                                                  #
+#------------------------------------------------------------------#
+# Handle of the pulication collection where DOIs will be registered during submission
+# doi.generator.collection.publication.handle = 123456789/xxxx
+
 # Load default module configs
 # ----------------------------
 # To exclude a module configuration, simply comment out its "include" statement.

dspace/config/spring/api/identifier-service.xml

@@ -9,8 +9,7 @@
     -->
     <bean id="org.dspace.identifier.service.IdentifierService"
           class="org.dspace.identifier.IdentifierServiceImpl"
-          autowire="byType"
-          scope="singleton">
+          autowire="byType">
     </bean>
 
     <!-- If you disable versioning, you need to use the default HandleIdentifierProvider. -->
@@ -20,11 +19,11 @@
     </bean>
     -->
 
-      <!-- If you enabled versioning, you should use one of the versioned
-           handle identifier provider instead of the default one.
-           The VersionedHandleIdentifierProvider creates a new versioned
-           handle for every new version.
-           -->
+    <!-- If you enabled versioning, you should use one of the versioned
+         handle identifier provider instead of the default one.
+         The VersionedHandleIdentifierProvider creates a new versioned
+         handle for every new version.
+         -->
     <bean id="org.dspace.identifier.HandleIdentifierProvider" class="org.dspace.identifier.VersionedHandleIdentifierProvider" scope="singleton">
         <property name="configurationService" ref="org.dspace.services.ConfigurationService"/>
     </bean>
@@ -101,10 +100,10 @@
     -->
     <!-- Uncomment this to use the DataCite API directly as DOIConnector.
     <bean id="org.dspace.identifier.doi.DOIConnector"
-        class="org.dspace.identifier.doi.DataCiteConnector"
-        scope="singleton">
+          class="org.dspace.identifier.doi.DataCiteConnector"
+          scope="singleton">
         <property name='DATACITE_SCHEME' value='https'/>
-        <property name='DATACITE_HOST' value='mds.test.datacite.org'/>
+        <property name='DATACITE_HOST' value='${doi.datacite.host}'/>
         <property name='DATACITE_DOI_PATH' value='/doi/' />
         <property name='DATACITE_METADATA_PATH' value='/metadata/' />
         <property name='disseminationCrosswalkByEntityType'>
@@ -165,9 +164,7 @@
         <property name="configurationValue" value="${identifier.doi.namespaceseparator}" />
     </bean>
 
-    &lt;!&ndash; Below there are defined the generation strategy &ndash;&gt;
     <bean id="defaultDoiGenerationStrategy" class="org.dspace.identifier.generators.ConfigurableDoiGenerationStrategy">
-        &lt;!&ndash; Filter configured in item-filters.xml file &ndash;&gt;
         <constructor-arg name="filter" ref="always_true_filter" />
         <constructor-arg name="doiNamespaceGenerator" ref="defaultValueNamespace" />
         <constructor-arg name="generationType" value="DEFAULT" />
@@ -181,7 +178,7 @@
             <map>
                 <entry key="collections">
                     <list>
-                        <value>123456789/6</value>
+                        <value>${doi.generator.collection.publication.handle:-}</value>
                     </list>
                 </entry>
             </map>
@@ -190,17 +187,19 @@
     <bean id="publicationFilter" class="org.dspace.content.logic.DefaultFilter">
         <property name="statement" ref="publicationCollectionCond"/>
     </bean>
+    <bean id="publicationDOIGenerationStrategy" class="org.dspace.identifier.generators.ConfigurableDoiGenerationStrategy">
+        <constructor-arg name="filter" ref="publicationFilter" />
+        <constructor-arg name="doiNamespaceGenerator" ref="defaultValueNamespace" />
+        <constructor-arg name="generationType" value="CUSTOM" />
+    </bean>
+    -->
+<!--
 
     <bean id="publicationGenerator" class="org.dspace.identifier.generators.FixedConfigurationValueNamespaceGenerator">
         <property name="configurationValue" value="publications/dspace-local/" />
     </bean>
 
-    <bean id="thesisDoiGenerationStrategy" class="org.dspace.identifier.generators.ConfigurableDoiGenerationStrategy">
-        <constructor-arg name="filter" ref="publicationFilter" />
-        <constructor-arg name="doiNamespaceGenerator" ref="publicationGenerator" />
-        <constructor-arg name="generationType" value="CUSTOM" />
-    </bean>
-    -->
+-->
     <!-- CUSTOM GENERATORS -->
 
 </beans>

dspace/config/spring/api/item-filters.xml

@@ -94,7 +94,7 @@
         <property name="parameters">
             <map>
                 <entry key="field" value="dc.identifier.uri" />
-                <entry key="pattern" value="10.12345/" />
+                <entry key="pattern" value="${identifier.doi.prefix:10\.12345}\/" />
             </map>
         </property>
     </bean>