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

RM: Compilation warnings cleaned

Browse Source 
* including deprecations caused by recent refactoring
  * all other supurious warnings



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@44873 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2012-12-20 03:23:15 +00:00
parent e4ea0fe02d
commit 2cb5a0aa16
47 changed files with 1004 additions and 1091 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/CompositeCapabilityTest.java
View File

@@ -85,7 +85,7 @@ public class CompositeCapabilityTest extends BaseRMTestCase
// Give all the users file permission objects
for (String user : testUsers)
{
securityService.setPermission(rmContainer, user, RMPermissionModel.FILING);
filePlanPermissionService.setPermission(rmContainer, user, RMPermissionModel.FILING);
}
}

14
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/capabilities/DeclarativeCapabilityTest.java
View File

@@ -32,7 +32,7 @@ import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CapabilityCondition;
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.CompositeCapability;
import org.alfresco.module.org_alfresco_module_rm.capability.declarative.DeclarativeCapability;
import org.alfresco.module.org_alfresco_module_rm.security.Role;
import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -134,9 +134,9 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
// Give all the users file permission objects
for (String user : testUsers)
{
securityService.setPermission(rmFolder, user, RMPermissionModel.FILING);
securityService.setPermission(moveToFolder, user, RMPermissionModel.READ_RECORDS);
securityService.setPermission(moveToCategory, user, RMPermissionModel.READ_RECORDS);
filePlanPermissionService.setPermission(rmFolder, user, RMPermissionModel.FILING);
filePlanPermissionService.setPermission(moveToFolder, user, RMPermissionModel.READ_RECORDS);
filePlanPermissionService.setPermission(moveToCategory, user, RMPermissionModel.READ_RECORDS);
}
}
@@ -177,7 +177,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
{
AccessStatus accessStatus = capability.hasPermission(filePlanComponent);
Set<Role> roles = securityService.getRolesByUser(filePlan, userName);
Set<Role> roles = filePlanRoleService.getRolesByUser(filePlan, userName);
if (roles.isEmpty() == true)
{
assertEquals("User " + userName + " has no RM role so we expect access to be denied for capability " + capability.getName(),
@@ -339,7 +339,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
{
for (String user : testUsers)
{
securityService.setPermission(moveToFolder, user, RMPermissionModel.FILING);
filePlanPermissionService.setPermission(moveToFolder, user, RMPermissionModel.FILING);
}
return null;
}
@@ -435,7 +435,7 @@ public class DeclarativeCapabilityTest extends BaseRMTestCase
{
for (String user : testUsers)
{
securityService.setPermission(moveToCategory, user, RMPermissionModel.FILING);
filePlanPermissionService.setPermission(moveToCategory, user, RMPermissionModel.FILING);
}
return null;
}

5
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/security/MethodSecurityTest.java
View File

@@ -18,11 +18,8 @@
*/
package org.alfresco.module.org_alfresco_module_rm.test.security;
import java.net.URL;
import org.alfresco.module.org_alfresco_module_rm.capability.RMPermissionModel;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.apache.log4j.PropertyConfigurator;
/**
* Tests method level security of core alfresco services.
@@ -66,7 +63,7 @@ public class MethodSecurityTest extends BaseRMTestCase implements RMPermissionMo
@Override
public Void run()
{
securityService.setPermission(rmContainer, rmUserName, READ_RECORDS);
filePlanPermissionService.setPermission(rmContainer, rmUserName, READ_RECORDS);
return null;
}

4
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAuditServiceImplTest.java
View File

@@ -134,8 +134,8 @@ public class RecordsManagementAuditServiceImplTest extends BaseRMTestCase
// Give all the users file permission objects
for (String user : testUsers)
{
securityService.setPermission(filePlan, user, FILING);
securityService.setPermission(rmContainer, user, FILING);
filePlanPermissionService.setPermission(filePlan, user, FILING);
filePlanPermissionService.setPermission(rmContainer, user, FILING);
}
}

3
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementSearchServiceImplTest.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.util.TestWithUserUtils;
*
* @author Roy Wetherall
*/
@SuppressWarnings("unused")
public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
{
@Override
@@ -50,7 +51,7 @@ public class RecordsManagementSearchServiceImplTest extends BaseRMTestCase
private NodeRef folderLevelRecordFolder;
private NodeRef recordLevelRecordFolder;
private NodeRef recordOne;
private NodeRef recordTwo;
private NodeRef recordThree;

4
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/system/NotificationServiceHelperSystemTest.java
View File

@@ -23,7 +23,7 @@ import java.util.ArrayList;
import java.util.List;
import org.alfresco.module.org_alfresco_module_rm.notification.RecordsManagementNotificationHelper;
import org.alfresco.module.org_alfresco_module_rm.security.Role;
import org.alfresco.module.org_alfresco_module_rm.role.Role;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMTestCase;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
@@ -92,7 +92,7 @@ public class NotificationServiceHelperSystemTest extends BaseRMTestCase
person = personService.createPerson(props);
// Find the authority for the given role
Role role = securityService.getRole(filePlan, NOTIFICATION_ROLE);
Role role = filePlanRoleService.getRole(filePlan, NOTIFICATION_ROLE);
assertNotNull("Notification role could not be retrieved", role);
String roleGroup = role.getRoleGroupName();
assertNotNull("Notification role group can not be null.", roleGroup);

23
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
View File

@@ -36,8 +36,9 @@ import org.alfresco.module.org_alfresco_module_rm.freeze.FreezeService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RmSiteType;
import org.alfresco.module.org_alfresco_module_rm.record.RecordService;
import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService;
import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -122,7 +123,8 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected RecordsManagementAdminService adminService;
protected RecordsManagementActionService actionService;
protected RecordsManagementSearchService rmSearchService;
protected RecordsManagementSecurityService securityService;
protected FilePlanRoleService filePlanRoleService;
protected FilePlanPermissionService filePlanPermissionService;
protected CapabilityService capabilityService;
protected VitalRecordService vitalRecordService;
protected DataSetService dataSetService;
@@ -338,7 +340,8 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
adminService = (RecordsManagementAdminService)applicationContext.getBean("RecordsManagementAdminService");
actionService = (RecordsManagementActionService)this.applicationContext.getBean("RecordsManagementActionService");
rmSearchService = (RecordsManagementSearchService)this.applicationContext.getBean("RecordsManagementSearchService");
securityService = (RecordsManagementSecurityService)this.applicationContext.getBean("RecordsManagementSecurityService");
filePlanRoleService = (FilePlanRoleService)this.applicationContext.getBean("FilePlanRoleService");
filePlanPermissionService = (FilePlanPermissionService)this.applicationContext.getBean("FilePlanPermissionService");
capabilityService = (CapabilityService)this.applicationContext.getBean("CapabilityService");
vitalRecordService = (VitalRecordService)this.applicationContext.getBean("VitalRecordService");
dataSetService = (DataSetService) applicationContext.getBean("DataSetService");
@@ -505,23 +508,23 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
rmUserName = GUID.generate();
rmUserPerson = createPerson(rmUserName);
securityService.assignRoleToAuthority(filePlan, "User", rmUserName);
filePlanRoleService.assignRoleToAuthority(filePlan, "User", rmUserName);
powerUserName = GUID.generate();
powerUserPerson = createPerson(powerUserName);
securityService.assignRoleToAuthority(filePlan, "PowerUser", powerUserName);
filePlanRoleService.assignRoleToAuthority(filePlan, "PowerUser", powerUserName);
securityOfficerName = GUID.generate();
securityOfficerPerson = createPerson(securityOfficerName);
securityService.assignRoleToAuthority(filePlan, "SecurityOfficer", securityOfficerName);
filePlanRoleService.assignRoleToAuthority(filePlan, "SecurityOfficer", securityOfficerName);
recordsManagerName = GUID.generate();
recordsManagerPerson = createPerson(recordsManagerName);
securityService.assignRoleToAuthority(filePlan, "RecordsManager", recordsManagerName);
filePlanRoleService.assignRoleToAuthority(filePlan, "RecordsManager", recordsManagerName);
rmAdminName = GUID.generate();
rmAdminPerson = createPerson(rmAdminName);
securityService.assignRoleToAuthority(filePlan, "Administrator", rmAdminName);
filePlanRoleService.assignRoleToAuthority(filePlan, "Administrator", rmAdminName);
testUsers = new String[]
{
@@ -538,8 +541,8 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
// Give all the users file permission objects
for (String user : testUsers)
{
securityService.setPermission(filePlan, user, FILING);
securityService.setPermission(rmContainer, user, FILING);
filePlanPermissionService.setPermission(filePlan, user, FILING);
filePlanPermissionService.setPermission(rmContainer, user, FILING);
}
}
}

9
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMWebScriptTestCase.java
View File

@@ -33,8 +33,9 @@ import org.alfresco.module.org_alfresco_module_rm.disposition.DispositionService
import org.alfresco.module.org_alfresco_module_rm.event.RecordsManagementEventService;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.module.org_alfresco_module_rm.model.behaviour.RmSiteType;
import org.alfresco.module.org_alfresco_module_rm.role.FilePlanRoleService;
import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
import org.alfresco.module.org_alfresco_module_rm.security.RecordsManagementSecurityService;
import org.alfresco.module.org_alfresco_module_rm.security.FilePlanPermissionService;
import org.alfresco.module.org_alfresco_module_rm.vital.VitalRecordService;
import org.alfresco.repo.policy.PolicyComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
@@ -89,7 +90,8 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
protected RecordsManagementAdminService adminService;
protected RecordsManagementActionService actionService;
protected RecordsManagementSearchService rmSearchService;
protected RecordsManagementSecurityService securityService;
protected FilePlanRoleService filePlanRoleService;
protected FilePlanPermissionService filePlanPermissionService;
protected RecordsManagementAuditService auditService;
protected CapabilityService capabilityService;
protected VitalRecordService vitalRecordService;
@@ -148,7 +150,8 @@ public class BaseRMWebScriptTestCase extends BaseWebScriptTest
adminService = (RecordsManagementAdminService)applicationContext.getBean("RecordsManagementAdminService");
actionService = (RecordsManagementActionService)applicationContext.getBean("RecordsManagementActionService");
rmSearchService = (RecordsManagementSearchService)applicationContext.getBean("RecordsManagementSearchService");
securityService = (RecordsManagementSecurityService)applicationContext.getBean("RecordsManagementSecurityService");
filePlanRoleService = (FilePlanRoleService)applicationContext.getBean("FilePlanRoleService");
filePlanPermissionService = (FilePlanPermissionService)applicationContext.getBean("FilePlanPermissionService");
auditService = (RecordsManagementAuditService)applicationContext.getBean("RecordsManagementAuditService");
capabilityService = (CapabilityService)applicationContext.getBean("CapabilityService");
vitalRecordService = (VitalRecordService)applicationContext.getBean("VitalRecordService");

6
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RMCaveatConfigScriptTest.java
View File

@@ -24,7 +24,6 @@ import java.util.List;
import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.caveat.RMCaveatConfigService;
import org.alfresco.module.org_alfresco_module_rm.test.util.BaseRMWebScriptTestCase;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.util.PropertyMap;
@@ -42,6 +41,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*
* @author Mark Rogers
*/
@SuppressWarnings("unused")
public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
{
private MutableAuthenticationService authenticationService;
@@ -90,7 +90,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
JSONObject top = new JSONObject(response.getContentAsString());
System.out.println(response.getContentAsString());
JSONArray data = top.getJSONArray("data");
assertNotNull(top.getJSONArray("data"));
}
/**
@@ -167,7 +167,7 @@ public class RMCaveatConfigScriptTest extends BaseRMWebScriptTestCase
String constraintName = data.getString("constraintName");
assertNotNull("constraintName is null", constraintName);
JSONArray allowedValues = data.getJSONArray("allowedValues");
// JSONArray allowedValues = data.getJSONArray("allowedValues");
// assertTrue("values not correct", compare(array, allowedValues));

31
rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RoleRestApiTest.java
View File

@@ -38,7 +38,8 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
*
* @author Roy Wetherall
*/
public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsManagementModel
public class RoleRestApiTest extends BaseRMWebScriptTestCase
implements RecordsManagementModel
{
protected static final String GET_ROLES_URL = "/api/rma/admin/rmroles";
protected static final String SERVICE_URL_PREFIX = "/alfresco/service";
@@ -50,11 +51,11 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
String role2 = GUID.generate();
// Create a couple or roles by hand
securityService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
securityService.createRole(filePlan, role2, "My Test Role Too", getListOfCapabilities(5));
filePlanRoleService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
filePlanRoleService.createRole(filePlan, role2, "My Test Role Too", getListOfCapabilities(5));
// Add the admin user to one of the roles
securityService.assignRoleToAuthority(filePlan, role1, "admin");
filePlanRoleService.assignRoleToAuthority(filePlan, role1, "admin");
try
{
@@ -103,8 +104,8 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
finally
{
// Clean up
securityService.deleteRole(filePlan, role1);
securityService.deleteRole(filePlan, role2);
filePlanRoleService.deleteRole(filePlan, role1);
filePlanRoleService.deleteRole(filePlan, role2);
}
}
@@ -143,7 +144,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
}
finally
{
securityService.deleteRole(filePlan, roleName);
filePlanRoleService.deleteRole(filePlan, roleName);
}
}
@@ -151,7 +152,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
public void testPutRole() throws Exception
{
String role1 = GUID.generate();
securityService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
filePlanRoleService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
try
{
@@ -189,7 +190,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
finally
{
// Clean up
securityService.deleteRole(filePlan, role1);
filePlanRoleService.deleteRole(filePlan, role1);
}
}
@@ -197,7 +198,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
public void testGetRole() throws Exception
{
String role1 = GUID.generate();
securityService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
filePlanRoleService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
try
{
@@ -222,7 +223,7 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
finally
{
// Clean up
securityService.deleteRole(filePlan, role1);
filePlanRoleService.deleteRole(filePlan, role1);
}
}
@@ -230,11 +231,11 @@ public class RoleRestApiTest extends BaseRMWebScriptTestCase implements RecordsM
public void testDeleteRole() throws Exception
{
String role1 = GUID.generate();
assertFalse(securityService.existsRole(filePlan, role1));
securityService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
assertTrue(securityService.existsRole(filePlan, role1));
assertFalse(filePlanRoleService.existsRole(filePlan, role1));
filePlanRoleService.createRole(filePlan, role1, "My Test Role", getListOfCapabilities(5));
assertTrue(filePlanRoleService.existsRole(filePlan, role1));
sendRequest(new DeleteRequest(GET_ROLES_URL + "/" + role1),200);
assertFalse(securityService.existsRole(filePlan, role1));
assertFalse(filePlanRoleService.existsRole(filePlan, role1));
// Bad request
sendRequest(new DeleteRequest(GET_ROLES_URL + "/cheese"), 404);