Repository: incubator-ranger Updated Branches: refs/heads/tag-policy fcf0a6efd -> 7917b7013
RANGER-274: add externalId field to RangerTaggedResource and RangerResourceTag objects Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/7917b701 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/7917b701 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/7917b701 Branch: refs/heads/tag-policy Commit: 7917b7013c7189def4c7f8a22768065713484b0d Parents: fcf0a6e Author: Madhan Neethiraj <[email protected]> Authored: Thu Jul 30 15:32:35 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Jul 30 15:32:35 2015 -0700 ---------------------------------------------------------------------- .../plugin/model/RangerTaggedResource.java | 35 +++++++++++++++++--- 1 file changed, 31 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/7917b701/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java index da74003..afcaa08 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTaggedResource.java @@ -46,18 +46,27 @@ import java.util.*; public class RangerTaggedResource extends RangerBaseModelObject { private static final long serialVersionUID = 1L; + private String externalId; private RangerTaggedResourceKey key; private List<RangerResourceTag> tags; - public RangerTaggedResource(RangerTaggedResourceKey key, List<RangerResourceTag> tags) { + public RangerTaggedResource(String externalId, RangerTaggedResourceKey key, List<RangerResourceTag> tags) { + super(); + setExternalId(externalId); setKey(key); setTags(tags); } + public RangerTaggedResource(RangerTaggedResourceKey key, List<RangerResourceTag> tags) { + this(null, key, tags); + } + public RangerTaggedResource() { - this(null, null); + this(null, null, null); } + public String getExternalId() { return externalId; } + public RangerTaggedResourceKey getKey() { return key; } public List<RangerResourceTag> getTags() { @@ -66,6 +75,10 @@ public class RangerTaggedResource extends RangerBaseModelObject { // And corresponding set methods + public void setExternalId(String externalId) { + this.externalId = externalId; + } + public void setKey(RangerTaggedResourceKey key) { this.key = key == null ? new RangerTaggedResourceKey() : key; } @@ -87,6 +100,7 @@ public class RangerTaggedResource extends RangerBaseModelObject { sb.append("{ "); + sb.append("externalId={").append(externalId).append("} "); sb.append("key={"); if (key != null) { key.toString(sb); @@ -120,19 +134,31 @@ public class RangerTaggedResource extends RangerBaseModelObject { public static class RangerResourceTag implements java.io.Serializable { private static final long serialVersionUID = 1L; + private String externalId = null; private String name = null; private Map<String, String> attributeValues = null; - public RangerResourceTag(String name, Map<String, String> attributeValues) { + public RangerResourceTag(String externalId, String name, Map<String, String> attributeValues) { super(); + setExternalId(externalId); setName(name); setAttributeValues(attributeValues); } + public RangerResourceTag(String name, Map<String, String> attributeValues) { + this(null, name, attributeValues); + } + public RangerResourceTag() { - this(null, null); + this(null, null, null); } + public String getExternalId() { + return externalId; + } + + public void setExternalId(String externalId) { this.externalId = externalId; } + public String getName() { return name; } @@ -160,6 +186,7 @@ public class RangerTaggedResource extends RangerBaseModelObject { sb.append("{ "); + sb.append("externalId={").append(externalId).append("} "); sb.append("name={").append(name).append("} "); sb.append("attributeValues={");
