From 06ea361db89c8056d120302300b1f0505e3d9178 Mon Sep 17 00:00:00 2001 From: lbownik Date: Fri, 8 May 2026 14:54:33 +0200 Subject: [PATCH] integration tests fixes --- .../iq/dataverse/RoleAssigneeServiceBean.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java b/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java index 2253124578..f7f1473cfa 100644 --- a/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java +++ b/fairchive-webapp/src/main/java/edu/harvard/iq/dataverse/RoleAssigneeServiceBean.java @@ -15,6 +15,7 @@ import edu.harvard.iq.dataverse.persistence.user.GuestUser; import edu.harvard.iq.dataverse.persistence.user.RoleAssignee; import edu.harvard.iq.dataverse.persistence.user.RoleAssignment; +import edu.harvard.iq.dataverse.persistence.user.RoleAssignmentRepository; import edu.harvard.iq.dataverse.privateurl.PrivateUrlUtil; import javax.annotation.PostConstruct; @@ -59,6 +60,9 @@ public class RoleAssigneeServiceBean { @EJB DataverseRoleServiceBean dataverseRoleService; + + @EJB + RoleAssignmentRepository roleAssignmentRepository; protected Map predefinedRoleAssignees = new TreeMap<>(); @@ -98,9 +102,7 @@ public RoleAssignee getRoleAssignee(String identifier) { } public List getAssignmentsFor(String roleAssigneeIdentifier) { - return em.createNamedQuery("RoleAssignment.listByAssigneeIdentifier", RoleAssignment.class) - .setParameter("assigneeIdentifier", roleAssigneeIdentifier) - .getResultList(); + return this.roleAssignmentRepository.findByAssigneeIdentifier(roleAssigneeIdentifier); } public Optional getAssignmentFor(String roleAssigneeIdentifier, @@ -391,8 +393,6 @@ public List filterRoleAssignees(String query, DvObject dvObject, } public void removeAllRolesForUserByIdentifier(String identifier) { - em.createNamedQuery("RoleAssignment.deleteAllByAssigneeIdentifier", RoleAssignment.class) - .setParameter("assigneeIdentifier", identifier) - .executeUpdate(); + this.roleAssignmentRepository.deleteAllByAssigneeIdentifier(identifier); } }