remove unneeded uses of Violation interface when RuleViolation will suffice. RuleViolation is the only implementation of Violation; the interface should be removed entirely.

Author: jonbodner-buf

conformance/src/test/java/build/buf/protovalidate/NativeRulesParityTest.java

@@ -17,6 +17,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import build.buf.protovalidate.exceptions.ValidationException;
+import build.buf.validate.Violation;
 import build.buf.validate.conformance.cases.AnEnum;
 import build.buf.validate.conformance.cases.BoolConstTrue;
 import build.buf.validate.conformance.cases.BytesContains;
@@ -133,7 +134,7 @@ void parityForFixture(String name, Message msg) throws ValidationException {
         .isEqualTo(toProtoList(celResult));
   }
 
-  private static List<build.buf.validate.Violation> toProtoList(ValidationResult result) {
-    return result.getViolations().stream().map(Violation::toProto).collect(Collectors.toList());
+  private static List<Violation> toProtoList(ValidationResult result) {
+    return result.getViolations().stream().map(RuleViolation::toProto).collect(Collectors.toList());
   }
 }

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

@@ -26,9 +26,10 @@
 public class ValidationResult {
 
   /**
-   * violations is a list of {@link Violation} that occurred during the validations of a message.
+   * violations is a list of {@link RuleViolation} that occurred during the validations of a
+   * message.
    */
-  private final List<Violation> violations;
+  private final List<RuleViolation> violations;
 
   /** A violation result with an empty violation list. */
   public static final ValidationResult EMPTY = new ValidationResult(Collections.emptyList());
@@ -38,7 +39,7 @@ public class ValidationResult {
    *
    * @param violations violation list for the result.
    */
-  public ValidationResult(List<Violation> violations) {
+  public ValidationResult(List<RuleViolation> violations) {
     this.violations = violations;
   }
 
@@ -56,7 +57,7 @@ public boolean isSuccess() {
    *
    * @return the violation list.
    */
-  public List<Violation> getViolations() {
+  public List<RuleViolation> getViolations() {
     return violations;
   }
 

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

@@ -18,8 +18,8 @@
 import build.buf.protovalidate.exceptions.ValidationException;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Message;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 final class ValidatorImpl implements Validator {
   /** evaluatorBuilder is the builder used to construct the evaluator for a given message. */
@@ -54,10 +54,7 @@ public ValidationResult validate(Message msg) throws ValidationException {
     if (result.isEmpty()) {
       return ValidationResult.EMPTY;
     }
-    List<Violation> violations = new ArrayList<>(result.size());
-    for (RuleViolation.Builder builder : result) {
-      violations.add(builder.build());
-    }
-    return new ValidationResult(violations);
+    return new ValidationResult(
+        result.stream().map(RuleViolation.Builder::build).collect(Collectors.toList()));
   }
 }

src/test/java/build/buf/protovalidate/ValidationResultTest.java

@@ -18,14 +18,16 @@
 
 import build.buf.validate.FieldPathElement;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
 class ValidationResultTest {
   @Test
   void testToStringNoViolations() {
 
-    List<Violation> violations = new ArrayList<>();
+    List<RuleViolation> violations = new ArrayList<>();
     ValidationResult result = new ValidationResult(violations);
 
     assertThat(result.toString()).isEqualTo("Validation OK");
@@ -43,9 +45,7 @@ void testToStringSingleViolation() {
             .setMessage("must equal 42")
             .addFirstFieldPathElement(elem)
             .build();
-    List<Violation> violations = new ArrayList<>();
-    violations.add(violation);
-    ValidationResult result = new ValidationResult(violations);
+    ValidationResult result = new ValidationResult(Collections.singletonList(violation));
 
     assertThat(result.toString())
         .isEqualTo("Validation error:\n - test_field_name: must equal 42 [int32.const]");
@@ -69,10 +69,7 @@ void testToStringMultipleViolations() {
             .setMessage("value is required")
             .addFirstFieldPathElement(elem)
             .build();
-    List<Violation> violations = new ArrayList<>();
-    violations.add(violation1);
-    violations.add(violation2);
-    ValidationResult result = new ValidationResult(violations);
+    ValidationResult result = new ValidationResult(Arrays.asList(violation1, violation2));
 
     assertThat(result.toString())
         .isEqualTo(
@@ -86,20 +83,14 @@ void testToStringSingleViolationMultipleFieldPathElements() {
     FieldPathElement elem2 =
         FieldPathElement.newBuilder().setFieldNumber(5).setFieldName("nested_name").build();
 
-    List<FieldPathElement> elems = new ArrayList<>();
-    elems.add(elem1);
-    elems.add(elem2);
-
     RuleViolation violation1 =
         RuleViolation.newBuilder()
             .setRuleId("int32.const")
             .setMessage("must equal 42")
-            .addAllFieldPathElements(elems)
+            .addAllFieldPathElements(Arrays.asList(elem1, elem2))
             .build();
 
-    List<Violation> violations = new ArrayList<>();
-    violations.add(violation1);
-    ValidationResult result = new ValidationResult(violations);
+    ValidationResult result = new ValidationResult(Collections.singletonList(violation1));
 
     assertThat(result.toString())
         .isEqualTo(
@@ -110,9 +101,7 @@ void testToStringSingleViolationMultipleFieldPathElements() {
   void testToStringSingleViolationNoFieldPathElements() {
     RuleViolation violation =
         RuleViolation.newBuilder().setRuleId("int32.const").setMessage("must equal 42").build();
-    List<Violation> violations = new ArrayList<>();
-    violations.add(violation);
-    ValidationResult result = new ValidationResult(violations);
+    ValidationResult result = new ValidationResult(Collections.singletonList(violation));
 
     assertThat(result.toString()).isEqualTo("Validation error:\n - must equal 42 [int32.const]");
   }