Use EntityRestrict alone instead of Restrict

zanata · Jun 30, 2015 · 4c26110 · 4c26110
1 parent 821d4ca
commit 4c26110
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/zanata-model/src/main/java/org/zanata/model/HProject.java b/zanata-model/src/main/java/org/zanata/model/HProject.java
@@ -63,7 +63,6 @@
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.validator.constraints.NotEmpty;
-import org.jboss.seam.annotations.security.Restrict;
 import org.zanata.annotation.EntityRestrict;
 import org.zanata.common.EntityStatus;
 import org.zanata.common.LocaleId;
@@ -93,7 +92,6 @@
         typeClass = LocaleIdType.class)
 
 })
-@Restrict
 @EntityRestrict({ INSERT, UPDATE, DELETE })
 @Setter
 @Getter

diff --git a/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java b/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
@@ -62,7 +62,6 @@
 import org.hibernate.search.annotations.Field;
 import org.hibernate.search.annotations.FieldBridge;
 import org.hibernate.search.annotations.Indexed;
-import org.jboss.seam.annotations.security.Restrict;
 import org.zanata.annotation.EntityRestrict;
 import org.zanata.common.EntityStatus;
 import org.zanata.common.LocaleId;
@@ -78,7 +77,6 @@
 @Entity
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
 @TypeDef(name = "entityStatus", typeClass = EntityStatusType.class)
-@Restrict
 @EntityRestrict({ INSERT, UPDATE, DELETE })
 @Indexed
 @Access(AccessType.FIELD)

diff --git a/zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java b/zanata-war/src/main/java/org/zanata/security/SmartEntitySecurityListener.java
@@ -1,6 +1,7 @@
 package org.zanata.security;
 
 import java.util.Arrays;
+import java.util.List;
 import javax.persistence.PostLoad;
 import javax.persistence.PrePersist;
 import javax.persistence.PreRemove;
@@ -62,19 +63,16 @@ public void preRemove(Object entity) {
             isEntityRestricted(Object entity, EntityAction action) {
         EntityRestrict entityRestrict =
                 entity.getClass().getAnnotation(EntityRestrict.class);
-        Restrict restrict = entity.getClass().getAnnotation(Restrict.class);
-        if (restrict != null) {
-            if (entityRestrict != null) {
-                if (Arrays.asList(entityRestrict.value()).contains(action)) {
-                    return true; // restricted
-                } else {
-                    return false; // not restricted
-                }
+        if (entityRestrict != null) {
+            List<EntityAction> restrictedActions = Arrays.asList(
+                    entityRestrict.value());
+            if (restrictedActions.isEmpty() || restrictedActions.contains(action)) {
+                return true; // restricted
             } else {
-                return true; // restricted, just not specifically
+                return false; // not restricted
             }
         } else {
-            return false; // not restricted
+            return false; // restricted, just not specifically
         }
     }