Merge pull request DSpace#11718 from 4Science/task/main/DURACOM-427

[DSpace-CRIS] Porting of authority framework functionalities (Backend)

Author: tdonohue

.github/workflows/build.yml

@@ -25,7 +25,7 @@ jobs:
           #  - surefire.rerunFailingTestsCount => try again for flakey tests, and keep track of/report on number of retries
           - type: "Unit Tests"
             java: 21
-            mvnflags: "-DskipUnitTests=false -Dsurefire.rerunFailingTestsCount=2"
+            mvnflags: "-Dtest.argLine=-Xmx2048m -DskipUnitTests=false -Dsurefire.rerunFailingTestsCount=2"
             resultsdir: "**/target/surefire-reports/**"
           # NOTE: ITs skip all code validation checks, as they are already done by Unit Test job.
           #  - enforcer.skip     => Skip maven-enforcer-plugin rules

dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java

@@ -43,6 +43,8 @@
 import org.dspace.content.RelationshipType;
 import org.dspace.content.WorkspaceItem;
 import org.dspace.content.authority.Choices;
+import org.dspace.content.authority.factory.ContentAuthorityServiceFactory;
+import org.dspace.content.authority.service.MetadataAuthorityService;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.CollectionService;
 import org.dspace.content.service.EntityService;
@@ -164,6 +166,9 @@ public class MetadataImport extends DSpaceRunnable<MetadataImportScriptConfigura
                                                                                    .getAuthorityValueService();
     protected ConfigurationService configurationService
             = DSpaceServicesFactory.getInstance().getConfigurationService();
+    protected MetadataAuthorityService metadataAuthorityService = ContentAuthorityServiceFactory
+        .getInstance()
+        .getMetadataAuthorityService();
 
     /**
      * Create an instance of the metadata importer. Requires a context and an array of CSV lines
@@ -1138,7 +1143,18 @@ protected BulkEditMetadataValue getBulkEditValueFromCSV(Context c, String langua
         dcv.setElement(element);
         dcv.setQualifier(qualifier);
         dcv.setLanguage(language);
-        if (fromAuthority != null) {
+
+        final StringBuilder builder = new StringBuilder();
+        builder.append(schema).append("_").append(element);
+
+        if (StringUtils.isNotEmpty(qualifier)) {
+            builder.append("_").append(qualifier);
+        }
+
+        boolean isAuthorityControlled = metadataAuthorityService.isAuthorityAllowed(builder.toString(),
+                Constants.ITEM, null);
+
+        if (fromAuthority != null && isAuthorityControlled) {
             if (value.indexOf(':') > 0) {
                 value = value.substring(0, value.indexOf(':'));
             }

dspace-api/src/main/java/org/dspace/app/sitemap/GenerateSitemaps.java

@@ -7,6 +7,7 @@
  */
 package org.dspace.app.sitemap;
 
+import static org.dspace.core.Constants.ENTITY_TYPE_NONE;
 import static org.dspace.discovery.SearchUtils.RESOURCE_TYPE_FIELD;
 
 import java.io.File;
@@ -266,8 +267,12 @@ public static void generateSitemaps(boolean makeHTMLMap, boolean makeSitemapOrg)
                     List<String> entityTypeFieldValues = discoverResult.getSearchDocument(doc).get(0)
                                             .getSearchFieldValues("search.entitytype");
                     if (CollectionUtils.isNotEmpty(entityTypeFieldValues)) {
-                        url = uiURLStem + "entities/" + StringUtils.lowerCase(entityTypeFieldValues.get(0)) + "/"
-                                + doc.getID();
+                        String entityType = StringUtils.lowerCase(entityTypeFieldValues.get(0));
+                        if (!ENTITY_TYPE_NONE.equalsIgnoreCase(entityType)) {
+                            url = uiURLStem + "entities/" + entityType + "/" + doc.getID();
+                        } else {
+                            url = uiURLStem + "items/" + doc.getID();
+                        }
                     } else {
                         url = uiURLStem + "items/" + doc.getID();
                     }

dspace-api/src/main/java/org/dspace/app/suggestion/SolrSuggestionStorageServiceImpl.java

@@ -44,6 +44,7 @@
 import org.dspace.content.dto.MetadataValueDTO;
 import org.dspace.content.service.ItemService;
 import org.dspace.core.Context;
+import org.dspace.core.exception.SQLRuntimeException;
 import org.dspace.services.factory.DSpaceServicesFactory;
 import org.dspace.util.UUIDUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +71,7 @@ public class SolrSuggestionStorageServiceImpl implements SolrSuggestionStorageSe
      * 
      * @return solr client
      */
-    protected SolrClient getSolr() {
+    public SolrClient getSolr() {
         if (solrSuggestionClient == null) {
             String solrService = DSpaceServicesFactory.getInstance().getConfigurationService()
                     .getProperty("suggestion.solr.server", "http://localhost:8983/solr/suggestion");
@@ -315,12 +316,18 @@ private Suggestion convertSolrDoc(Context context, SolrDocument solrDoc, String
 
         Suggestion suggestion = new Suggestion(sourceName, target, (String) solrDoc.getFieldValue(SUGGESTION_ID));
         suggestion.setDisplay((String) solrDoc.getFieldValue(DISPLAY));
-        suggestion.getMetadata()
-            .add(new MetadataValueDTO("dc", "title", null, null, (String) solrDoc.getFieldValue(TITLE)));
-        suggestion.getMetadata()
-            .add(new MetadataValueDTO("dc", "date", "issued", null, (String) solrDoc.getFieldValue(DATE)));
-        suggestion.getMetadata().add(
-            new MetadataValueDTO("dc", "description", "abstract", null, (String) solrDoc.getFieldValue(ABSTRACT)));
+        if (StringUtils.isNotBlank((String) solrDoc.getFieldValue(TITLE))) {
+            suggestion.getMetadata()
+                      .add(new MetadataValueDTO("dc", "title", null, null, (String) solrDoc.getFieldValue(TITLE)));
+        }
+        if (StringUtils.isNotBlank((String) solrDoc.getFieldValue(DATE))) {
+            suggestion.getMetadata()
+                      .add(new MetadataValueDTO("dc", "date", "issued", null, (String) solrDoc.getFieldValue(DATE)));
+        }
+        if (StringUtils.isNotBlank((String) solrDoc.getFieldValue(ABSTRACT))) {
+            suggestion.getMetadata().add(
+                new MetadataValueDTO("dc", "description", "abstract", null, (String) solrDoc.getFieldValue(ABSTRACT)));
+        }
 
         suggestion.setExternalSourceUri((String) solrDoc.getFieldValue(EXTERNAL_URI));
         if (solrDoc.containsKey(CATEGORY)) {
@@ -352,7 +359,7 @@ private Item findItem(Context context, UUID itemId) {
         try {
             return itemService.find(context, itemId);
         } catch (SQLException e) {
-            throw new RuntimeException(e);
+            throw new SQLRuntimeException(e);
         }
     }
 

dspace-api/src/main/java/org/dspace/app/suggestion/loader/PublicationLoader.java

@@ -15,6 +15,8 @@
 import java.util.List;
 
 import org.apache.commons.lang3.Strings;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.dspace.app.suggestion.SolrSuggestionProvider;
 import org.dspace.app.suggestion.Suggestion;
@@ -37,6 +39,8 @@
  */
 public class PublicationLoader extends SolrSuggestionProvider {
 
+    private static final Logger log = LogManager.getLogger(PublicationLoader.class);
+
     protected List<String> names;
 
     protected ExternalDataProvider primaryProvider;
@@ -122,7 +126,11 @@ public void importRecords(Context context, Item researcher)
             loaded = metadata.size();
             List<Suggestion> records = reduceAndTransform(researcher, metadata);
             for (Suggestion record : records) {
-                solrSuggestionStorageService.addSuggestion(record, false, false);
+                try {
+                    solrSuggestionStorageService.addSuggestion(record, false, false);
+                } catch (SolrServerException | IOException e) {
+                    log.error("Failed to add suggestion: {}", record.getID(), e);
+                }
             }
         }
         solrSuggestionStorageService.commit();

dspace-api/src/main/java/org/dspace/app/util/DCInputsReader.java

@@ -14,6 +14,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.FactoryConfigurationError;
 
@@ -708,4 +709,60 @@ public String getInputFormNameByCollectionAndField(Collection collection, String
         throw new DCInputsReaderException("No field configuration found!");
     }
 
+
+    /**
+     * Resolves and retrieves {@link DCInputSet} definitions for nested metadata groups.
+     * <p>
+     * Scans the parent {@code formName} for fields with {@code input-type} 'group' or 'inline-group'.
+     * For each match, it resolves a sub-form using the naming convention:
+     * {@code [parentFormName]-[schema]-[element]-[qualifier]}
+     * </p>
+     * <ul>
+     * <li><b>group:</b> Standard nested container.</li>
+     * <li><b>inline-group:</b> UI hint for compact/horizontal layout.</li>
+     * </ul>
+     * <b>Example:</b> {@code publicationStepGroup} + {@code dc.contributor.author}
+     * &rarr; {@code publicationStepGroup-dc-contributor-author}
+     *
+     * @param formName The parent form identifier.
+     * @return List of resolved input sets for nested groups.
+     * @throws DCInputsReaderException if sub-form retrieval fails.
+     */
+    public List<DCInputSet> getInputsByGroup(String formName)
+        throws DCInputsReaderException {
+
+        List<DCInputSet> results = new ArrayList<DCInputSet>();
+
+        // cache miss - construct new DCInputSet
+        List<List<Map<String, String>>> pages = formDefns.get(formName);
+        if (pages == null) {
+            return results;
+        }
+
+        Iterator<List<Map<String, String>>> iterator = pages.iterator();
+
+        while (iterator.hasNext()) {
+            List<Map<String, String>> input = iterator.next();
+
+            for (Map<String, String> entry : input) {
+                Set<Map.Entry<String, String>> entrySet =
+                    entry.entrySet();
+
+                for (Map.Entry<String, String> attr : entrySet) {
+                    if (attr.getKey().equals("input-type") &&
+                        (attr.getValue().equals("group") || attr.getValue().equals("inline-group"))) {
+                        String schema = entry.get("dc-schema");
+                        String element = entry.get("dc-element");
+                        String qualifier = entry.get("dc-qualifier");
+                        String subFormName = formName + "-" + Utils.standardize(schema, element, qualifier, "-");
+                        results.add(getInputsByFormName(subFormName));
+                    }
+                }
+            }
+
+        }
+
+        return results;
+    }
+
 }