inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
133137 rmunteanu: REPO-557: Retrieve Permissions For Node
      -  Renamed field according to REST API code conventions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@133393 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-12-06 17:18:25 +00:00
parent 4d6e3974f5
commit 69e596c5e0
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/rest/api/impl/NodesImpl.java
View File

@@ -2200,11 +2200,11 @@ public class NodesImpl implements Nodes
} }
// Check inherit from parent value and if it's changed set the new value // Check inherit from parent value and if it's changed set the new value
if (nodePerms.isInheritanceEnabled() != null) if (nodePerms.getIsInheritanceEnabled() != null)
{ {
if (nodePerms.isInheritanceEnabled() != permissionService.getInheritParentPermissions(nodeRef)) if (nodePerms.getIsInheritanceEnabled() != permissionService.getInheritParentPermissions(nodeRef))
{ {
permissionService.setInheritParentPermissions(nodeRef, nodePerms.isInheritanceEnabled()); permissionService.setInheritParentPermissions(nodeRef, nodePerms.getIsInheritanceEnabled());
} }
} }

6
source/java/org/alfresco/rest/api/model/NodePermissions.java
View File

@@ -58,12 +58,12 @@ public class NodePermissions
this.settable = settable; this.settable = settable;
} }
public Boolean isInheritanceEnabled() public Boolean getIsInheritanceEnabled()
{ {
return inherit; return inherit;
} }
public void setInheritanceEnabled(boolean inherit) public void setIsInheritanceEnabled(boolean inherit)
{ {
this.inherit = inherit; this.inherit = inherit;
} }
@@ -92,7 +92,7 @@ public class NodePermissions
public String toString() public String toString()
{ {
final StringBuilder sb = new StringBuilder(120); final StringBuilder sb = new StringBuilder(120);
sb.append("PathInfo [inheritanceEnabled=").append(inherit) sb.append("PathInfo [isInheritanceEnabled=").append(inherit)
.append(", inherited=").append(getInherited()) .append(", inherited=").append(getInherited())
.append(", locallySet=").append(getLocallySet()) .append(", locallySet=").append(getLocallySet())
.append(", settable=").append(getSettable()) .append(", settable=").append(getSettable())

20
source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java
View File

@@ -4049,7 +4049,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
assertNotNull(nodeResp.getPermissions()); assertNotNull(nodeResp.getPermissions());
assertNotNull(nodeResp.getPermissions().getSettable()); assertNotNull(nodeResp.getPermissions().getSettable());
assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable)); assertTrue("Incorrect list of settable permissions returned!", nodeResp.getPermissions().getSettable().containsAll(expectedSettable));
assertFalse(nodeResp.getPermissions().isInheritanceEnabled()); assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
// Try as admin // Try as admin
setRequestContext(networkAdmin); setRequestContext(networkAdmin);
@@ -4057,7 +4057,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Test permissions for node 'Company Home' // Test permissions for node 'Company Home'
response = getSingle(NodesEntityResource.class, rootNodeId, params, 200); response = getSingle(NodesEntityResource.class, rootNodeId, params, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertFalse(nodeResp.getPermissions().isInheritanceEnabled()); assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
assertNull(nodeResp.getPermissions().getInherited()); assertNull(nodeResp.getPermissions().getInherited());
assertNotNull(nodeResp.getPermissions().getLocallySet()); assertNotNull(nodeResp.getPermissions().getLocallySet());
assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()))); assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString())));
@@ -4067,7 +4067,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Test permissions for node 'Sites' // Test permissions for node 'Sites'
response = getSingle(NodesEntityResource.class, sitesNodeId, params, 200); response = getSingle(NodesEntityResource.class, sitesNodeId, params, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertTrue(nodeResp.getPermissions().isInheritanceEnabled()); assertTrue(nodeResp.getPermissions().getIsInheritanceEnabled());
assertNotNull(nodeResp.getPermissions().getInherited()); assertNotNull(nodeResp.getPermissions().getInherited());
assertTrue(nodeResp.getPermissions().getInherited().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()))); assertTrue(nodeResp.getPermissions().getInherited().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString())));
assertNull(nodeResp.getPermissions().getLocallySet()); assertNull(nodeResp.getPermissions().getLocallySet());
@@ -4077,7 +4077,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Test permissions for node 'Data Dictionary' // Test permissions for node 'Data Dictionary'
response = getSingle(NodesEntityResource.class, ddNodeId, params, 200); response = getSingle(NodesEntityResource.class, ddNodeId, params, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertFalse(nodeResp.getPermissions().isInheritanceEnabled()); assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
assertNull(nodeResp.getPermissions().getInherited()); assertNull(nodeResp.getPermissions().getInherited());
assertNotNull(nodeResp.getPermissions().getLocallySet()); assertNotNull(nodeResp.getPermissions().getLocallySet());
assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString()))); assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONSUMER, AccessStatus.ALLOWED.toString())));
@@ -4087,7 +4087,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Test permissions for node 'Shared Folder' // Test permissions for node 'Shared Folder'
response = getSingle(NodesEntityResource.class, sharedFolder, params, 200); response = getSingle(NodesEntityResource.class, sharedFolder, params, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertFalse(nodeResp.getPermissions().isInheritanceEnabled()); assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
assertNull(nodeResp.getPermissions().getInherited()); assertNull(nodeResp.getPermissions().getInherited());
assertNotNull(nodeResp.getPermissions().getLocallySet()); assertNotNull(nodeResp.getPermissions().getLocallySet());
assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONTRIBUTOR, AccessStatus.ALLOWED.toString()))); assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("GROUP_EVERYONE", PermissionService.CONTRIBUTOR, AccessStatus.ALLOWED.toString())));
@@ -4097,7 +4097,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// Test permissions for node 'User Home' // Test permissions for node 'User Home'
response = getSingle(NodesEntityResource.class, userHome, params, 200); response = getSingle(NodesEntityResource.class, userHome, params, 200);
nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertFalse(nodeResp.getPermissions().isInheritanceEnabled()); assertFalse(nodeResp.getPermissions().getIsInheritanceEnabled());
assertNull(nodeResp.getPermissions().getInherited()); assertNull(nodeResp.getPermissions().getInherited());
assertNotNull(nodeResp.getPermissions().getLocallySet()); assertNotNull(nodeResp.getPermissions().getLocallySet());
assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("ROLE_OWNER", "All", AccessStatus.ALLOWED.toString()))); assertTrue(nodeResp.getPermissions().getLocallySet().contains(new NodePermissions.NodePermission("ROLE_OWNER", "All", AccessStatus.ALLOWED.toString())));
@@ -4143,7 +4143,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
assertNotNull(documentResp.getPermissions()); assertNotNull(documentResp.getPermissions());
assertTrue("Locally set permissions were not set properly!", documentResp.getPermissions().getLocallySet().size() == 2); assertTrue("Locally set permissions were not set properly!", documentResp.getPermissions().getLocallySet().size() == 2);
// Check inherit default true // Check inherit default true
assertTrue("Inheritance flag was not retrieved!", documentResp.getPermissions().isInheritanceEnabled()); assertTrue("Inheritance flag was not retrieved!", documentResp.getPermissions().getIsInheritanceEnabled());
// Check inherited permissions (for ROLE_OWNER and user1) // Check inherited permissions (for ROLE_OWNER and user1)
assertNotNull(documentResp.getPermissions().getInherited()); assertNotNull(documentResp.getPermissions().getInherited());
assertTrue(documentResp.getPermissions().getInherited().size() == 2); assertTrue(documentResp.getPermissions().getInherited().size() == 2);
@@ -4458,7 +4458,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
response = getSingle(NodesEntityResource.class, docId, params, 200); response = getSingle(NodesEntityResource.class, docId, params, 200);
Document docResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class); Document docResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Document.class);
assertTrue("Inheritance hasn't been enabled!", docResp.getPermissions().isInheritanceEnabled()); assertTrue("Inheritance hasn't been enabled!", docResp.getPermissions().getIsInheritanceEnabled());
assertTrue("Permissions were not inherited from parent!", docResp.getPermissions().getInherited().size() > 0); assertTrue("Permissions were not inherited from parent!", docResp.getPermissions().getInherited().size() > 0);
} }
@@ -4476,7 +4476,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
// create a new document in testFolder and set inherit to false // create a new document in testFolder and set inherit to false
Document dUpdate = new Document(); Document dUpdate = new Document();
NodePermissions nodePermissionsUpdate = new NodePermissions(); NodePermissions nodePermissionsUpdate = new NodePermissions();
nodePermissionsUpdate.setInheritanceEnabled(false); nodePermissionsUpdate.setIsInheritanceEnabled(false);
dUpdate.setPermissions(nodePermissionsUpdate); dUpdate.setPermissions(nodePermissionsUpdate);
HttpResponse response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200); HttpResponse response = put(URL_NODES, dId, toJsonAsStringNonNull(dUpdate), null, 200);
@@ -4488,7 +4488,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
response = getSingle(NodesEntityResource.class, documentResp.getId(), params, 200); response = getSingle(NodesEntityResource.class, documentResp.getId(), params, 200);
Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class); Node nodeResp = RestApiUtil.parseRestApiEntry(response.getJsonResponse(), Node.class);
assertFalse("Inheritance hasn't been disabled!", nodeResp.getPermissions().isInheritanceEnabled()); assertFalse("Inheritance hasn't been disabled!", nodeResp.getPermissions().getIsInheritanceEnabled());
assertNull("Permissions were inherited from parent!", nodeResp.getPermissions().getInherited()); assertNull("Permissions were inherited from parent!", nodeResp.getPermissions().getInherited());
} }