This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch RANGER-3923
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/RANGER-3923 by this push:
new 56d559ed4 RANGER-3923: renamed class RangerGdsACL to RangerGdsObjectACL
56d559ed4 is described below
commit 56d559ed4e8286ed0268e7fd0c382e726d0bcfb0
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Mon May 8 13:27:50 2023 -0700
RANGER-3923: renamed class RangerGdsACL to RangerGdsObjectACL
---
.../java/org/apache/ranger/plugin/model/RangerGds.java | 18 +++++++++---------
intg/src/main/python/apache_ranger/model/ranger_gds.py | 8 ++++----
.../apache/ranger/service/RangerGdsDatasetService.java | 2 +-
.../apache/ranger/service/RangerGdsProjectService.java | 2 +-
.../apache/ranger/validation/RangerGdsValidator.java | 4 ++--
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git
a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerGds.java
b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerGds.java
index 7e13defa9..b735da97a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerGds.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerGds.java
@@ -90,7 +90,7 @@ public class RangerGds {
private String name;
private List<RangerPrincipal> admins;
- private RangerGdsACL acl;
+ private RangerGdsObjectACL acl;
private String termsOfUse;
public RangerDataset() { }
@@ -103,9 +103,9 @@ public class RangerGds {
public void setAdmins(List<RangerPrincipal> admins) { this.admins =
admins; }
- public RangerGdsACL getAcl() { return acl; }
+ public RangerGdsObjectACL getAcl() { return acl; }
- public void setAcl(RangerGdsACL acl) { this.acl = acl; }
+ public void setAcl(RangerGdsObjectACL acl) { this.acl = acl; }
public String getTermsOfUse() { return termsOfUse; }
@@ -137,7 +137,7 @@ public class RangerGds {
private String name;
private List<RangerPrincipal> admins;
- private RangerGdsACL acl;
+ private RangerGdsObjectACL acl;
private String termsOfUse;
public RangerProject() { }
@@ -150,9 +150,9 @@ public class RangerGds {
public void setAdmins(List<RangerPrincipal> admins) { this.admins =
admins; }
- public RangerGdsACL getAcl() { return acl; }
+ public RangerGdsObjectACL getAcl() { return acl; }
- public void setAcl(RangerGdsACL acl) { this.acl = acl; }
+ public void setAcl(RangerGdsObjectACL acl) { this.acl = acl; }
public String getTermsOfUse() { return termsOfUse; }
@@ -447,7 +447,7 @@ public class RangerGds {
@JsonIgnoreProperties(ignoreUnknown = true)
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
- public static class RangerGdsACL implements java.io.Serializable {
+ public static class RangerGdsObjectACL implements java.io.Serializable {
private static final long serialVersionUID = 1L;
private Map<String, GdsPermission> users;
@@ -455,7 +455,7 @@ public class RangerGds {
private Map<String, GdsPermission> roles;
- public RangerGdsACL() { }
+ public RangerGdsObjectACL() { }
public Map<String, GdsPermission> getUsers() { return users; }
@@ -475,7 +475,7 @@ public class RangerGds {
}
public StringBuilder toString(StringBuilder sb) {
- sb.append("RangerGdsACL={");
+ sb.append("RangerGdsObjectACL={");
sb.append("users={").append(users).append("} ")
.append("groups={").append(groups).append("} ")
diff --git a/intg/src/main/python/apache_ranger/model/ranger_gds.py
b/intg/src/main/python/apache_ranger/model/ranger_gds.py
index b891ee1bd..f1572738c 100644
--- a/intg/src/main/python/apache_ranger/model/ranger_gds.py
+++ b/intg/src/main/python/apache_ranger/model/ranger_gds.py
@@ -88,7 +88,7 @@ class RangerDataset(RangerGdsBaseModelObject):
super(RangerDataset, self).type_coerce_attrs()
self.admins = type_coerce_list(self.admins, RangerPrincipal)
- self.acl = type_coerce_dict(self.acl, RangerGdsACL)
+ self.acl = type_coerce_dict(self.acl, RangerGdsObjectACL)
class RangerProject(RangerGdsBaseModelObject):
@@ -107,7 +107,7 @@ class RangerProject(RangerGdsBaseModelObject):
super(RangerProject, self).type_coerce_attrs()
self.admins = type_coerce_list(self.admins, RangerPrincipal)
- self.acl = type_coerce_dict(self.acl, RangerGdsACL)
+ self.acl = type_coerce_dict(self.acl, RangerGdsObjectACL)
class RangerDataShare(RangerGdsBaseModelObject):
@@ -199,7 +199,7 @@ class RangerDatasetInProject(RangerGdsBaseModelObject):
self.validitySchedule = type_coerce(self.validitySchedule,
RangerValiditySchedule)
-class RangerGdsACL(RangerBase):
+class RangerGdsObjectACL(RangerBase):
def __init__(self, attrs=None):
if attrs is None:
attrs = {}
@@ -211,7 +211,7 @@ class RangerGdsACL(RangerBase):
self.roles = attrs.get('roles')
def type_coerce_attrs(self):
- super(RangerGdsACL, self).type_coerce_attrs()
+ super(RangerGdsObjectACL, self).type_coerce_attrs()
self.users = type_coerce_dict(self.users, GdsPermission)
self.groups = type_coerce_dict(self.groups, GdsPermission)
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
index 0f17e97ea..09c28cced 100644
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsDatasetService.java
@@ -175,7 +175,7 @@ public class RangerGdsDatasetService extends
RangerGdsBaseModelService<XXGdsData
vObj.setName(xObj.getName());
vObj.setDescription(xObj.getDescription());
vObj.setAdmins(JsonUtils.jsonToRangerPrincipalList(xObj.getAdmins()));
- vObj.setAcl(JsonUtils.jsonToObject(xObj.getAcl(),
RangerGds.RangerGdsACL.class));
+ vObj.setAcl(JsonUtils.jsonToObject(xObj.getAcl(),
RangerGds.RangerGdsObjectACL.class));
vObj.setTermsOfUse(xObj.getTermsOfUse());
vObj.setOptions(JsonUtils.jsonToMapStringString(xObj.getOptions()));
vObj.setAdditionalInfo(JsonUtils.jsonToMapStringString(xObj.getAdditionalInfo()));
diff --git
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsProjectService.java
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsProjectService.java
index f1454bf61..2aa7a1ea8 100644
---
a/security-admin/src/main/java/org/apache/ranger/service/RangerGdsProjectService.java
+++
b/security-admin/src/main/java/org/apache/ranger/service/RangerGdsProjectService.java
@@ -175,7 +175,7 @@ public class RangerGdsProjectService extends
RangerGdsBaseModelService<XXGdsProj
vObj.setName(xObj.getName());
vObj.setDescription(xObj.getDescription());
vObj.setAdmins(JsonUtils.jsonToRangerPrincipalList(xObj.getAdmins()));
- vObj.setAcl(JsonUtils.jsonToObject(xObj.getAcl(),
RangerGds.RangerGdsACL.class));
+ vObj.setAcl(JsonUtils.jsonToObject(xObj.getAcl(),
RangerGds.RangerGdsObjectACL.class));
vObj.setTermsOfUse(xObj.getTermsOfUse());
vObj.setOptions(JsonUtils.jsonToMapStringString(xObj.getOptions()));
vObj.setAdditionalInfo(JsonUtils.jsonToMapStringString(xObj.getAdditionalInfo()));
diff --git
a/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
b/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
index 5814e96f7..3c6dd1fdf 100644
---
a/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
+++
b/security-admin/src/main/java/org/apache/ranger/validation/RangerGdsValidator.java
@@ -26,7 +26,7 @@ import
org.apache.ranger.plugin.model.RangerGds.RangerDataShareInDataset;
import org.apache.ranger.plugin.model.RangerGds.RangerDataShare;
import org.apache.ranger.plugin.model.RangerGds.RangerDatasetInProject;
import org.apache.ranger.plugin.model.RangerGds.RangerDataset;
-import org.apache.ranger.plugin.model.RangerGds.RangerGdsACL;
+import org.apache.ranger.plugin.model.RangerGds.RangerGdsObjectACL;
import org.apache.ranger.plugin.model.RangerGds.RangerProject;
import org.apache.ranger.plugin.model.RangerGds.RangerSharedResource;
import
org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemDataMaskInfo;
@@ -542,7 +542,7 @@ public class RangerGdsValidator {
}
}
- private void validateAcl(RangerGdsACL acl, String fieldName,
ValidationResult result) {
+ private void validateAcl(RangerGdsObjectACL acl, String fieldName,
ValidationResult result) {
if (acl != null) {
if (acl.getUsers() != null) {
for (String userName : acl.getUsers().keySet()) {
