diff --git a/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java index 98665a94dd..9f1372ee02 100644 --- a/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/EntityServiceImpl.java @@ -172,18 +172,18 @@ public class EntityServiceImpl implements EntityService { } @Override - public List getRelationshipTypesByLabel(Context context, String label) throws SQLException { + public List getRelationshipTypesByTypeName(Context context, String type) throws SQLException { - return getRelationshipTypesByLabel(context, label, -1, -1); + return getRelationshipTypesByTypeName(context, type, -1, -1); } @Override - public List getRelationshipTypesByTypeName(Context context, String label, + public List getRelationshipTypesByTypeName(Context context, String type, Integer limit, Integer offset) throws SQLException { List listToReturn = new LinkedList<>(); for (RelationshipType relationshipType : relationshipTypeService.findAll(context, limit, offset)) { - if (StringUtils.equals(relationshipType.getLeftwardType(),label) || - StringUtils.equals(relationshipType.getRightwardType(),label)) { + if (StringUtils.equals(relationshipType.getLeftwardType(),type) || + StringUtils.equals(relationshipType.getRightwardType(),type)) { listToReturn.add(relationshipType); } } diff --git a/dspace-api/src/main/java/org/dspace/content/RelationshipTypeServiceImpl.java b/dspace-api/src/main/java/org/dspace/content/RelationshipTypeServiceImpl.java index 31564b1eee..0f1d529df5 100644 --- a/dspace-api/src/main/java/org/dspace/content/RelationshipTypeServiceImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/RelationshipTypeServiceImpl.java @@ -65,13 +65,14 @@ public class RelationshipTypeServiceImpl implements RelationshipTypeService { @Override public List findByLeftwardOrRightwardTypeName(Context context, String label) throws SQLException { - return findByLeftOrRightLabel(context, label, -1, -1); + return findByLeftwardOrRightwardTypeName(context, label, -1, -1); } @Override - public List findByLeftwardOrRightwardTypeName(Context context, String label, Integer limit, Integer offset) + public List findByLeftwardOrRightwardTypeName(Context context, String label, Integer limit, + Integer offset) throws SQLException { - return relationshipTypeDAO.findByLeftOrRightLabel(context, label, limit, offset); + return relationshipTypeDAO.findByLeftwardOrRightwardTypeName(context, label, limit, offset); } @Override diff --git a/dspace-api/src/main/java/org/dspace/content/dao/RelationshipTypeDAO.java b/dspace-api/src/main/java/org/dspace/content/dao/RelationshipTypeDAO.java index 84cf805d62..45a6f6c257 100644 --- a/dspace-api/src/main/java/org/dspace/content/dao/RelationshipTypeDAO.java +++ b/dspace-api/src/main/java/org/dspace/content/dao/RelationshipTypeDAO.java @@ -60,7 +60,8 @@ public interface RelationshipTypeDAO extends GenericDAO { * @return A list of RelationshipType objects that have the given label as either the leftLabel or rightLabel * @throws SQLException If something goes wrong */ - List findByLeftwardOrRightwardTypeName(Context context, String type, Integer limit, Integer offset) + List findByLeftwardOrRightwardTypeName(Context context, String type, Integer limit, + Integer offset) throws SQLException; /** diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java index df4d5e613b..0d7c583615 100644 --- a/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/RelationshipTypeDAOImpl.java @@ -46,7 +46,8 @@ public class RelationshipTypeDAOImpl extends AbstractHibernateDAO findByLeftwardOrRightwardTypeName(Context context, String type, Integer limit, Integer offset) + public List findByLeftwardOrRightwardTypeName(Context context, String type, Integer limit, + Integer offset) throws SQLException { CriteriaBuilder criteriaBuilder = getCriteriaBuilder(context); diff --git a/dspace-api/src/main/java/org/dspace/content/service/EntityService.java b/dspace-api/src/main/java/org/dspace/content/service/EntityService.java index 4c7144486e..be1fe98d3e 100644 --- a/dspace-api/src/main/java/org/dspace/content/service/EntityService.java +++ b/dspace-api/src/main/java/org/dspace/content/service/EntityService.java @@ -190,25 +190,25 @@ public interface EntityService { * Retrieves a list of RelationshipType objects for which either their left or right label is equal to the * label parameter that's being passed along * @param context The relevant DSpace context - * @param label The label for which the relationshiptype's labels must be checked + * @param type The label for which the relationshiptype's labels must be checked * @return The list of relationshiptypes that each contain a left or right label that is equal * to the given label parameter * @throws SQLException If something goes wrong */ - List getRelationshipTypesByTypeName(Context context, String label) throws SQLException; + List getRelationshipTypesByTypeName(Context context, String type) throws SQLException; /** * Retrieves a list of RelationshipType objects for which either their left or right label is equal to the * label parameter that's being passed along * @param context The relevant DSpace context - * @param label The label for which the relationshiptype's labels must be checked + * @param type The label for which the relationshiptype's labels must be checked * @param limit paging limit * @param offset paging offset * @return The list of relationshiptypes that each contain a left or right label that is equal * to the given label parameter * @throws SQLException If something goes wrong */ - List getRelationshipTypesByLabel(Context context, String label, + List getRelationshipTypesByTypeName(Context context, String type, Integer limit, Integer offset) throws SQLException; } diff --git a/dspace-api/src/main/java/org/dspace/content/service/RelationshipTypeService.java b/dspace-api/src/main/java/org/dspace/content/service/RelationshipTypeService.java index f60abfb88b..352b347d0c 100644 --- a/dspace-api/src/main/java/org/dspace/content/service/RelationshipTypeService.java +++ b/dspace-api/src/main/java/org/dspace/content/service/RelationshipTypeService.java @@ -85,7 +85,8 @@ public interface RelationshipTypeService extends DSpaceCRUDService findByLeftOrRightLabel(Context context, String label, Integer limit, Integer offset) + List findByLeftwardOrRightwardTypeName(Context context, String label, Integer limit, + Integer offset) throws SQLException; /** diff --git a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplTest.java b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplTest.java index 4f415e18e1..7ad7419ce1 100644 --- a/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplTest.java +++ b/dspace-api/src/test/java/org/dspace/content/dao/RelationshipTypeDAOImplTest.java @@ -144,7 +144,7 @@ public class RelationshipTypeDAOImplTest extends AbstractIntegrationTest { @Test public void testFindByLeftOrRightLabel() throws Exception { assertEquals("TestFindByLeftOrRightLabel 0", relationshipTypeList, relationshipTypeService. - findByLeftOrRightLabel(context, "isAuthorOfPublication", -1, -1)); + findByLeftwardOrRightwardTypeName(context, "isAuthorOfPublication", -1, -1)); } /**