ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mad...@apache.org
Subject incubator-ranger git commit: RANGER-203: added validationRegEx field to RangerResourceDef, RangerServiceConfigDef and RangerPolicyConditionDef. This value will be used to validate the user input in UI.
Date Wed, 04 Feb 2015 07:34:54 GMT
Repository: incubator-ranger
Updated Branches:
  refs/heads/stack 2e486daa4 -> 2abad1a19


RANGER-203: added validationRegEx field to RangerResourceDef,
RangerServiceConfigDef and RangerPolicyConditionDef. This value will be
used to validate the user input in UI.

Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/2abad1a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/2abad1a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/2abad1a1

Branch: refs/heads/stack
Commit: 2abad1a1913173b75c0ac0d4cce2f4ba10a72296
Parents: 2e486da
Author: Madhan Neethiraj <madhan@apache.org>
Authored: Tue Feb 3 23:34:00 2015 -0800
Committer: Madhan Neethiraj <madhan@apache.org>
Committed: Tue Feb 3 23:34:00 2015 -0800

----------------------------------------------------------------------
 .../ranger/plugin/model/RangerServiceDef.java   | 58 ++++++++++++++++++--
 1 file changed, 54 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2abad1a1/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 2841a23..def53ef 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
@@ -593,6 +593,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 		private String  subType          = null;
 		private Boolean mandatory        = null;
 		private String  defaultValue     = null;
+		private String  validationRegEx  = null;
 		private String  label            = null;
 		private String  description      = null;
 		private String  rbKeyLabel       = null;
@@ -600,15 +601,16 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 
 
 		public RangerServiceConfigDef() {
-			this(null, null, null, null, null, null, null, null, null);
+			this(null, null, null, null, null, null, null, null, null, null);
 		}
 
-		public RangerServiceConfigDef(String name, String type, String subType, Boolean mandatory,
String defaultValue, String label, String description, String rbKeyLabel, String rbKeyDescription)
{
+		public RangerServiceConfigDef(String name, String type, String subType, Boolean mandatory,
String defaultValue, String validationRegEx, String label, String description, String rbKeyLabel,
String rbKeyDescription) {
 			setName(name);
 			setType(type);
 			setSubType(subType);
 			setMandatory(mandatory);
 			setDefaultValue(defaultValue);
+			setValidationRegEx(validationRegEx);
 			setLabel(label);
 			setDescription(description);
 			setRbKeyLabel(rbKeyLabel);
@@ -686,6 +688,20 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 		}
 
 		/**
+		 * @return the validationRegEx
+		 */
+		public String getValidationRegEx() {
+			return validationRegEx;
+		}
+
+		/**
+		 * @param validationRegEx the validationRegEx to set
+		 */
+		public void setValidationRegEx(String validationRegEx) {
+			this.validationRegEx = validationRegEx;
+		}
+
+		/**
 		 * @return the label
 		 */
 		public String getLabel() {
@@ -757,6 +773,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 			sb.append("subType={").append(subType).append("} ");
 			sb.append("mandatory={").append(mandatory).append("} ");
 			sb.append("defaultValue={").append(defaultValue).append("} ");
+			sb.append("validationRegEx={").append(validationRegEx).append("} ");
 			sb.append("label={").append(label).append("} ");
 			sb.append("description={").append(description).append("} ");
 			sb.append("rbKeyLabel={").append(rbKeyLabel).append("} ");
@@ -781,6 +798,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 		private Boolean excludesSupported  = null;
 		private String  matcher            = null;
 		private String  matcherOptions     = null;
+		private String  validationRegEx    = null;
 		private String  label              = null;
 		private String  description        = null;
 		private String  rbKeyLabel         = null;
@@ -788,10 +806,10 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 
 
 		public RangerResourceDef() {
-			this(null, null, null, null, null, null, null, null, null, null, null, null, null, null);
+			this(null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null);
 		}
 
-		public RangerResourceDef(String name, String type, Integer level, String parent, Boolean
mandatory, Boolean lookupSupported, Boolean recursiveSupported, Boolean excludesSupported,
String matcher, String matcherOptions, String label, String description, String rbKeyLabel,
String rbKeyDescription) {
+		public RangerResourceDef(String name, String type, Integer level, String parent, Boolean
mandatory, Boolean lookupSupported, Boolean recursiveSupported, Boolean excludesSupported,
String matcher, String matcherOptions, String validationRegEx, String label, String description,
String rbKeyLabel, String rbKeyDescription) {
 			setName(name);
 			setType(type);
 			setLevel(level);
@@ -802,6 +820,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 			setExcludesSupported(excludesSupported);
 			setMatcher(matcher);
 			setMatcher(matcherOptions);
+			setValidationRegEx(validationRegEx);
 			setLabel(label);
 			setDescription(description);
 			setRbKeyLabel(rbKeyLabel);
@@ -949,6 +968,20 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 		}
 
 		/**
+		 * @return the validationRegEx
+		 */
+		public String getValidationRegEx() {
+			return validationRegEx;
+		}
+
+		/**
+		 * @param validationRegEx the validationRegEx to set
+		 */
+		public void setValidationRegEx(String validationRegEx) {
+			this.validationRegEx = validationRegEx;
+		}
+
+		/**
 		 * @return the label
 		 */
 		public String getLabel() {
@@ -1025,6 +1058,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 			sb.append("excludesSupported={").append(excludesSupported).append("} ");
 			sb.append("matcher={").append(matcher).append("} ");
 			sb.append("matcherOptions={").append(matcherOptions).append("} ");
+			sb.append("validationRegEx={").append(validationRegEx).append("} ");
 			sb.append("label={").append(label).append("} ");
 			sb.append("description={").append(description).append("} ");
 			sb.append("rbKeyLabel={").append(rbKeyLabel).append("} ");
@@ -1164,6 +1198,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 		private String name             = null;
 		private String evaluator        = null;
 		private String evaluatorOptions = null;
+		private String validationRegEx  = null;
 		private String label            = null;
 		private String description      = null;
 		private String rbKeyLabel       = null;
@@ -1239,6 +1274,20 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 		}
 
 		/**
+		 * @return the validationRegEx
+		 */
+		public String getValidationRegEx() {
+			return validationRegEx;
+		}
+
+		/**
+		 * @param validationRegEx the validationRegEx to set
+		 */
+		public void setValidationRegEx(String validationRegEx) {
+			this.validationRegEx = validationRegEx;
+		}
+
+		/**
 		 * @return the label
 		 */
 		public String getLabel() {
@@ -1308,6 +1357,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements
java.io.S
 			sb.append("name={").append(name).append("} ");
 			sb.append("evaluator={").append(evaluator).append("} ");
 			sb.append("evaluatorOptions={").append(evaluatorOptions).append("} ");
+			sb.append("validationRegEx={").append(validationRegEx).append("} ");
 			sb.append("label={").append(label).append("} ");
 			sb.append("description={").append(description).append("} ");
 			sb.append("rbKeyLabel={").append(rbKeyLabel).append("} ");


Mime
View raw message