Update protovalidate (#329)

This implements the following upstream changes:
- bufbuild/protovalidate#397
- bufbuild/protovalidate#396
- bufbuild/protovalidate#394

---------

Signed-off-by: Sri Krishna <[email protected]>

Author: srikrsna-buf

gradle.properties

@@ -1,5 +1,5 @@
 # Version of buf.build/bufbuild/protovalidate to use.
-protovalidate.version = v0.13.3
+protovalidate.version = v0.14.0
 
 # Arguments to the protovalidate-conformance CLI
 protovalidate.conformance.args = --strict_message --strict_error --expected_failures=expected-failures.yaml

src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

@@ -174,9 +174,6 @@ private void buildMessage(Descriptor desc, MessageEvaluator msgEval)
         DynamicMessage defaultInstance = DynamicMessage.newBuilder(desc).buildPartial();
         Descriptor descriptor = defaultInstance.getDescriptorForType();
         MessageRules msgRules = resolver.resolveMessageRules(descriptor);
-        if (msgRules.getDisabled()) {
-          return;
-        }
         processMessageExpressions(descriptor, msgRules, msgEval, defaultInstance);
         processMessageOneofRules(descriptor, msgRules, msgEval);
         processOneofRules(descriptor, msgEval);
@@ -252,7 +249,7 @@ private void processFields(Descriptor desc, MessageRules msgRules, MessageEvalua
         if (!fieldRules.hasIgnore()
             && msgRules.getOneofList().stream()
                 .anyMatch(oneof -> oneof.getFieldsList().contains(fieldDescriptor.getName()))) {
-          fieldRules = fieldRules.toBuilder().setIgnore(Ignore.IGNORE_IF_UNPOPULATED).build();
+          fieldRules = fieldRules.toBuilder().setIgnore(Ignore.IGNORE_IF_ZERO_VALUE).build();
         }
         FieldEvaluator fldEval = buildField(descriptor, fieldRules);
         msgEval.append(fldEval);
@@ -262,30 +259,19 @@ private void processFields(Descriptor desc, MessageRules msgRules, MessageEvalua
     private FieldEvaluator buildField(FieldDescriptor fieldDescriptor, FieldRules fieldRules)
         throws CompilationException {
       ValueEvaluator valueEvaluatorEval = new ValueEvaluator(fieldDescriptor, null);
-      boolean ignoreDefault = fieldDescriptor.hasPresence() && shouldIgnoreDefault(fieldRules);
-      Object zero = null;
-      if (ignoreDefault) {
-        zero = zeroValue(fieldDescriptor, false);
-      }
       FieldEvaluator fieldEvaluator =
           new FieldEvaluator(
               valueEvaluatorEval,
               fieldDescriptor,
               fieldRules.getRequired(),
               fieldDescriptor.hasPresence(),
-              fieldRules.getIgnore(),
-              zero);
+              fieldRules.getIgnore());
       buildValue(fieldDescriptor, fieldRules, fieldEvaluator.valueEvaluator);
       return fieldEvaluator;
     }
 
     private static boolean shouldIgnoreEmpty(FieldRules rules) {
-      return rules.getIgnore() == Ignore.IGNORE_IF_UNPOPULATED
-          || rules.getIgnore() == Ignore.IGNORE_IF_DEFAULT_VALUE;
-    }
-
-    private static boolean shouldIgnoreDefault(FieldRules rules) {
-      return rules.getIgnore() == Ignore.IGNORE_IF_DEFAULT_VALUE;
+      return rules.getIgnore() == Ignore.IGNORE_IF_ZERO_VALUE;
     }
 
     private void buildValue(

src/main/java/build/buf/protovalidate/FieldEvaluator.java

@@ -22,8 +22,6 @@
 import com.google.protobuf.Message;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
-import org.jspecify.annotations.Nullable;
 
 /** Performs validation on a single message field, defined by its descriptor. */
 final class FieldEvaluator implements Evaluator {
@@ -52,23 +50,19 @@ final class FieldEvaluator implements Evaluator {
   /** Whether the field distinguishes between unpopulated and default values. */
   private final boolean hasPresence;
 
-  @Nullable private final Object zero;
-
   /** Constructs a new {@link FieldEvaluator} */
   FieldEvaluator(
       ValueEvaluator valueEvaluator,
       FieldDescriptor descriptor,
       boolean required,
       boolean hasPresence,
-      Ignore ignore,
-      @Nullable Object zero) {
+      Ignore ignore) {
     this.helper = new RuleViolationHelper(valueEvaluator);
     this.valueEvaluator = valueEvaluator;
     this.descriptor = descriptor;
     this.required = required;
     this.hasPresence = hasPresence;
     this.ignore = ignore;
-    this.zero = zero;
   }
 
   @Override
@@ -92,17 +86,7 @@ private boolean shouldIgnoreAlways() {
    * 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;
+    return this.hasPresence || this.ignore == Ignore.IGNORE_IF_ZERO_VALUE;
   }
 
   @Override
@@ -134,11 +118,7 @@ public List<RuleViolation.Builder> evaluate(Value val, boolean failFast)
     if (this.shouldIgnoreEmpty() && !hasField) {
       return RuleViolation.NO_VIOLATIONS;
     }
-    Object fieldValue = message.getField(descriptor);
-    if (this.shouldIgnoreDefault()
-        && Objects.equals(zero, ProtoAdapter.toCel(descriptor, fieldValue))) {
-      return RuleViolation.NO_VIOLATIONS;
-    }
-    return valueEvaluator.evaluate(new ObjectValue(descriptor, fieldValue), failFast);
+    return valueEvaluator.evaluate(
+        new ObjectValue(descriptor, message.getField(descriptor)), failFast);
   }
 }