Violation.Builder: Move required arg to constructor

Author: jchadwick-buf

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

@@ -14,7 +14,6 @@
 
 package build.buf.protovalidate;
 
-import java.util.Objects;
 import javax.annotation.Nullable;
 
 /**
@@ -23,16 +22,12 @@
  */
 public class Violation {
   private final build.buf.validate.Violation proto;
-  @Nullable Value fieldValue;
-  @Nullable Value ruleValue;
   private final @Nullable Value fieldValue;
   private final @Nullable Value ruleValue;
 
   /** Builds a Violation instance. */
   public static class Builder {
-    @Nullable private build.buf.validate.Violation proto;
-    @Nullable Value fieldValue;
-    @Nullable Value ruleValue;
+    private build.buf.validate.Violation proto;
     private @Nullable Value fieldValue;
     private @Nullable Value ruleValue;
 
@@ -75,19 +70,22 @@ public Builder setRuleValue(@Nullable Value ruleValue) {
      * @return A Violation instance.
      */
     public Violation build() {
-      return new Violation(Objects.requireNonNull(proto), fieldValue, ruleValue);
+      return new Violation(proto, fieldValue, ruleValue);
     }
 
-    private Builder() {}
+    private Builder(build.buf.validate.Violation proto) {
+      this.proto = proto;
+    }
   }
 
   /**
    * Constructs a new empty builder.
    *
+   * @param proto The proto Violation to wrap.
    * @return A new empty builder instance.
    */
-  public static Builder newBuilder() {
-    return new Builder();
+  public static Builder newBuilder(build.buf.validate.Violation proto) {
+    return new Builder(proto);
   }
 
   private Violation(
@@ -130,6 +128,6 @@ public build.buf.validate.Violation getProto() {
    * @return A new {@link Builder} instance.
    */
   public Builder toBuilder() {
-    return new Builder().setProto(proto).setFieldValue(fieldValue).setRuleValue(ruleValue);
+    return new Builder(proto).setFieldValue(fieldValue).setRuleValue(ruleValue);
   }
 }

src/main/java/build/buf/protovalidate/internal/evaluator/AnyEvaluator.java

@@ -83,8 +83,7 @@ public ValidationResult evaluate(Value val, boolean failFast) throws ExecutionEx
     String typeURL = (String) anyValue.getField(typeURLDescriptor);
     if (!in.isEmpty() && !in.contains(typeURL)) {
       Violation violation =
-          Violation.newBuilder()
-              .setProto(
+          Violation.newBuilder(
                   build.buf.validate.Violation.newBuilder()
                       .setRule(IN_RULE_PATH)
                       .setConstraintId("any.in")
@@ -100,8 +99,7 @@ public ValidationResult evaluate(Value val, boolean failFast) throws ExecutionEx
     }
     if (!notIn.isEmpty() && notIn.contains(typeURL)) {
       Violation violation =
-          Violation.newBuilder()
-              .setProto(
+          Violation.newBuilder(
                   build.buf.validate.Violation.newBuilder()
                       .setRule(NOT_IN_RULE_PATH)
                       .setConstraintId("any.not_in")

src/main/java/build/buf/protovalidate/internal/evaluator/EnumEvaluator.java

@@ -86,8 +86,7 @@ public ValidationResult evaluate(Value val, boolean failFast) throws ExecutionEx
     if (!values.contains(enumValue.getNumber())) {
       return new ValidationResult(
           Collections.singletonList(
-              Violation.newBuilder()
-                  .setProto(
+              Violation.newBuilder(
                       build.buf.validate.Violation.newBuilder()
                           .setRule(DEFINED_ONLY_RULE_PATH)
                           .setConstraintId("enum.defined_only")

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

@@ -93,8 +93,7 @@ public ValidationResult evaluate(Value val, boolean failFast) throws ExecutionEx
     if (required && !hasField) {
       return new ValidationResult(
           Collections.singletonList(
-              Violation.newBuilder()
-                  .setProto(
+              Violation.newBuilder(
                       build.buf.validate.Violation.newBuilder()
                           .setField(
                               FieldPath.newBuilder()

src/main/java/build/buf/protovalidate/internal/evaluator/OneofEvaluator.java

@@ -57,8 +57,7 @@ public ValidationResult evaluate(Value val, boolean failFast) throws ExecutionEx
     if (required && (message.getOneofFieldDescriptor(descriptor) == null)) {
       return new ValidationResult(
           Collections.singletonList(
-              Violation.newBuilder()
-                  .setProto(
+              Violation.newBuilder(
                       build.buf.validate.Violation.newBuilder()
                           .setField(
                               FieldPath.newBuilder()

src/main/java/build/buf/protovalidate/internal/evaluator/UnknownDescriptorEvaluator.java

@@ -43,8 +43,7 @@ public boolean tautology() {
   public ValidationResult evaluate(Value val, boolean failFast) throws ExecutionException {
     return new ValidationResult(
         Collections.singletonList(
-            Violation.newBuilder()
-                .setProto(
+            Violation.newBuilder(
                     build.buf.validate.Violation.newBuilder()
                         .setMessage("No evaluator available for " + desc.getFullName())
                         .build())

src/main/java/build/buf/protovalidate/internal/expression/CompiledProgram.java

@@ -84,8 +84,7 @@ public Violation eval(Value fieldValue, Variable bindings) throws ExecutionExcep
       if (rulePath != null) {
         violation.setRule(rulePath);
       }
-      return Violation.newBuilder()
-          .setProto(violation.build())
+      return Violation.newBuilder(violation.build())
           .setFieldValue(fieldValue)
           .setRuleValue(ruleValue)
           .build();
@@ -100,8 +99,7 @@ public Violation eval(Value fieldValue, Variable bindings) throws ExecutionExcep
       if (rulePath != null) {
         violation.setRule(rulePath);
       }
-      return Violation.newBuilder()
-          .setProto(violation.build())
+      return Violation.newBuilder(violation.build())
           .setFieldValue(fieldValue)
           .setRuleValue(ruleValue)
           .build();