Minimize and refactor API surface

Author: jchadwick-buf

conformance/src/main/java/build/buf/protovalidate/conformance/Main.java

@@ -14,11 +14,11 @@
 
 package build.buf.protovalidate.conformance;
 
+import build.buf.protovalidate.CompilationException;
 import build.buf.protovalidate.Config;
+import build.buf.protovalidate.ExecutionException;
 import build.buf.protovalidate.ValidationResult;
 import build.buf.protovalidate.Validator;
-import build.buf.protovalidate.exceptions.CompilationException;
-import build.buf.protovalidate.exceptions.ExecutionException;
 import build.buf.validate.ValidateProto;
 import build.buf.validate.Violations;
 import build.buf.validate.conformance.harness.TestConformanceRequest;

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

@@ -17,8 +17,6 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.exceptions.ValidationException;
 import build.buf.validate.conformance.cases.AnEnum;
 import build.buf.validate.conformance.cases.BoolConstTrue;
 import build.buf.validate.conformance.cases.BytesContains;

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

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import build.buf.validate.AnyRules;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;

src/main/java/build/buf/protovalidate/internal/expression/AstExpression.java renamed to src/main/java/build/buf/protovalidate/AstExpression.java

@@ -12,15 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.expression;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.CompilationException;
 import com.google.api.expr.v1alpha1.Type;
 import org.projectnessie.cel.Ast;
 import org.projectnessie.cel.Env;
 
 /** {@link AstExpression} is a compiled CEL {@link Ast}. */
-public class AstExpression {
+class AstExpression {
   /** The compiled CEL AST. */
   public final Ast ast;
 

src/main/java/build/buf/protovalidate/internal/evaluator/CelPrograms.java renamed to src/main/java/build/buf/protovalidate/CelPrograms.java

@@ -12,13 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
-import build.buf.protovalidate.internal.expression.CompiledProgram;
-import build.buf.protovalidate.internal.expression.Variable;
 import java.util.ArrayList;
 import java.util.List;
 import javax.annotation.Nullable;

src/main/java/build/buf/protovalidate/exceptions/CompilationException.java renamed to src/main/java/build/buf/protovalidate/CompilationException.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.exceptions;
+package build.buf.protovalidate;
 
 /** CompilationException is returned when a constraint fails to compile. This is a fatal error. */
 public class CompilationException extends ValidationException {

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

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.expression;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.evaluator.Value;
 import build.buf.validate.FieldPath;
 import javax.annotation.Nullable;
 import org.projectnessie.cel.Program;
@@ -27,7 +24,7 @@
  * {@link CompiledProgram} is a parsed and type-checked {@link Program} along with the source {@link
  * Expression}.
  */
-public class CompiledProgram {
+class CompiledProgram {
   /** A compiled CEL program that can be evaluated against a set of variable bindings. */
   private final Program program;
 

src/main/java/build/buf/protovalidate/internal/constraints/ConstraintCache.java renamed to src/main/java/build/buf/protovalidate/ConstraintCache.java

@@ -12,17 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.constraints;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.Config;
-import build.buf.protovalidate.exceptions.CompilationException;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
-import build.buf.protovalidate.internal.evaluator.ObjectValue;
-import build.buf.protovalidate.internal.evaluator.Value;
-import build.buf.protovalidate.internal.expression.AstExpression;
-import build.buf.protovalidate.internal.expression.CompiledProgram;
-import build.buf.protovalidate.internal.expression.Expression;
-import build.buf.protovalidate.internal.expression.Variable;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;
 import build.buf.validate.ValidateProto;
@@ -52,7 +43,7 @@
 import org.projectnessie.cel.interpreter.Activation;
 
 /** A build-through cache for computed standard constraints. */
-public class ConstraintCache {
+class ConstraintCache {
   private static class CelRule {
     public final AstExpression astExpression;
     public final FieldDescriptor field;

src/main/java/build/buf/protovalidate/internal/evaluator/ConstraintResolver.java renamed to src/main/java/build/buf/protovalidate/ConstraintResolver.java

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.CompilationException;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.MessageConstraints;
 import build.buf.validate.OneofConstraints;

src/main/java/build/buf/protovalidate/internal/errors/ConstraintViolation.java renamed to src/main/java/build/buf/protovalidate/ConstraintViolation.java

@@ -12,10 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.errors;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.Violation;
-import build.buf.protovalidate.internal.evaluator.Value;
 import build.buf.validate.FieldPath;
 import build.buf.validate.FieldPathElement;
 import com.google.protobuf.Descriptors;
@@ -31,7 +29,7 @@
  * {@link ConstraintViolation} contains all of the collected information about an individual
  * constraint violation.
  */
-public class ConstraintViolation implements Violation {
+class ConstraintViolation implements Violation {
   /** Static value to return when there are no violations. */
   public static final List<Builder> NO_VIOLATIONS = new ArrayList<>();
 

src/main/java/build/buf/protovalidate/internal/evaluator/ConstraintViolationHelper.java renamed to src/main/java/build/buf/protovalidate/ConstraintViolationHelper.java

@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import build.buf.validate.FieldPath;
 import build.buf.validate.FieldPathElement;
 import java.util.ArrayList;

src/main/java/build/buf/protovalidate/internal/celext/CustomDeclarations.java renamed to src/main/java/build/buf/protovalidate/CustomDeclarations.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.celext;
+package build.buf.protovalidate;
 
 import com.google.api.expr.v1alpha1.Decl;
 import java.util.ArrayList;

src/main/java/build/buf/protovalidate/internal/celext/CustomOverload.java renamed to src/main/java/build/buf/protovalidate/CustomOverload.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.celext;
+package build.buf.protovalidate;
 
 import com.google.common.base.Ascii;
 import com.google.common.base.Splitter;

src/main/java/build/buf/protovalidate/internal/constraints/DescriptorMappings.java renamed to src/main/java/build/buf/protovalidate/DescriptorMappings.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.constraints;
+package build.buf.protovalidate;
 
 import build.buf.validate.FieldConstraints;
 import com.google.api.expr.v1alpha1.Type;
@@ -27,7 +27,7 @@
 /**
  * DescriptorMappings provides mappings between protocol buffer descriptors and CEL declarations.
  */
-public final class DescriptorMappings {
+final class DescriptorMappings {
   /** Provides a {@link Descriptor} for {@link FieldConstraints}. */
   static final Descriptor FIELD_CONSTRAINTS_DESC = FieldConstraints.getDescriptor();
 

src/main/java/build/buf/protovalidate/internal/evaluator/EmbeddedMessageEvaluator.java renamed to src/main/java/build/buf/protovalidate/EmbeddedMessageEvaluator.java

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import java.util.Collections;
 import java.util.List;
 

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

@@ -12,12 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.ValidationResult;
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import build.buf.validate.EnumRules;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;

src/main/java/build/buf/protovalidate/internal/evaluator/Evaluator.java renamed to src/main/java/build/buf/protovalidate/Evaluator.java

@@ -12,17 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
 import java.util.List;
 
 /**
  * {@link Evaluator} defines a validation evaluator. evaluator implementations may elide type
  * checking of the passed in value, as the types have been guaranteed during the build phase.
  */
-public interface Evaluator {
+interface Evaluator {
   /**
    * Tautology returns true if the evaluator always succeeds.
    *

src/main/java/build/buf/protovalidate/internal/evaluator/EvaluatorBuilder.java renamed to src/main/java/build/buf/protovalidate/EvaluatorBuilder.java

@@ -12,17 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
-
-import build.buf.protovalidate.Config;
-import build.buf.protovalidate.exceptions.CompilationException;
-import build.buf.protovalidate.internal.constraints.ConstraintCache;
-import build.buf.protovalidate.internal.constraints.DescriptorMappings;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
-import build.buf.protovalidate.internal.expression.AstExpression;
-import build.buf.protovalidate.internal.expression.CompiledProgram;
-import build.buf.protovalidate.internal.expression.Expression;
-import build.buf.protovalidate.internal.expression.Variable;
+package build.buf.protovalidate;
+
 import build.buf.validate.Constraint;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;
@@ -50,7 +41,7 @@
 import org.projectnessie.cel.checker.Decls;
 
 /** A build-through cache of message evaluators keyed off the provided descriptor. */
-public class EvaluatorBuilder {
+class EvaluatorBuilder {
   private static final FieldPathElement CEL_FIELD_PATH_ELEMENT =
       FieldPathUtils.fieldPathElement(
           FieldConstraints.getDescriptor().findFieldByNumber(FieldConstraints.CEL_FIELD_NUMBER));

src/main/java/build/buf/protovalidate/exceptions/ExecutionException.java renamed to src/main/java/build/buf/protovalidate/ExecutionException.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.exceptions;
+package build.buf.protovalidate;
 
 /** ExecutionException is returned when a constraint fails to execute. This is a fatal error. */
 public class ExecutionException extends ValidationException {

src/main/java/build/buf/protovalidate/internal/expression/Expression.java renamed to src/main/java/build/buf/protovalidate/Expression.java

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.expression;
+package build.buf.protovalidate;
 
 import build.buf.validate.Constraint;
 import java.util.ArrayList;
 import java.util.List;
 
 /** Expression represents a single CEL expression. */
-public class Expression {
+class Expression {
   /** The id of the constraint. */
   public final String id;
 

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

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;
 import com.google.protobuf.Descriptors.FieldDescriptor;

src/main/java/build/buf/protovalidate/internal/errors/FieldPathUtils.java renamed to src/main/java/build/buf/protovalidate/FieldPathUtils.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.errors;
+package build.buf.protovalidate;
 
 import build.buf.validate.FieldPath;
 import build.buf.validate.FieldPathElement;
@@ -21,7 +21,7 @@
 import javax.annotation.Nullable;
 
 /** Utility class for manipulating error paths in violations. */
-public final class FieldPathUtils {
+final class FieldPathUtils {
   private FieldPathUtils() {}
 
   /**

src/main/java/build/buf/protovalidate/internal/celext/Format.java renamed to src/main/java/build/buf/protovalidate/Format.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.celext;
+package build.buf.protovalidate;
 
 import static java.time.format.DateTimeFormatter.ISO_INSTANT;
 

src/main/java/build/buf/protovalidate/internal/evaluator/ListEvaluator.java renamed to src/main/java/build/buf/protovalidate/ListEvaluator.java

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;
 import build.buf.validate.FieldPathElement;

src/main/java/build/buf/protovalidate/internal/evaluator/MapEvaluator.java renamed to src/main/java/build/buf/protovalidate/MapEvaluator.java

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
-import build.buf.protovalidate.internal.errors.FieldPathUtils;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.FieldPath;
 import build.buf.validate.FieldPathElement;

src/main/java/build/buf/protovalidate/internal/evaluator/MessageEvaluator.java renamed to src/main/java/build/buf/protovalidate/MessageEvaluator.java

@@ -12,10 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package build.buf.protovalidate.internal.evaluator;
+package build.buf.protovalidate;
 
-import build.buf.protovalidate.exceptions.ExecutionException;
-import build.buf.protovalidate.internal.errors.ConstraintViolation;
 import java.util.ArrayList;
 import java.util.List;