diff --git a/conformance/expected-failures.yaml b/conformance/expected-failures.yaml
index be9d4f74..622d9f62 100644
--- a/conformance/expected-failures.yaml
+++ b/conformance/expected-failures.yaml
@@ -107,723 +107,3 @@ custom_constraints:
#ERROR: If true, this will take precedence and all checks are skipped.
+ */
+ private boolean shouldIgnoreAlways() {
+ return this.ignore == Ignore.IGNORE_ALWAYS;
+ }
+
+ /**
+ * Returns whether a field should skip validation on its zero value.
+ *
+ *
This is generally true for nullable fields or fields with the ignore_empty constraint
+ * explicitly set.
+ */
+ private boolean shouldIgnoreEmpty() {
+ return this.hasPresence
+ || this.ignore == Ignore.IGNORE_IF_UNPOPULATED
+ || this.ignore == Ignore.IGNORE_IF_DEFAULT_VALUE;
+ }
+
+ /**
+ * Returns whether a field should skip validation on its zero value, including for fields which
+ * have field presence and are set to the zero value.
+ */
+ private boolean shouldIgnoreDefault() {
+ return this.hasPresence && this.ignore == Ignore.IGNORE_IF_DEFAULT_VALUE;
+ }
+
@Override
public List evaluate(Value val, boolean failFast)
throws ExecutionException {
+ if (this.shouldIgnoreAlways()) {
+ return ConstraintViolation.NO_VIOLATIONS;
+ }
Message message = val.messageValue();
if (message == null) {
return ConstraintViolation.NO_VIOLATIONS;
@@ -100,11 +131,11 @@ public List evaluate(Value val, boolean failFast)
.setMessage("value is required")
.setRuleValue(new ConstraintViolation.FieldValue(true, REQUIRED_DESCRIPTOR)));
}
- if (ignoreEmpty && !hasField) {
+ if (this.shouldIgnoreEmpty() && !hasField) {
return ConstraintViolation.NO_VIOLATIONS;
}
Object fieldValue = message.getField(descriptor);
- if (ignoreDefault && Objects.equals(zero, fieldValue)) {
+ if (this.shouldIgnoreDefault() && Objects.equals(zero, fieldValue)) {
return ConstraintViolation.NO_VIOLATIONS;
}
return valueEvaluator.evaluate(new ObjectValue(descriptor, fieldValue), failFast);