From cd1b21c44c692ae6afd6e72e8572a63f7f52e202 Mon Sep 17 00:00:00 2001 From: Kristijan Conkas Date: Thu, 22 Dec 2016 17:04:27 +0000 Subject: [PATCH] RM-4426: terminology improvement --- .../user/{UserCapabilities.java => UserPermissions.java} | 8 ++++---- .../org/alfresco/rest/rm/community/base/BaseRestTest.java | 2 +- .../community/fileplancomponents/DeleteRecordTests.java | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) rename rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/{UserCapabilities.java => UserPermissions.java} (84%) diff --git a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserCapabilities.java b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserPermissions.java similarity index 84% rename from rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserCapabilities.java rename to rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserPermissions.java index fe9aa1e97d..14f2ff2be6 100644 --- a/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserCapabilities.java +++ b/rm-automation/rm-automation-community-rest-api/src/main/java/org/alfresco/rest/rm/community/model/user/UserPermissions.java @@ -32,9 +32,9 @@ package org.alfresco.rest.rm.community.model.user; * @author Kristijan Conkas * @since 2.6 */ -public class UserCapabilities +public class UserPermissions { - public static final String CAPABILITY_FILING = "Filing"; - public static final String CAPABILITY_READ_RECORDS = "ReadRecords"; - public static final String CAPABILITY_FILE_RECORDS = "FileRecords"; + public static final String PERMISSION_FILING = "Filing"; + public static final String PERMISSION_READ_RECORDS = "ReadRecords"; + public static final String PERMISSION_FILE_RECORDS = "FileRecords"; } diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java index 02bf6380b8..cb478cf65f 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/base/BaseRestTest.java @@ -286,7 +286,7 @@ public class BaseRestTest extends RestTest * Helper method to add permission on a component to user * @param component {@link FilePlanComponent} on which permission should be given * @param user {@link UserModel} for a user to be granted permission - * @param permission permission to be granted (e.g. "Filing") + * @param permission {@link UserPermissions} to be granted */ // FIXME: As of December 2016 there is no v1-style API for managing RM permissions. // Until such APIs have become available, this method is just a proxy to an "old-style" diff --git a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/DeleteRecordTests.java b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/DeleteRecordTests.java index 92b91b49c6..95a15a3219 100644 --- a/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/DeleteRecordTests.java +++ b/rm-automation/rm-automation-community-rest-api/src/test/java/org/alfresco/rest/rm/community/fileplancomponents/DeleteRecordTests.java @@ -39,7 +39,7 @@ import static org.springframework.http.HttpStatus.OK; import org.alfresco.rest.rm.community.base.BaseRestTest; import org.alfresco.rest.rm.community.model.fileplancomponents.FilePlanComponent; -import org.alfresco.rest.rm.community.model.user.UserCapabilities; +import org.alfresco.rest.rm.community.model.user.UserPermissions; import org.alfresco.rest.rm.community.model.user.UserRoles; import org.alfresco.rest.rm.community.requests.FilePlanComponentAPI; import org.alfresco.rest.rm.community.requests.RMSiteAPI; @@ -235,7 +235,7 @@ public class DeleteRecordTests extends BaseRestTest // grant deleteUser Filing privileges on randomFolder category, this will be // inherited to randomFolder addUserPermission(filePlanComponentAPI.getFilePlanComponent(randomFolder.getParentId()), - deleteUser, UserCapabilities.CAPABILITY_FILING); + deleteUser, UserPermissions.PERMISSION_FILING); // create a non-electronic record in randomFolder FilePlanComponent record = FilePlanComponent.builder()