From 0f133ce23cdd657c840b0f555a0ad14029d058af Mon Sep 17 00:00:00 2001 From: Sanjay Dalal Date: Fri, 16 Apr 2010 23:04:15 +0000 Subject: [PATCH] CSPACE-1518 refactoring test: authorization-mgt M authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java M authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleStorageClient.java --- .../PermissionRoleDocumentHandler.java | 54 +++++++++++-------- .../storage/PermissionRoleStorageClient.java | 5 +- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java index 933816cbd..4ac3831ae 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleDocumentHandler.java @@ -32,7 +32,6 @@ import org.collectionspace.services.authorization.PermissionValue; import org.collectionspace.services.authorization.PermissionsRolesList; import org.collectionspace.services.authorization.RoleValue; import org.collectionspace.services.authorization.SubjectType; -import org.collectionspace.services.common.context.ServiceContext; import org.collectionspace.services.common.document.AbstractDocumentHandlerImpl; import org.collectionspace.services.common.document.DocumentFilter; @@ -89,36 +88,28 @@ public class PermissionRoleDocumentHandler List pvs = new ArrayList(); pr.setPermissions(pvs); - PermissionValue pv = new PermissionValue(); - pv.setPermissionId(prr0.getPermissionId()); - pv.setResourceName(prr0.getPermissionResource()); + PermissionValue pv = buildPermissionValue(prr0); pvs.add(pv); //add roles List rvs = new ArrayList(); pr.setRoles(rvs); for (PermissionRoleRel prr : prrl) { - RoleValue rv = new RoleValue(); - rv.setRoleId(prr.getRoleId()); - rv.setRoleName(prr.getRoleName()); + RoleValue rv = buildRoleValue(prr); rvs.add(rv); } } else if (SubjectType.PERMISSION.equals(subject)) { List rvs = new ArrayList(); pr.setRoles(rvs); - RoleValue rv = new RoleValue(); - rv.setRoleId(prr0.getRoleId()); - rv.setRoleName(prr0.getRoleName()); + RoleValue rv = buildRoleValue(prr0); rvs.add(rv); //add permssions List pvs = new ArrayList(); pr.setPermissions(pvs); for (PermissionRoleRel prr : prrl) { - PermissionValue pv = new PermissionValue(); - pv.setPermissionId(prr.getPermissionId()); - pv.setResourceName(prr.getPermissionResource()); + PermissionValue pv = buildPermissionValue(prr); pvs.add(pv); } } @@ -137,21 +128,15 @@ public class PermissionRoleDocumentHandler //subject mismatch should have been checked during validation } if (subject.equals(SubjectType.ROLE)) { - String permId = pr.getPermissions().get(0).getPermissionId(); + PermissionValue pv = pr.getPermissions().get(0); for (RoleValue rv : pr.getRoles()) { - PermissionRoleRel prr = new PermissionRoleRel(); - prr.setPermissionId(permId); - prr.setRoleId(rv.getRoleId()); - prr.setRoleName(rv.getRoleName()); + PermissionRoleRel prr = buildPermissonRoleRel(pv, rv); prrl.add(prr); } } else if (SubjectType.PERMISSION.equals(subject)) { - String roleId = pr.getRoles().get(0).getRoleId(); + RoleValue rv = pr.getRoles().get(0); for (PermissionValue pv : pr.getPermissions()) { - PermissionRoleRel prr = new PermissionRoleRel(); - prr.setPermissionId(pv.getPermissionId()); - prr.setRoleId(roleId); - prr.setPermissionResource(pv.getResourceName()); + PermissionRoleRel prr = buildPermissonRoleRel(pv, rv); prrl.add(prr); } } @@ -195,4 +180,27 @@ public class PermissionRoleDocumentHandler public DocumentFilter createDocumentFilter() { return new DocumentFilter(this.getServiceContext()); } + + private PermissionValue buildPermissionValue(PermissionRoleRel prr) { + PermissionValue pv = new PermissionValue(); + pv.setPermissionId(prr.getPermissionId()); + pv.setResourceName(prr.getPermissionResource()); + return pv; + } + + private RoleValue buildRoleValue(PermissionRoleRel prr) { + RoleValue rv = new RoleValue(); + rv.setRoleId(prr.getRoleId()); + rv.setRoleName(prr.getRoleName()); + return rv; + } + + private PermissionRoleRel buildPermissonRoleRel(PermissionValue pv, RoleValue rv) { + PermissionRoleRel prr = new PermissionRoleRel(); + prr.setPermissionId(pv.getPermissionId()); + prr.setPermissionResource(pv.getResourceName()); + prr.setRoleId(rv.getRoleId()); + prr.setRoleName(rv.getRoleName()); + return prr; + } } diff --git a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleStorageClient.java b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleStorageClient.java index 8afa3be31..8aa209676 100644 --- a/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleStorageClient.java +++ b/services/authorization-mgt/service/src/main/java/org/collectionspace/services/authorization/storage/PermissionRoleStorageClient.java @@ -133,15 +133,16 @@ public class PermissionRoleStorageClient extends JpaStorageClientImpl { * @throws DocumentNotFoundException * @throws DocumentException */ + @Override public void get(ServiceContext ctx, String id, DocumentHandler handler) throws DocumentNotFoundException, DocumentException { if (ctx == null) { throw new IllegalArgumentException( - "JpaStorageClient.get: ctx is missing"); + "PermissionRoleStorageClient.get: ctx is missing"); } if (handler == null) { throw new IllegalArgumentException( - "JpaStorageClient.get: handler is missing"); + "PermissionRoleStorageClient.get: handler is missing"); } DocumentFilter docFilter = handler.getDocumentFilter(); if (docFilter == null) { -- 2.47.3