Clean up extension registry bits

Author: jchadwick-buf

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

@@ -14,7 +14,6 @@
 
 package build.buf.protovalidate;
 
-import build.buf.validate.ValidateProto;
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.TypeRegistry;
 
@@ -24,12 +23,6 @@ public final class Config {
   private static final ExtensionRegistry DEFAULT_EXTENSION_REGISTRY =
       ExtensionRegistry.newInstance();
 
-  static {
-    DEFAULT_EXTENSION_REGISTRY.add(ValidateProto.message);
-    DEFAULT_EXTENSION_REGISTRY.add(ValidateProto.field);
-    DEFAULT_EXTENSION_REGISTRY.add(ValidateProto.oneof);
-  }
-
   private final boolean failFast;
   private final boolean disableLazy;
   private final TypeRegistry typeRegistry;

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

@@ -58,6 +58,12 @@ public CelRule(AstExpression astExpression, FieldDescriptor field) {
     }
   }
 
+  private static final ExtensionRegistry EXTENSION_REGISTRY = ExtensionRegistry.newInstance();
+
+  static {
+    EXTENSION_REGISTRY.add(PrivateProto.field);
+  }
+
   /** Partial eval options for evaluating the constraint's expression. */
   private static final ProgramOption PARTIAL_EVAL_OPTIONS =
       ProgramOption.evalOptions(
@@ -177,12 +183,11 @@ public List<CompiledProgram> compile(
   private @Nullable build.buf.validate.priv.FieldConstraints getFieldConstraints(
       FieldDescriptor constraintFieldDesc) throws CompilationException {
     DescriptorProtos.FieldOptions options = constraintFieldDesc.getOptions();
-    // If the protovalidate field option is unknown, reparse using extension registry.
+    // If the protovalidate field option is unknown, reparse options using our extension registry.
     if (options.getUnknownFields().hasField(PrivateProto.field.getNumber())) {
       try {
-        ExtensionRegistry registry = ExtensionRegistry.newInstance();
-        registry.add(PrivateProto.field);
-        options = DescriptorProtos.FieldOptions.parseFrom(options.toByteString(), registry);
+        options =
+            DescriptorProtos.FieldOptions.parseFrom(options.toByteString(), EXTENSION_REGISTRY);
       } catch (InvalidProtocolBufferException e) {
         throw new CompilationException("Failed to parse field options", e);
       }

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

@@ -29,6 +29,13 @@
 
 /** Manages the resolution of protovalidate constraints. */
 class ConstraintResolver {
+  private static final ExtensionRegistry EXTENSION_REGISTRY = ExtensionRegistry.newInstance();
+
+  static {
+    EXTENSION_REGISTRY.add(ValidateProto.message);
+    EXTENSION_REGISTRY.add(ValidateProto.oneof);
+    EXTENSION_REGISTRY.add(ValidateProto.field);
+  }
 
   /**
    * Resolves the constraints for a message descriptor.
@@ -41,9 +48,8 @@ MessageConstraints resolveMessageConstraints(Descriptor desc)
     DescriptorProtos.MessageOptions options = desc.getOptions();
     // If the protovalidate message extension is unknown, reparse using extension registry.
     if (options.getUnknownFields().hasField(ValidateProto.message.getNumber())) {
-      ExtensionRegistry registry = ExtensionRegistry.newInstance();
-      registry.add(ValidateProto.message);
-      options = DescriptorProtos.MessageOptions.parseFrom(options.toByteString(), registry);
+      options =
+          DescriptorProtos.MessageOptions.parseFrom(options.toByteString(), EXTENSION_REGISTRY);
     }
     if (!options.hasExtension(ValidateProto.message)) {
       return MessageConstraints.getDefaultInstance();
@@ -73,9 +79,7 @@ OneofConstraints resolveOneofConstraints(OneofDescriptor desc)
     DescriptorProtos.OneofOptions options = desc.getOptions();
     // If the protovalidate oneof extension is unknown, reparse using extension registry.
     if (options.getUnknownFields().hasField(ValidateProto.oneof.getNumber())) {
-      ExtensionRegistry registry = ExtensionRegistry.newInstance();
-      registry.add(ValidateProto.oneof);
-      options = DescriptorProtos.OneofOptions.parseFrom(options.toByteString(), registry);
+      options = DescriptorProtos.OneofOptions.parseFrom(options.toByteString(), EXTENSION_REGISTRY);
     }
     if (!options.hasExtension(ValidateProto.oneof)) {
       return OneofConstraints.getDefaultInstance();
@@ -105,9 +109,7 @@ FieldConstraints resolveFieldConstraints(FieldDescriptor desc)
     DescriptorProtos.FieldOptions options = desc.getOptions();
     // If the protovalidate field option is unknown, reparse using extension registry.
     if (options.getUnknownFields().hasField(ValidateProto.field.getNumber())) {
-      ExtensionRegistry registry = ExtensionRegistry.newInstance();
-      registry.add(ValidateProto.field);
-      options = DescriptorProtos.FieldOptions.parseFrom(options.toByteString(), registry);
+      options = DescriptorProtos.FieldOptions.parseFrom(options.toByteString(), EXTENSION_REGISTRY);
     }
     if (!options.hasExtension(ValidateProto.field)) {
       return FieldConstraints.getDefaultInstance();