diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java index 3ce157da4b..93f882e996 100644 --- a/dspace-api/src/main/java/org/dspace/content/RelationshipMetadataServiceImpl.java +++ b/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; diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java index 607a18e9bf..91cc5a61fa 100644 --- a/dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java +++ b/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; diff --git a/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java b/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java index b298a9430e..a152b5b902 100644 --- a/dspace-api/src/main/java/org/dspace/content/dao/RelationshipDAO.java +++ b/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 { 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 diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java index 0b0cceb420..e2f84bc1cb 100644 --- a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipDAOImpl.java +++ b/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; diff --git a/dspace-api/src/main/java/org/dspace/content/dao/pojo/ItemUuidAndRelationshipId.java b/dspace-api/src/main/java/org/dspace/content/dao/pojo/ItemUuidAndRelationshipId.java new file mode 100644 index 0000000000..6668b0d211 --- /dev/null +++ b/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; + } + +} diff --git a/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java b/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java index 38e8a88460..719f966e46 100644 --- a/dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java +++ b/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;