Repository: incubator-ranger Updated Branches: refs/heads/master 5ac7c52ad -> 4faca7151
legacy public API fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/4faca715 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/4faca715 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/4faca715 Branch: refs/heads/master Commit: 4faca7151f72c39a5997e4b79bd250183ad14987 Parents: 5ac7c52 Author: Madhan Neethiraj <[email protected]> Authored: Sat May 2 14:43:32 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon May 4 14:04:42 2015 -0700 ---------------------------------------------------------------------- .../apache/ranger/common/RangerSearchUtil.java | 8 +++++- .../java/org/apache/ranger/rest/AssetREST.java | 27 ++++++++++---------- 2 files changed, 21 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4faca715/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java index fddd3e0..f2b89ba 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java @@ -119,9 +119,15 @@ public class RangerSearchUtil extends SearchUtil { if (repositoryType != null) { repositoryType = repositoryType.toLowerCase() ; } + + String repositoryId = request.getParameter("repositoryId"); + if(repositoryId == null) { + repositoryId = request.getParameter("assetId"); + } + ret.setParam(SearchFilter.SERVICE_TYPE, repositoryType) ; ret.setParam(SearchFilter.SERVICE_NAME, request.getParameter("repositoryName")); - ret.setParam(SearchFilter.SERVICE_ID, request.getParameter("repositoryId")); + ret.setParam(SearchFilter.SERVICE_ID, repositoryId); ret.setParam(SearchFilter.POLICY_NAME, request.getParameter("policyName")); ret.setParam(SearchFilter.USER, request.getParameter("userName")); ret.setParam(SearchFilter.GROUP, request.getParameter("groupName")); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/4faca715/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java index 0d6b6a9..12046d5 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/AssetREST.java @@ -53,6 +53,7 @@ import org.apache.ranger.common.annotation.RangerAnnotationJSMgrName; import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.util.GrantRevokeRequest; +import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.service.XAccessAuditService; import org.apache.ranger.service.XAgentService; import org.apache.ranger.service.XAssetService; @@ -238,7 +239,9 @@ public class AssetREST { VXAssetList ret = new VXAssetList(); - List<RangerService> services = serviceREST.getServices(request).getServices(); + SearchFilter filter = searchUtil.getSearchFilterFromLegacyRequestForRepositorySearch(request, xAssetService.sortFields); + + List<RangerService> services = serviceREST.getServices(filter); if(services != null) { List<VXAsset> assets = new ArrayList<VXAsset>(); @@ -271,9 +274,7 @@ public class AssetREST { VXLong ret = new VXLong(); - Long svcCount = serviceREST.countServices(request); - - ret.setValue(svcCount == null ? 0 : svcCount.longValue()); + ret.setValue(searchXAssets(request).getListSize()); if(logger.isDebugEnabled()) { logger.debug("<== AssetREST.countXAssets(): " + ret); @@ -379,19 +380,21 @@ public class AssetREST { VXResourceList ret = new VXResourceList(); - String arg = request.getParameter("assetId"); - Long assetId = (arg == null || arg.isEmpty()) ? null : Long.parseLong(arg); + SearchFilter filter = searchUtil.getSearchFilterFromLegacyRequest(request, xResourceService.sortFields); - List<RangerPolicy> policies = assetId != null ? serviceREST.getServicePolicies(assetId, request) - .getPolicies() : serviceREST.getPolicies(request).getPolicies(); + List<RangerPolicy> policies = serviceREST.getPolicies(filter); if(policies != null) { - List<VXResource> resources = new ArrayList<VXResource>(policies.size()); + List<VXResource> resources = new ArrayList<VXResource>(); for(RangerPolicy policy : policies) { RangerService service = serviceREST.getServiceByName(policy.getService()); - resources.add(serviceUtil.toVXResource(policy, service)); + VXResource resource = serviceUtil.toVXResource(policy, service); + + if(resource != null) { + resources.add(resource); + } } ret.setVXResources(resources); @@ -414,9 +417,7 @@ public class AssetREST { VXLong ret = new VXLong(); - Long count = serviceREST.countPolicies(request); - - ret.setValue(count == null ? 0 : count.longValue()); + ret.setValue(searchXResources(request).getListSize()); if(logger.isDebugEnabled()) { logger.debug("<== AssetREST.countXAssets(): " + ret);
