From b142601c62869a8b8af8ccf24fcb7a11b5fed880 Mon Sep 17 00:00:00 2001 From: Bruno Roemers Date: Mon, 7 Mar 2022 14:17:26 +0100 Subject: [PATCH] 88056: Filter relationship metadata by class instance instead of authority key --- .../java/org/dspace/versioning/AbstractVersionProvider.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java b/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java index 6c04657ab4..3633f1949b 100644 --- a/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java +++ b/dspace-api/src/main/java/org/dspace/versioning/AbstractVersionProvider.java @@ -12,7 +12,6 @@ import java.sql.SQLException; import java.util.List; import java.util.Set; -import org.apache.commons.lang3.StringUtils; import org.dspace.authorize.AuthorizeException; import org.dspace.authorize.ResourcePolicy; import org.dspace.authorize.service.AuthorizeService; @@ -22,10 +21,10 @@ import org.dspace.content.Item; import org.dspace.content.MetadataField; import org.dspace.content.MetadataSchema; import org.dspace.content.MetadataValue; +import org.dspace.content.RelationshipMetadataValue; import org.dspace.content.service.BitstreamService; import org.dspace.content.service.BundleService; import org.dspace.content.service.ItemService; -import org.dspace.core.Constants; import org.dspace.core.Context; import org.dspace.storage.bitstore.service.BitstreamStorageService; import org.springframework.beans.factory.annotation.Autowired; @@ -58,7 +57,7 @@ public abstract class AbstractVersionProvider { String unqualifiedMetadataField = metadataSchema.getName() + "." + metadataField.getElement(); if (getIgnoredMetadataFields().contains(metadataField.toString('.')) || getIgnoredMetadataFields().contains(unqualifiedMetadataField + "." + Item.ANY) || - StringUtils.startsWith(aMd.getAuthority(), Constants.VIRTUAL_AUTHORITY_PREFIX)) { + aMd instanceof RelationshipMetadataValue) { //Skip this metadata field (ignored and/or virtual) continue; }