91390: Move class ItemUuidAndRelationshipId to separate file

dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
-import org.dspace.content.dao.RelationshipDAO.ItemUuidAndRelationshipId;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.MetadataFieldService;
 import org.dspace.content.service.RelationshipService;

dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java

@@ -24,7 +24,7 @@ import org.dspace.authorize.AuthorizeException;
 import org.dspace.authorize.service.AuthorizeService;
 import org.dspace.content.Relationship.LatestVersionStatus;
 import org.dspace.content.dao.RelationshipDAO;
-import org.dspace.content.dao.RelationshipDAO.ItemUuidAndRelationshipId;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.content.service.EntityTypeService;
 import org.dspace.content.service.ItemService;
 import org.dspace.content.service.RelationshipService;

dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java

@@ -14,9 +14,9 @@ import java.util.UUID;
 import org.dspace.content.Item;
 import org.dspace.content.Relationship;
 import org.dspace.content.RelationshipType;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.core.Context;
 import org.dspace.core.GenericDAO;
-import org.springframework.lang.NonNull;
 
 /**
  * Database Access Object Interface class for the Relationship object
@@ -130,29 +130,6 @@ public interface RelationshipDAO extends GenericDAO<Relationship> {
         boolean excludeNonLatest
     ) throws SQLException;
 
-    /**
-     * Used by {@link #findByLatestItemAndRelationshipType} to avoid creating {@link Relationship}s.
-     */
-    class ItemUuidAndRelationshipId {
-
-        private final UUID itemUuid;
-        private final int relationshipId;
-
-        public ItemUuidAndRelationshipId(@NonNull UUID itemUuid, @NonNull int relationshipId) {
-            this.itemUuid = itemUuid;
-            this.relationshipId = relationshipId;
-        }
-
-        public UUID getItemUuid() {
-            return this.itemUuid;
-        }
-
-        public int getRelationshipId() {
-            return this.relationshipId;
-        }
-
-    }
-
     /**
      * This method returns the UUIDs of all items that have a relationship with the given item, from the perspective
      * of the other item. In other words, given a relationship with the given item, the given item should have

dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java

@@ -26,6 +26,7 @@ import org.dspace.content.RelationshipType;
 import org.dspace.content.RelationshipType_;
 import org.dspace.content.Relationship_;
 import org.dspace.content.dao.RelationshipDAO;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.content.factory.ContentServiceFactory;
 import org.dspace.content.service.RelationshipTypeService;
 import org.dspace.core.AbstractHibernateDAO;

dspace-api/src/main/java/org/dspace/content/dao/pojo/ItemUuidAndRelationshipId.java

@@ -0,0 +1,37 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+package org.dspace.content.dao.pojo;
+
+import java.util.UUID;
+
+import org.dspace.content.Relationship;
+import org.dspace.content.dao.RelationshipDAO;
+import org.springframework.lang.NonNull;
+
+/**
+ * Used by {@link RelationshipDAO#findByLatestItemAndRelationshipType} to avoid creating {@link Relationship}s.
+ */
+public class ItemUuidAndRelationshipId {
+
+    private final UUID itemUuid;
+    private final int relationshipId;
+
+    public ItemUuidAndRelationshipId(@NonNull UUID itemUuid, @NonNull int relationshipId) {
+        this.itemUuid = itemUuid;
+        this.relationshipId = relationshipId;
+    }
+
+    public UUID getItemUuid() {
+        return this.itemUuid;
+    }
+
+    public int getRelationshipId() {
+        return this.relationshipId;
+    }
+
+}

dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java

@@ -16,7 +16,7 @@ import org.dspace.content.Item;
 import org.dspace.content.Relationship;
 import org.dspace.content.Relationship.LatestVersionStatus;
 import org.dspace.content.RelationshipType;
-import org.dspace.content.dao.RelationshipDAO.ItemUuidAndRelationshipId;
+import org.dspace.content.dao.pojo.ItemUuidAndRelationshipId;
 import org.dspace.core.Context;
 import org.dspace.service.DSpaceCRUDService;