libre.sh/keycloak-scim
3
0
Fork 0
Code Issues 15 Pull requests Releases 1 Packages Activity Actions

KEYCLOAK-3989: Replacing COMPOSITE_ROLE Collection with Set.

Browse source 
- Hibernate optimization that avoids deleting/re-inserting all composite roles when adding/removing a composite.
This commit is contained in:
Gabriel Lavoie 2016-11-15 10:30:08 -05:00
parent cb4f856ab6
commit 4910b35d69
2 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
model/jpa/src/main/java/org/keycloak/models/jpa/RoleAdapter.java
View file

@ -107,10 +107,7 @@ public class RoleAdapter implements RoleModel, JpaModel<RoleEntity> {
@Override @Override
public void removeCompositeRole(RoleModel role) { public void removeCompositeRole(RoleModel role) {
RoleEntity entity = RoleAdapter.toRoleEntity(role, em); RoleEntity entity = RoleAdapter.toRoleEntity(role, em);
Iterator<RoleEntity> it = getEntity().getCompositeRoles().iterator(); getEntity().getCompositeRoles().remove(entity);
while (it.hasNext()) {
if (it.next().equals(entity)) it.remove();
}
} }
@Override @Override

10
model/jpa/src/main/java/org/keycloak/models/jpa/entities/RoleEntity.java
View file

@ -31,8 +31,8 @@ import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import java.util.ArrayList; import java.util.HashSet;
import java.util.Collection; import java.util.Set;
/** /**
* @author <a href="mailto:bill@burkecentral.com">Bill Burke</a> * @author <a href="mailto:bill@burkecentral.com">Bill Burke</a>
@ -89,7 +89,7 @@ public class RoleEntity {
@ManyToMany(fetch = FetchType.LAZY, cascade = {}) @ManyToMany(fetch = FetchType.LAZY, cascade = {})
@JoinTable(name = "COMPOSITE_ROLE", joinColumns = @JoinColumn(name = "COMPOSITE"), inverseJoinColumns = @JoinColumn(name = "CHILD_ROLE")) @JoinTable(name = "COMPOSITE_ROLE", joinColumns = @JoinColumn(name = "COMPOSITE"), inverseJoinColumns = @JoinColumn(name = "CHILD_ROLE"))
private Collection<RoleEntity> compositeRoles = new ArrayList<RoleEntity>(); private Set<RoleEntity> compositeRoles = new HashSet<>();
public String getId() { public String getId() {
return id; return id;
@ -133,11 +133,11 @@ public class RoleEntity {
this.scopeParamRequired = scopeParamRequired; this.scopeParamRequired = scopeParamRequired;
} }
public Collection<RoleEntity> getCompositeRoles() { public Set<RoleEntity> getCompositeRoles() {
return compositeRoles; return compositeRoles;
} }
public void setCompositeRoles(Collection<RoleEntity> compositeRoles) { public void setCompositeRoles(Set<RoleEntity> compositeRoles) {
this.compositeRoles = compositeRoles; this.compositeRoles = compositeRoles;
} }