From a5af5c130a088936f2f45e623cd1b64d69215bbf Mon Sep 17 00:00:00 2001
From: Andrew Wood <andrew.wood@atmire.com>
Date: Fri, 4 Oct 2019 14:09:43 -0400
Subject: [PATCH] DS-4226 Conform with changes from community master

---
 .../main/java/org/dspace/app/bulkedit/MetadataImport.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
index c9c7020b1d..7f890c274b 100644
--- a/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
+++ b/dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImport.java
@@ -662,7 +662,7 @@ public class MetadataImport {
 
             if (StringUtils.equals(schema, MetadataSchemaEnum.RELATION.getName())) {
                 List<RelationshipType> relationshipTypeList = relationshipTypeService
-                    .findByLeftOrRightLabel(c, element);
+                    .findByLeftwardOrRightwardTypeName(c, element);
                 for (RelationshipType relationshipType : relationshipTypeList) {
                     for (Relationship relationship : relationshipService
                         .findByItemAndRelationshipType(c, item, relationshipType)) {
@@ -750,7 +750,7 @@ public class MetadataImport {
                 null, Item.ANY).get(0).getValue();
 
         // Get the correct RelationshipType based on label
-        List<RelationshipType> relType = relationshipTypeService.findByLeftOrRightLabel(c, label);
+        List<RelationshipType> relType = relationshipTypeService.findByLeftwardOrRightwardTypeName(c, label);
         RelationshipType foundRelationshipType = matchRelationshipType(relType,
                 itemRelationshipType,relationEntityRelationshipType);
 
@@ -762,7 +762,7 @@ public class MetadataImport {
                     "with label: " + label);
         }
 
-        if (foundRelationshipType.getLeftLabel().equalsIgnoreCase(label)) {
+        if (foundRelationshipType.getLeftwardType().equalsIgnoreCase(label)) {
             left = true;
         }
 
@@ -1794,7 +1794,7 @@ public class MetadataImport {
         try {
             RelationshipType foundRelationshipType = null;
             List<RelationshipType> relationshipTypeList = relationshipTypeService.
-                    findByLeftOrRightLabel(c, label.split("\\.")[1]);
+                    findByLeftwardOrRightwardTypeName(c, label.split("\\.")[1]);
             // Validate described relationship form the CSV.
             foundRelationshipType = matchRelationshipType(relationshipTypeList, targetType, originType);
             if (foundRelationshipType == null) {