CCM NG: Changes for the PermissionManager to pass tests.

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4535 8810af33-2d31-482b-a856-94f89814c4df

Former-commit-id: 39b74d511a

ccm-cms/src/main/java/org/librecms/contentsection/ContentItem.java

@@ -241,9 +241,6 @@ public class ContentItem extends CcmObject implements Serializable,
     @Column(name = "ANCESTORS", length = 1024)
     private String ancestors;
 
-    @RecursivePermissions(privileges = {AssetPrivileges.EDIT, 
-                                        AssetPrivileges.DELETE, 
-                                        AssetPrivileges.VIEW})
     @OneToMany(mappedBy = "item")
     private List<AttachmentList> attachments;
 

ccm-core/src/main/java/org/libreccm/security/PermissionManager.java

@@ -142,7 +142,7 @@ public class PermissionManager {
             return;
         }
 
-        if (field.getType().equals(Collection.class)) {
+        if (Collection.class.isAssignableFrom(field.getType())) {
             final Collection<?> collection = (Collection<?>) value;
             collection.stream()
                 .filter(obj -> obj instanceof CcmObject)
@@ -154,9 +154,9 @@ public class PermissionManager {
                 .filter(relation -> relation.getRelatedObject() != null)
                 .map(relation -> relation.getRelatedObject())
                 .forEach(obj -> grantPrivilege(privilege, grantee, obj));
-        } else if (field.getType().equals(CcmObject.class)) {
+        } else if (CcmObject.class.isAssignableFrom(field.getType())) {
             grantPrivilege(privilege, grantee, (CcmObject) value);
-        } else if (field.getType().equals(Relation.class)) {
+        } else if (Relation.class.isAssignableFrom(field.getType())) {
             final Relation relation = (Relation) value;
             if (relation.getRelatedObject() != null) {
                 grantPrivilege(privilege, grantee, relation.getRelatedObject());

ccm-core/src/test/java/org/libreccm/security/PermissionManagerTest.java

@@ -106,8 +106,8 @@ public class PermissionManagerTest {
     public static WebArchive createDeployment() {
         return ShrinkWrap
                 .create(WebArchive.class,
-                    "LibreCCM-org.libreccm.security.PermissionManagerTest.war")
+                        "LibreCCM-org.libreccm.security.PermissionManagerTest.war").
-            .addPackage(org.libreccm.categorization.Categorization.class
+                addPackage(org.libreccm.categorization.Categorization.class
                         .getPackage())
                 .addPackage(org.libreccm.configuration.Configuration.class
                         .getPackage())
@@ -116,16 +116,16 @@ public class PermissionManagerTest {
                         .getPackage())
                 .addPackage(org.libreccm.jpa.utils.MimeTypeConverter.class
                         .getPackage())
-            .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage())
+                .addPackage(org.libreccm.l10n.LocalizedString.class.getPackage()).
-            .addPackage(org.libreccm.security.User.class.getPackage())
+                addPackage(org.libreccm.security.User.class.getPackage())
                 .addPackage(org.libreccm.tests.categories.IntegrationTest.class
                         .getPackage())
                 .addPackage(org.libreccm.testutils.EqualsVerifier.class
                         .getPackage())
                 .addPackage(org.libreccm.web.CcmApplication.class.getPackage())
                 .addPackage(org.libreccm.workflow.Workflow.class.getPackage())
-            .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage())
+                .addPackage(com.arsdigita.kernel.KernelConfig.class.getPackage()).
-            .addPackage(com.arsdigita.kernel.security.SecurityConfig.class
+                addPackage(com.arsdigita.kernel.security.SecurityConfig.class
                         .getPackage())
                 .addPackage(com.arsdigita.util.UncheckedWrapperException.class
                         .getPackage())
@@ -226,7 +226,8 @@ public class PermissionManagerTest {
     @ShouldMatchDataSet(
             value = "datasets/org/libreccm/security/PermissionManagerTest/"
                             + "after-grant-recursivly.yml",
-        excludeColumns = {"permission_id"})
+            excludeColumns = {"permission_id"},
+            orderBy = {"permissions.permission_id desc"})
     @InSequence(211)
     public void grantPermissionRecursively() {
         final Role role1 = roleRepository.findByName("role1");
@@ -565,7 +566,8 @@ public class PermissionManagerTest {
 
         try {
             shiro.getSystemUser().execute(
-                () -> permissionManager.revokePrivilege(null, role1, object1));
+                    () -> permissionManager.
+                            revokePrivilege(null, role1, object1));
         } catch (ExecutionException ex) {
             throw ex.getCause();
         }

ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/after-grant-recursivly.yml

@@ -43,6 +43,9 @@ ccm_core.categorizations:
     - categorization_id: -40001
       category_id: -20003
       object_id: -20004
+      category_index: false
+      category_order: 0
+      object_order: 0
 ccm_core.permissions:
     - permission_id: -30001
       granted_privilege: privilege1

ccm-core/src/test/resources/datasets/org/libreccm/security/PermissionManagerTest/data-recursivly.yml

@@ -43,6 +43,9 @@ ccm_core.categorizations:
     - categorization_id: -40001
       category_id: -20003
       object_id: -20004
+      category_index: false
+      category_order: 0
+      object_order: 0
 ccm_core.permissions:
     - permission_id: -30001
       granted_privilege: privilege1