Skip to content

JTALKSCOMMON-53 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evgeniycheban wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JTALKSCOMMON-53 #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions jtalks-common-security/src/main/java/org/jtalks/common/security/acl/AclUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/
package org.jtalks.common.security.acl;

import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import org.jtalks.common.model.entity.Entity;
import org.springframework.security.acls.model.*;
Expand All @@ -35,6 +36,7 @@
public class AclUtil {
private TypeConvertingObjectIdentityGenerator objectIdentityGenerator = createDefaultGenerator();
private final MutableAclService mutableAclService;
private static final String MUTABLE_ACL_SERVICE_IS_NULL = "mutableAclService is null";

/**
* Use this constructor if you need a full blown ACL utilities.
Expand Down Expand Up @@ -68,6 +70,7 @@ public ExtendedMutableAcl getAclFor(Entity entity) {
* {@inheritDoc}
*/
public ExtendedMutableAcl getAclFor(ObjectIdentity oid) {
Preconditions.checkNotNull(mutableAclService, MUTABLE_ACL_SERVICE_IS_NULL);
try {
return ExtendedMutableAcl.castAndCreate(mutableAclService.readAclById(oid));
} catch (NotFoundException nfe) {
Expand Down Expand Up @@ -107,6 +110,7 @@ public ExtendedMutableAcl restrict(List<? extends Sid> sids, List<Permission> pe
* {@inheritDoc}
*/
public ExtendedMutableAcl delete(List<? extends Sid> sids, List<Permission> permissions, Entity target) {
Preconditions.checkNotNull(mutableAclService, MUTABLE_ACL_SERVICE_IS_NULL);
ObjectIdentity oid = createIdentityFor(target);
ExtendedMutableAcl acl = ExtendedMutableAcl.castAndCreate(mutableAclService.readAclById(oid));
deletePermissionsFromAcl(acl, sids, permissions);
Expand Down