Implement shared field constraints

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

@@ -16,6 +16,9 @@
 
 import com.google.protobuf.DescriptorProtos;
 import com.google.protobuf.Descriptors;
+import com.google.protobuf.DynamicMessage;
+import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.TypeRegistry;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -70,4 +73,29 @@ static Map<String, Descriptors.FileDescriptor> parseFileDescriptors(
  }
  return fileDescriptorMap;
  }
+
+ static TypeRegistry createTypeRegistry(
+ Iterable<? extends Descriptors.FileDescriptor> fileDescriptors) {
+ TypeRegistry.Builder registryBuilder = TypeRegistry.newBuilder();
+ for (Descriptors.FileDescriptor fileDescriptor : fileDescriptors) {
+ registryBuilder.add(fileDescriptor.getMessageTypes());
+ }
+ return registryBuilder.build();
+ }
+
+ static ExtensionRegistry createExtensionRegistry(
+ Iterable<? extends Descriptors.FileDescriptor> fileDescriptors) {
+ ExtensionRegistry registry = ExtensionRegistry.newInstance();
+ for (Descriptors.FileDescriptor fileDescriptor : fileDescriptors) {
+ for (Descriptors.FieldDescriptor fieldDescriptor : fileDescriptor.getExtensions()) {
+ if (fieldDescriptor.getJavaType() == Descriptors.FieldDescriptor.JavaType.MESSAGE) {
+ registry.add(
+ fieldDescriptor, DynamicMessage.getDefaultInstance(fieldDescriptor.getMessageType()));
+ } else {
+ registry.add(fieldDescriptor);
+ }
+ }
+ }
+ return registry;
+ }
 }

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

@@ -33,6 +33,7 @@
 import com.google.protobuf.DynamicMessage;
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.TypeRegistry;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -57,7 +58,17 @@ static TestConformanceResponse testConformance(TestConformanceRequest request) {
  try {
  Map<String, Descriptors.Descriptor> descriptorMap =
  FileDescriptorUtil.parse(request.getFdset());
- Validator validator = new Validator(Config.newBuilder().build());
+ Map<String, Descriptors.FileDescriptor> fileDescriptorMap =
+ FileDescriptorUtil.parseFileDescriptors(request.getFdset());
+ TypeRegistry typeRegistry = FileDescriptorUtil.createTypeRegistry(fileDescriptorMap.values());
+ ExtensionRegistry extensionRegistry =
+ FileDescriptorUtil.createExtensionRegistry(fileDescriptorMap.values());
+ Validator validator =
+ new Validator(
+ Config.newBuilder()
+ .setTypeRegistry(typeRegistry)
+ .setExtensionRegistry(extensionRegistry)
+ .build());
  TestConformanceResponse.Builder responseBuilder = TestConformanceResponse.newBuilder();
  Map<String, TestResult> resultsMap = new HashMap<>();
  for (Map.Entry<String, Any> entry : request.getCasesMap().entrySet()) {

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

@@ -14,14 +14,29 @@
 
 package build.buf.protovalidate;
 
+import com.google.protobuf.ExtensionRegistry;
+import com.google.protobuf.TypeRegistry;
+
 /** Config is the configuration for a Validator. */
 public final class Config {
+ private static final TypeRegistry DEFAULT_TYPE_REGISTRY = TypeRegistry.getEmptyTypeRegistry();
+ private static final ExtensionRegistry DEFAULT_EXTENSION_REGISTRY =
+ ExtensionRegistry.newInstance();
+
  private final boolean failFast;
  private final boolean disableLazy;
+ private final TypeRegistry typeRegistry;
+ private final ExtensionRegistry extensionRegistry;
 
- private Config(boolean failFast, boolean disableLazy) {
+ private Config(
+ boolean failFast,
+ boolean disableLazy,
+ TypeRegistry typeRegistry,
+ ExtensionRegistry extensionRegistry) {
  this.failFast = failFast;
  this.disableLazy = disableLazy;
+ this.typeRegistry = typeRegistry;
+ this.extensionRegistry = extensionRegistry;
  }
 
  /**
@@ -51,10 +66,30 @@ public boolean isDisableLazy() {
  return disableLazy;
  }
 
+ /**
+ * Gets the registry used for resolving unknown protobuf fields and messages.
+ *
+ * @return a type registry
+ */
+ public TypeRegistry getTypeRegistry() {
+ return typeRegistry;
+ }
+
+ /**
+ * Gets the registry used for resolving unknown protobuf extensions.
+ *
+ * @return an extension registry
+ */
+ public ExtensionRegistry getExtensionRegistry() {
+ return extensionRegistry;
+ }
+
  /** Builder for configuration. Provides a forward compatible API for users. */
  public static final class Builder {
  private boolean failFast;
  private boolean disableLazy;
+ private TypeRegistry typeRegistry = DEFAULT_TYPE_REGISTRY;
+ private ExtensionRegistry extensionRegistry = DEFAULT_EXTENSION_REGISTRY;
 
  private Builder() {}
 
@@ -80,13 +115,35 @@ public Builder setDisableLazy(boolean disableLazy) {
  return this;
  }
 
+ /**
+ * Set the type registry for resolving unknown messages.
+ *
+ * @param typeRegistry the type registry to use
+ * @return this builder
+ */
+ public Builder setTypeRegistry(TypeRegistry typeRegistry) {
+ this.typeRegistry = typeRegistry;
+ return this;
+ }
+
+ /**
+ * Set the extension registry for resolving unknown extensions.
+ *
+ * @param extensionRegistry the extension registry to use
+ * @return this builder
+ */
+ public Builder setExtensionRegistry(ExtensionRegistry extensionRegistry) {
+ this.extensionRegistry = extensionRegistry;
+ return this;
+ }
+
  /**
  * Build the corresponding {@link Config}.
  *
  * @return the configuration.
  */
  public Config build() {
- return new Config(failFast, disableLazy);
+ return new Config(failFast, disableLazy, typeRegistry, extensionRegistry);
  }
  }
 }

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

@@ -43,15 +43,19 @@ public class Validator {
  */
  public Validator(Config config) {
  Env env = Env.newEnv(Library.Lib(new ValidateLibrary()));
- this.evaluatorBuilder = new EvaluatorBuilder(env, config.isDisableLazy());
+ this.evaluatorBuilder =
+ new EvaluatorBuilder(
+ env, config.isDisableLazy(), config.getTypeRegistry(), config.getExtensionRegistry());
  this.failFast = config.isFailFast();
  }
 
  /** Constructs a new {@link Validator} with a default configuration. */
  public Validator() {
  Config config = Config.newBuilder().build();
  Env env = Env.newEnv(Library.Lib(new ValidateLibrary()));
- this.evaluatorBuilder = new EvaluatorBuilder(env, config.isDisableLazy());
+ this.evaluatorBuilder =
+ new EvaluatorBuilder(
+ env, config.isDisableLazy(), config.getTypeRegistry(), config.getExtensionRegistry());
  this.failFast = config.isFailFast();
  }