[jboss-svn-commits] JBL Code SVN: r32328 - in labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools: factconstraints/client/helper and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: baunax
Date: 2010-03-31 12:47:34 -0400 (Wed, 31 Mar 2010)
New Revision: 32328

Added:
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java
Modified:
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraint/server/factory/ConstraintsFactory.java
   labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
Log:
added new Matches and NotMatches constraints

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraint/server/factory/ConstraintsFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraint/server/factory/ConstraintsFactory.java	2010-03-31 16:46:58 UTC (rev 32327)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraint/server/factory/ConstraintsFactory.java	2010-03-31 16:47:34 UTC (rev 32328)
@@ -5,6 +5,7 @@
 import org.drools.factconstraints.server.predefined.IntegerConstraint;
 import org.drools.factconstraints.server.predefined.NotNullConstraint;
 import org.drools.factconstraints.server.predefined.RangeConstraint;
+import org.drools.factconstraints.server.predefined.NotMatchesConstraint;
 
 public class ConstraintsFactory {
 	private final static ConstraintsFactory INSTANCE = new ConstraintsFactory();
@@ -22,6 +23,8 @@
 			return new IntegerConstraint();
 		} else if (RangeConstraint.NAME.equals(config.getConstraintName())) {
 			return new RangeConstraint();
+		} else if (NotMatchesConstraint.NAME.equals(config.getConstraintName())) {
+			return new NotMatchesConstraint();
 		} else {
 			throw new IllegalArgumentException("Constraint unknown: " + config.getConstraintName());
 		}

Modified: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java	2010-03-31 16:46:58 UTC (rev 32327)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/client/helper/ConstraintsContainer.java	2010-03-31 16:47:34 UTC (rev 32328)
@@ -28,6 +28,16 @@
 		config.setArgumentValue("Min.value", "0");
 		config.setArgumentValue("Max.value", "0");
 		constraintConfigs.put(config.getConstraintName(), config);
+		
+		config = new SimpleConstraintConfigurationImpl();
+		config.setConstraintName("NotMatches");
+		config.setArgumentValue("matches", "");
+		constraintConfigs.put(config.getConstraintName(), config);
+		
+		config = new SimpleConstraintConfigurationImpl();
+		config.setConstraintName("Matches");
+		config.setArgumentValue("matches", "");
+		constraintConfigs.put(config.getConstraintName(), config);
 	}
 	
 	private Map<String, List<ConstraintConfiguration>> constraints = new HashMap<String, List<ConstraintConfiguration>>();

Added: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java	2010-03-31 16:47:34 UTC (rev 32328)
@@ -0,0 +1,26 @@
+package org.drools.factconstraints.server.predefined;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.factconstraint.server.DefaultConstraintImpl;
+import org.drools.factconstraints.client.ConstraintConfiguration;
+
+public class MatchesConstraint extends DefaultConstraintImpl {
+
+	public static final String MATCHES_ARGUMENT = "matches";
+	private static final long serialVersionUID = 501L;
+	public static final String NAME = "Matches";
+
+	@Override
+	protected String internalVerifierRule(ConstraintConfiguration config, Map<String, Object> context) {
+		List<String> constraints = new ArrayList<String>();
+		constraints.add("valueAsString \"" + config.getArgumentValue(MATCHES_ARGUMENT) + "\"");
+
+		return this.createVerifierRuleTemplate(config, context, 
+				"Matches_Field_Constraint", constraints,
+				"The value must match: " + config.getArgumentValue(MATCHES_ARGUMENT)); // I18N
+	}
+
+}


Property changes on: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/MatchesConstraint.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java	2010-03-31 16:47:34 UTC (rev 32328)
@@ -0,0 +1,33 @@
+package org.drools.factconstraints.server.predefined;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.factconstraint.server.DefaultConstraintImpl;
+import org.drools.factconstraints.client.ConstraintConfiguration;
+
+public class NotMatchesConstraint extends DefaultConstraintImpl {
+
+	public static final String NOT_MATCHES_ARGUMENT = "matches";
+	private static final long serialVersionUID = 501L;
+	public static final String NAME = "NotMatches";
+
+	@Override
+	protected String internalVerifierRule(ConstraintConfiguration config, Map<String, Object> context) {
+		List<String> constraints = new ArrayList<String>();
+		constraints.add("valueAsString not matches \"" + config.getArgumentValue(NOT_MATCHES_ARGUMENT) + "\"");
+
+		return this.createVerifierRuleTemplate(config, context, 
+				"Matches_Field_Constraint", constraints,
+				"The value must not match: " + config.getArgumentValue(NOT_MATCHES_ARGUMENT)); // I18N
+	}
+	
+//	@Override
+//	public ValidationResult validate(Object value, ConstraintConfiguration config) {
+//		Pattern p = Pattern.compile((String) config.getArgumentValue(NOT_MATCHES_ARGUMENT));
+//		
+//		return p.matcher(value.toString()).matches();
+//	}
+
+}


Property changes on: labs/jbossrules/trunk/drools-factconstraint/src/main/java/org/drools/factconstraints/server/predefined/NotMatchesConstraint.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF