Repository: incubator-ranger Updated Branches: refs/heads/tag-policy 5e9ff8a20 -> d61bce5c4
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61bce5c/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java index 0623518..041f032 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java @@ -949,7 +949,8 @@ public class ServiceDBStore extends AbstractServiceStore { } @Override - public RangerServiceDefPaginatedList getPaginatedServiceDefs(SearchFilter filter) throws Exception { + + public PList<RangerServiceDef> getPaginatedServiceDefs(SearchFilter filter) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> ServiceDBStore.getPaginatedServiceDefs(" + filter + ")"); } @@ -961,17 +962,10 @@ public class ServiceDBStore extends AbstractServiceStore { if (LOG.isDebugEnabled()) { LOG.debug("==> ServiceDBStore.getPaginatedServiceDefs(" + filter + ")"); } - RangerServiceDefPaginatedList ret = new RangerServiceDefPaginatedList(); - ret.setServiceDefs(svcDefList.getServiceDefs()); - ret.setResultSize(svcDefList.getResultSize()); - ret.setPageSize(svcDefList.getPageSize()); - ret.setSortBy(svcDefList.getSortBy()); - ret.setSortType(svcDefList.getSortType()); - ret.setStartIndex(svcDefList.getStartIndex()); - ret.setTotalCount(svcDefList.getTotalCount()); + return new PList<RangerServiceDef>(svcDefList.getServiceDefs(), svcDefList.getStartIndex(), svcDefList.getPageSize(), svcDefList.getTotalCount(), + svcDefList.getResultSize(), svcDefList.getSortType(), svcDefList.getSortBy()); - return ret; } @Override @@ -1068,6 +1062,9 @@ public class ServiceDBStore extends AbstractServiceStore { List<XXTrxLog> trxLogList = svcService.getTransactionLog(createdService, RangerServiceService.OPERATION_CREATE_CONTEXT); bizUtil.createTrxLog(trxLogList); + if (createdService.getType().equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME)) { + createDefaultPolicy = false; + } if (createDefaultPolicy) { createDefaultPolicy(xCreatedService, vXUser); } @@ -1287,7 +1284,7 @@ public class ServiceDBStore extends AbstractServiceStore { return ret; } - public RangerServicePaginatedList getPaginatedServices(SearchFilter filter) throws Exception { + public PList<RangerService> getPaginatedServices(SearchFilter filter) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> ServiceDBStore.getPaginatedServices()"); } @@ -1300,16 +1297,9 @@ public class ServiceDBStore extends AbstractServiceStore { LOG.debug("<== ServiceDBStore.getPaginatedServices()"); } - RangerServicePaginatedList ret = new RangerServicePaginatedList(); - ret.setServices(serviceList.getServices()); - ret.setResultSize(serviceList.getResultSize()); - ret.setPageSize(serviceList.getPageSize()); - ret.setSortBy(serviceList.getSortBy()); - ret.setSortType(serviceList.getSortType()); - ret.setStartIndex(serviceList.getStartIndex()); - ret.setTotalCount(serviceList.getTotalCount()); + return new PList<RangerService>(serviceList.getServices(), serviceList.getStartIndex(), serviceList.getPageSize(), serviceList.getTotalCount(), + serviceList.getResultSize(), serviceList.getSortType(), serviceList.getSortBy()); - return ret; } @Override @@ -1500,7 +1490,8 @@ public class ServiceDBStore extends AbstractServiceStore { return ret; } - public RangerPolicyPaginatedList getPaginatedPolicies(SearchFilter filter) throws Exception { + + public PList<RangerPolicy> getPaginatedPolicies(SearchFilter filter) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> ServiceDBStore.getPaginatedPolicies(+ " + filter + ")"); } @@ -1519,16 +1510,10 @@ public class ServiceDBStore extends AbstractServiceStore { LOG.debug("<== ServiceDBStore.getPaginatedPolicies(" + filter + "): count=" + policyList.getListSize()); } - RangerPolicyPaginatedList ret = new RangerPolicyPaginatedList(); - ret.setPolicies(policyList.getPolicies()); - ret.setResultSize(policyList.getResultSize()); - ret.setPageSize(policyList.getPageSize()); - ret.setSortBy(policyList.getSortBy()); - ret.setSortType(policyList.getSortType()); - ret.setStartIndex(policyList.getStartIndex()); - ret.setTotalCount(policyList.getTotalCount()); - return ret; + return new PList<RangerPolicy>(policyList.getPolicies(), policyList.getStartIndex(), policyList.getPageSize(), policyList.getTotalCount(), + policyList.getResultSize(), policyList.getSortType(), policyList.getSortBy()); + } @Override @@ -1548,7 +1533,8 @@ public class ServiceDBStore extends AbstractServiceStore { return ret; } - public RangerPolicyPaginatedList getPaginatedServicePolicies(Long serviceId, SearchFilter filter) throws Exception { + + public PList<RangerPolicy> getPaginatedServicePolicies(Long serviceId, SearchFilter filter) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> ServiceDBStore.getPaginatedServicePolicies(" + serviceId + ")"); } @@ -1559,11 +1545,9 @@ public class ServiceDBStore extends AbstractServiceStore { throw new Exception("service does not exist - id='" + serviceId); } - RangerPolicyPaginatedList ret = getPaginatedServicePolicies(service.getName(), filter); - if (LOG.isDebugEnabled()) { - LOG.debug("<== ServiceDBStore.getPaginatedServicePolicies(" + serviceId + ")"); - } + PList<RangerPolicy> ret = getPaginatedServicePolicies(service.getName(), filter); + return ret; } @@ -1594,12 +1578,14 @@ public class ServiceDBStore extends AbstractServiceStore { return ret; } - public RangerPolicyPaginatedList getPaginatedServicePolicies(String serviceName, SearchFilter filter) throws Exception { + + public PList<RangerPolicy> getPaginatedServicePolicies(String serviceName, SearchFilter filter) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> ServiceDBStore.getPaginatedServicePolicies(" + serviceName + ")"); } - RangerPolicyPaginatedList ret = null; + + PList<RangerPolicy> ret = null; try { if (filter == null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61bce5c/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java index 85e6643..2167151 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java @@ -74,9 +74,7 @@ import org.apache.ranger.plugin.policyengine.RangerPolicyEngineCache; import org.apache.ranger.plugin.policyengine.RangerPolicyEngineOptions; import org.apache.ranger.plugin.policyevaluator.RangerPolicyEvaluator; import org.apache.ranger.plugin.service.ResourceLookupContext; -import org.apache.ranger.plugin.store.RangerPolicyPaginatedList; -import org.apache.ranger.plugin.store.RangerServiceDefPaginatedList; -import org.apache.ranger.plugin.store.RangerServicePaginatedList; +import org.apache.ranger.plugin.store.PList; import org.apache.ranger.plugin.store.ServiceStore; import org.apache.ranger.plugin.util.GrantRevokeRequest; import org.apache.ranger.plugin.util.SearchFilter; @@ -303,7 +301,8 @@ public class ServiceREST { } RangerServiceDefList ret = null; - RangerServiceDefPaginatedList paginatedSvcDefs = null; + + PList<RangerServiceDef> paginatedSvcDefs = null; SearchFilter filter = searchUtil.getSearchFilter(request, serviceDefService.sortFields); @@ -316,7 +315,8 @@ public class ServiceREST { } ret = new RangerServiceDefList(); - ret.setServiceDefs(paginatedSvcDefs.getServiceDefs()); + + ret.setServiceDefs(paginatedSvcDefs.getList()); ret.setPageSize(paginatedSvcDefs.getPageSize()); ret.setResultSize(paginatedSvcDefs.getResultSize()); ret.setStartIndex(paginatedSvcDefs.getStartIndex()); @@ -478,7 +478,8 @@ public class ServiceREST { } RangerServiceList ret = null; - RangerServicePaginatedList paginatedSvcs = null; + + PList<RangerService> paginatedSvcs = null; SearchFilter filter = searchUtil.getSearchFilter(request, svcService.sortFields); @@ -492,7 +493,8 @@ public class ServiceREST { ret = new RangerServiceList(); - ret.setServices(paginatedSvcs.getServices()); + + ret.setServices(paginatedSvcs.getList()); ret.setPageSize(paginatedSvcs.getPageSize()); ret.setResultSize(paginatedSvcs.getResultSize()); ret.setStartIndex(paginatedSvcs.getStartIndex()); @@ -1006,7 +1008,8 @@ public class ServiceREST { } RangerPolicyList ret = null; - RangerPolicyPaginatedList paginatedPolicies = null; + + PList<RangerPolicy> paginatedPolicies = null; SearchFilter filter = searchUtil.getSearchFilter(request, policyService.sortFields); @@ -1014,7 +1017,8 @@ public class ServiceREST { paginatedPolicies = svcStore.getPaginatedPolicies(filter); ret = new RangerPolicyList(); - ret.setPolicies(paginatedPolicies.getPolicies()); + + ret.setPolicies(paginatedPolicies.getList()); ret.setPageSize(paginatedPolicies.getPageSize()); ret.setResultSize(paginatedPolicies.getResultSize()); ret.setStartIndex(paginatedPolicies.getStartIndex()); @@ -1098,7 +1102,8 @@ public class ServiceREST { } RangerPolicyList ret = null; - RangerPolicyPaginatedList paginatedPolicies = null; + + PList<RangerPolicy> paginatedPolicies = null; SearchFilter filter = searchUtil.getSearchFilter(request, policyService.sortFields); @@ -1106,7 +1111,8 @@ public class ServiceREST { paginatedPolicies = svcStore.getPaginatedServicePolicies(serviceId, filter); ret = new RangerPolicyList(); - ret.setPolicies(paginatedPolicies.getPolicies()); + + ret.setPolicies(paginatedPolicies.getList()); ret.setPageSize(paginatedPolicies.getPageSize()); ret.setResultSize(paginatedPolicies.getResultSize()); ret.setStartIndex(paginatedPolicies.getStartIndex()); @@ -1142,7 +1148,8 @@ public class ServiceREST { } RangerPolicyList ret = null; - RangerPolicyPaginatedList paginatedPolicies = null; + + PList<RangerPolicy> paginatedPolicies = null; SearchFilter filter = searchUtil.getSearchFilter(request, policyService.sortFields); @@ -1150,7 +1157,8 @@ public class ServiceREST { paginatedPolicies = svcStore.getPaginatedServicePolicies(serviceName, filter); ret = new RangerPolicyList(); - ret.setPolicies(paginatedPolicies.getPolicies()); + + ret.setPolicies(paginatedPolicies.getList()); ret.setPageSize(paginatedPolicies.getPageSize()); ret.setResultSize(paginatedPolicies.getResultSize()); ret.setStartIndex(paginatedPolicies.getStartIndex()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61bce5c/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java index 16b9c21..e91952b 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java @@ -85,9 +85,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef.RangerEnumElementDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerPolicyConditionDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerServiceConfigDef; -import org.apache.ranger.plugin.store.RangerPolicyPaginatedList; -import org.apache.ranger.plugin.store.RangerServiceDefPaginatedList; -import org.apache.ranger.plugin.store.RangerServicePaginatedList; +import org.apache.ranger.plugin.store.PList; import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.ServicePolicies; import org.apache.ranger.security.context.RangerContextHolder; @@ -542,10 +540,10 @@ public class TestServiceDBStore { Mockito.when(serviceDefService.searchRangerServiceDefs(filter)) .thenReturn(serviceDefList); - RangerServiceDefPaginatedList dbServiceDefList = serviceDBStore + PList<RangerServiceDef> dbServiceDefList = serviceDBStore .getPaginatedServiceDefs(filter); Assert.assertNotNull(dbServiceDefList); - Assert.assertEquals(dbServiceDefList.getServiceDefs(), + Assert.assertEquals(dbServiceDefList.getList(), serviceDefList.getServiceDefs()); Mockito.verify(serviceDefService).searchRangerServiceDefs(filter); } @@ -1066,10 +1064,10 @@ public class TestServiceDBStore { Mockito.when(svcService.searchRangerServices(filter)).thenReturn( serviceListObj); - RangerServicePaginatedList dbServiceList = serviceDBStore + PList<RangerService> dbServiceList = serviceDBStore .getPaginatedServices(filter); Assert.assertNotNull(dbServiceList); - Assert.assertEquals(dbServiceList.getServices(), + Assert.assertEquals(dbServiceList.getList(), serviceListObj.getServices()); Mockito.verify(svcService).searchRangerServices(filter); @@ -1701,7 +1699,7 @@ public class TestServiceDBStore { Mockito.when(policyService.searchRangerPolicies(filter)).thenReturn( policyListObj); - RangerPolicyPaginatedList dbRangerPolicyList = serviceDBStore + PList<RangerPolicy> dbRangerPolicyList = serviceDBStore .getPaginatedPolicies(filter); Assert.assertNotNull(dbRangerPolicyList); Mockito.verify(policyService).searchRangerPolicies(filter); @@ -1785,7 +1783,8 @@ public class TestServiceDBStore { Mockito.when(policyService.searchRangerPolicies(filter)).thenReturn( policyList); - RangerPolicyPaginatedList dbRangerPolicyList = serviceDBStore + + PList<RangerPolicy> dbRangerPolicyList = serviceDBStore .getPaginatedServicePolicies(serviceName, filter); Assert.assertNotNull(dbRangerPolicyList); Mockito.verify(policyService).searchRangerPolicies(filter); @@ -1800,7 +1799,8 @@ public class TestServiceDBStore { RangerService rangerService = rangerService(); Mockito.when(svcService.read(rangerService.getId())).thenReturn( rangerService); - RangerPolicyPaginatedList dbRangerPolicyList = serviceDBStore + + PList<RangerPolicy> dbRangerPolicyList = serviceDBStore .getPaginatedServicePolicies(rangerService.getId(), filter); Assert.assertNull(dbRangerPolicyList); Mockito.verify(svcService).read(rangerService.getId()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/d61bce5c/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java index 5501d68..5c72d0d 100644 --- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java +++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java @@ -58,8 +58,7 @@ import org.apache.ranger.plugin.model.validation.RangerPolicyValidator; import org.apache.ranger.plugin.model.validation.RangerServiceDefValidator; import org.apache.ranger.plugin.model.validation.RangerServiceValidator; import org.apache.ranger.plugin.service.ResourceLookupContext; -import org.apache.ranger.plugin.store.RangerPolicyPaginatedList; -import org.apache.ranger.plugin.store.RangerServicePaginatedList; +import org.apache.ranger.plugin.store.PList; import org.apache.ranger.plugin.util.GrantRevokeRequest; import org.apache.ranger.plugin.util.SearchFilter; import org.apache.ranger.plugin.util.ServicePolicies; @@ -699,7 +698,8 @@ public class TestServiceREST { @Test public void test21countPolicies() throws Exception { HttpServletRequest request = Mockito.mock(HttpServletRequest.class); - RangerPolicyPaginatedList ret = Mockito.mock(RangerPolicyPaginatedList.class); + + PList<RangerPolicy> ret = Mockito.mock(PList.class); SearchFilter filter = new SearchFilter(); filter.setParam(SearchFilter.POLICY_NAME, "policyName"); filter.setParam(SearchFilter.SERVICE_NAME, "serviceName"); @@ -725,7 +725,8 @@ public class TestServiceREST { HttpServletRequest request = Mockito.mock(HttpServletRequest.class); RangerPolicy rangerPolicy = rangerPolicy(); - RangerPolicyPaginatedList ret = Mockito.mock(RangerPolicyPaginatedList.class); + + PList<RangerPolicy> ret = Mockito.mock(PList.class); SearchFilter filter = new SearchFilter(); filter.setParam(SearchFilter.POLICY_NAME, "policyName"); filter.setParam(SearchFilter.SERVICE_NAME, "serviceName"); @@ -750,7 +751,8 @@ public class TestServiceREST { public void test23getServicePoliciesByName() throws Exception { HttpServletRequest request = Mockito.mock(HttpServletRequest.class); RangerPolicy rangerPolicy = rangerPolicy(); - RangerPolicyPaginatedList ret = Mockito.mock(RangerPolicyPaginatedList.class); + + PList<RangerPolicy> ret = Mockito.mock(PList.class); SearchFilter filter = new SearchFilter(); filter.setParam(SearchFilter.POLICY_NAME, "policyName"); filter.setParam(SearchFilter.SERVICE_NAME, "serviceName"); @@ -860,7 +862,8 @@ public class TestServiceREST { @Test public void test34countServices() throws Exception { HttpServletRequest request = Mockito.mock(HttpServletRequest.class); - RangerServicePaginatedList ret = Mockito.mock(RangerServicePaginatedList.class); + + PList<RangerService> ret = Mockito.mock(PList.class); SearchFilter filter = new SearchFilter(); filter.setParam(SearchFilter.POLICY_NAME, "policyName"); filter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
