You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by ma...@apache.org on 2016/04/01 20:54:25 UTC
incubator-ranger git commit: RANGER-873: removed unused imports (PMD
violation); added RangerDataMaskTypeDef.transformer field
Repository: incubator-ranger
Updated Branches:
refs/heads/master d878f4e7e -> 37351fbc8
RANGER-873: removed unused imports (PMD violation); added RangerDataMaskTypeDef.transformer field
Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/37351fbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/37351fbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/37351fbc
Branch: refs/heads/master
Commit: 37351fbc85a8c05eed38e2329cbba96db0cd3c12
Parents: d878f4e
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Fri Apr 1 11:49:38 2016 -0700
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Fri Apr 1 11:49:38 2016 -0700
----------------------------------------------------------------------
.../ranger/plugin/model/RangerServiceDef.java | 21 +++++-
.../ranger/plugin/util/ServiceDefUtil.java | 1 -
.../db/mysql/patches/020-datamask-policy.sql | 1 +
.../db/postgres/patches/020-datamask-policy.sql | 1 +
.../java/org/apache/ranger/common/JSONUtil.java | 1 -
.../apache/ranger/entity/XXDataMaskTypeDef.java | 77 +++++++++++++++++---
6 files changed, 88 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/37351fbc/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
index febd85b..1dac6e8 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java
@@ -2660,20 +2660,22 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
private String name = null;
private String label = null;
private String description = null;
+ private String transformer = null;
private Map<String, String> dataMaskOptions = null;
private String rbKeyLabel = null;
private String rbKeyDescription = null;
public RangerDataMaskTypeDef() {
- this(null, null, null, null, null, null, null);
+ this(null, null, null, null, null, null, null, null);
}
- public RangerDataMaskTypeDef(Long itemId, String name, String label, String description, Map<String, String> dataMaskOptions, String rbKeyLabel, String rbKeyDescription) {
+ public RangerDataMaskTypeDef(Long itemId, String name, String label, String description, String transformer, Map<String, String> dataMaskOptions, String rbKeyLabel, String rbKeyDescription) {
setItemId(itemId);
setName(name);
setLabel(label);
setDescription(description);
+ setTransformer(transformer);
setDataMaskOptions(dataMaskOptions);
setRbKeyLabel(rbKeyLabel);
setRbKeyDescription(rbKeyDescription);
@@ -2684,6 +2686,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
setName(other.getName());
setLabel(other.getLabel());
setDescription(other.getDescription());
+ setTransformer(other.getTransformer());
setDataMaskOptions(other.getDataMaskOptions());
setRbKeyLabel(other.getRbKeyLabel());
setRbKeyDescription(other.getRbKeyDescription());
@@ -2746,6 +2749,20 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
}
/**
+ * @return the transformer
+ */
+ public String getTransformer() {
+ return transformer;
+ }
+
+ /**
+ * @param transformer the transformer to set
+ */
+ public void setTransformer(String transformer) {
+ this.transformer = transformer;
+ }
+
+ /**
* @return the dataMaskOptions
*/
public Map<String, String> getDataMaskOptions() {
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/37351fbc/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java
index fa04816..c8e560a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/ServiceDefUtil.java
@@ -19,7 +19,6 @@
package org.apache.ranger.plugin.util;
-import org.apache.commons.collections.ArrayStack;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/37351fbc/security-admin/db/mysql/patches/020-datamask-policy.sql
----------------------------------------------------------------------
diff --git a/security-admin/db/mysql/patches/020-datamask-policy.sql b/security-admin/db/mysql/patches/020-datamask-policy.sql
index 32e8a3e..8a612b3 100644
--- a/security-admin/db/mysql/patches/020-datamask-policy.sql
+++ b/security-admin/db/mysql/patches/020-datamask-policy.sql
@@ -58,6 +58,7 @@ CREATE TABLE `x_datamask_type_def` (
`name` varchar(1024) NOT NULL,
`label` varchar(1024) NOT NULL,
`description` varchar(1024) DEFAULT NULL,
+`transformer` varchar(1024) DEFAULT NULL,
`datamask_options` varchar(1024) DEFAULT NULL,
`rb_key_label` varchar(1024) DEFAULT NULL,
`rb_key_description` varchar(1024) DEFAULT NULL,
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/37351fbc/security-admin/db/postgres/patches/020-datamask-policy.sql
----------------------------------------------------------------------
diff --git a/security-admin/db/postgres/patches/020-datamask-policy.sql b/security-admin/db/postgres/patches/020-datamask-policy.sql
index 4387e02..d000822 100644
--- a/security-admin/db/postgres/patches/020-datamask-policy.sql
+++ b/security-admin/db/postgres/patches/020-datamask-policy.sql
@@ -65,6 +65,7 @@ CREATE TABLE x_datamask_type_def (
name VARCHAR(1024) NOT NULL,
label VARCHAR(1024) NOT NULL,
description VARCHAR(1024) DEFAULT NULL,
+ transformer VARCHAR(1024) DEFAULT NULL,
datamask_options VARCHAR(1024) DEFAULT NULL,
rb_key_label VARCHAR(1024) DEFAULT NULL,
rb_key_description VARCHAR(1024) DEFAULT NULL,
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/37351fbc/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java b/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
index db4c9c6..ad89e8a 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/JSONUtil.java
@@ -35,7 +35,6 @@ import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.ser.StdSerializers;
import org.codehaus.jackson.type.TypeReference;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/37351fbc/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
index f7480f7..9561e5e 100644
--- a/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
+++ b/security-admin/src/main/java/org/apache/ranger/entity/XXDataMaskTypeDef.java
@@ -85,6 +85,15 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
protected String description;
/**
+ * transformer of the XXDataMaskTypeDef
+ * <ul>
+ * </ul>
+ *
+ */
+ @Column(name = "transformer")
+ protected String transformer;
+
+ /**
* dataMaskOptions of the XXDataMaskTypeDef
* <ul>
* </ul>
@@ -240,6 +249,25 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
}
/**
+ * This method sets the value to the member attribute <b> transformer</b> .
+ *
+ * @param transformer
+ * Value to set member attribute <b> transformer</b>
+ */
+ public void setTransformer(String transformer) {
+ this.transformer = transformer;
+ }
+
+ /**
+ * Returns the value for the member attribute <b>transformer</b>
+ *
+ * @return String - value of member attribute <b>transformer</b> .
+ */
+ public String getTransformer() {
+ return this.transformer;
+ }
+
+ /**
* This method sets the value to the member attribute <b> dataMaskOptions</b> .
*
* @param dataMaskOptions
@@ -336,6 +364,13 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
return false;
}
XXDataMaskTypeDef other = (XXDataMaskTypeDef) obj;
+ if (id == null) {
+ if (other.id != null) {
+ return false;
+ }
+ } else if (!id.equals(other.id)) {
+ return false;
+ }
if (defId == null) {
if (other.defId != null) {
return false;
@@ -350,11 +385,11 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
} else if (!itemId.equals(other.itemId)) {
return false;
}
- if (id == null) {
- if (other.id != null) {
+ if (name == null) {
+ if (other.name != null) {
return false;
}
- } else if (!id.equals(other.id)) {
+ } else if (!name.equals(other.name)) {
return false;
}
if (label == null) {
@@ -364,18 +399,25 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
} else if (!label.equals(other.label)) {
return false;
}
- if (name == null) {
- if (other.name != null) {
+ if (description == null) {
+ if (other.description != null) {
return false;
}
- } else if (!name.equals(other.name)) {
+ } else if (!description.equals(other.description)) {
return false;
}
- if (order == null) {
- if (other.order != null) {
+ if (transformer == null) {
+ if (other.transformer != null) {
return false;
}
- } else if (!order.equals(other.order)) {
+ } else if (!transformer.equals(other.transformer)) {
+ return false;
+ }
+ if (dataMaskOptions == null) {
+ if (other.dataMaskOptions != null) {
+ return false;
+ }
+ } else if (!dataMaskOptions.equals(other.dataMaskOptions)) {
return false;
}
if (rbKeyLabel == null) {
@@ -385,6 +427,20 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
} else if (!rbKeyLabel.equals(other.rbKeyLabel)) {
return false;
}
+ if (rbKeyDescription == null) {
+ if (other.rbKeyDescription != null) {
+ return false;
+ }
+ } else if (!rbKeyDescription.equals(other.rbKeyDescription)) {
+ return false;
+ }
+ if (order == null) {
+ if (other.order != null) {
+ return false;
+ }
+ } else if (!order.equals(other.order)) {
+ return false;
+ }
return true;
}
@@ -397,7 +453,8 @@ public class XXDataMaskTypeDef extends XXDBBase implements java.io.Serializable
public String toString() {
return "XXDataMaskTypeDef [" + super.toString() + " id=" + id
+ ", defId=" + defId + ", itemId=" + itemId + ", name=" + name + ", label=" + label
- + ", rbKeyLabel=" + rbKeyLabel + ", order=" + order + "]";
+ + ", description=" + description + ", transformer=" + transformer + ", dataMaskOptions=" + dataMaskOptions
+ + ", rbKeyLabel=" + rbKeyLabel + ", rbKeyDescription=" + rbKeyDescription + ", order=" + order + "]";
}
}