Merge branch 'keyade-master'

jmrozanec · Nov 2, 2016 · 304757f · 304757f
2 parents e93525f + 67d4f64
commit 304757f
Show file tree

Hide file tree

Showing 2 changed files with 470 additions and 43 deletions.
diff --git a/...n/java/com/cronutils/model/field/expression/visitor/ValidationFieldExpressionVisitor.java b/...n/java/com/cronutils/model/field/expression/visitor/ValidationFieldExpressionVisitor.java
@@ -36,6 +36,13 @@ public ValidationFieldExpressionVisitor(FieldConstraints constraints, boolean st
 		this.strictRanges = strictRanges;
 	}
 
+	protected ValidationFieldExpressionVisitor(FieldConstraints constraints, StringValidations stringValidation, boolean strictRanges) {
+        this.constraints = constraints;
+        this.stringValidations = stringValidation;
+        this.strictRanges = strictRanges;
+    }
+
+
 	@Override
 	public FieldExpression visit(FieldExpression expression) {
 		String unsupportedChars = stringValidations.removeValidChars(expression.asString());
@@ -68,10 +75,13 @@ public Always visit(Always always) {
 		return always;
 	}
 
-	@Override
-	public And visit(And and) {
-		return and;
-	}
+    @Override
+    public And visit(And and) {
+        for(FieldExpression expression: and.getExpressions()) {
+            visit(expression);
+        }
+        return and;
+    }
 
 	@Override
 	public Between visit(Between between) {