RANGER-256: service-def retrieval from DB updated to handle context-enrichers
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/c11c7f2f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/c11c7f2f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/c11c7f2f Branch: refs/heads/master Commit: c11c7f2f8bbc7b3f2e9b2ab876d1dac255571485 Parents: 8df90d4 Author: Madhan Neethiraj <[email protected]> Authored: Sat Feb 21 03:06:41 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Sat Feb 21 03:06:41 2015 -0800 ---------------------------------------------------------------------- .../apache/ranger/service/RangerServiceDefService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/c11c7f2f/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java index 4a79505..1ebbc17 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java @@ -3,6 +3,7 @@ package org.apache.ranger.service; import java.util.ArrayList; import java.util.List; +import org.apache.ranger.entity.XXContextEnricherDef; import org.apache.ranger.entity.XXAccessTypeDef; import org.apache.ranger.entity.XXEnumDef; import org.apache.ranger.entity.XXPolicyConditionDef; @@ -11,6 +12,7 @@ import org.apache.ranger.entity.XXServiceConfigDef; import org.apache.ranger.entity.XXServiceDef; import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerAccessTypeDef; +import org.apache.ranger.plugin.model.RangerServiceDef.RangerContextEnricherDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerEnumDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerPolicyConditionDef; import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef; @@ -81,6 +83,16 @@ public class RangerServiceDefService extends RangerServiceDefServiceBase<XXServi serviceDef.setPolicyConditions(policyConditions); } + List<XXContextEnricherDef> xContextEnrichers = daoMgr.getXXContextEnricherDef().findByServiceDefId(serviceDefId); + if(!stringUtil.isEmpty(xContextEnrichers)) { + List<RangerContextEnricherDef> contextEnrichers = new ArrayList<RangerServiceDef.RangerContextEnricherDef>(); + for(XXContextEnricherDef xContextEnricherDef : xContextEnrichers) { + RangerContextEnricherDef contextEnricher = populateXXToRangerContextEnricherDef(xContextEnricherDef); + contextEnrichers.add(contextEnricher); + } + serviceDef.setContextEnrichers(contextEnrichers); + } + List<XXEnumDef> xEnumList = daoMgr.getXXEnumDef().findByServiceDefId(serviceDefId); if(!stringUtil.isEmpty(xEnumList)) { List<RangerEnumDef> enums = new ArrayList<RangerEnumDef>();
