throw exception if invalid option value

bufbuild · Oct 10, 2023 · 3ed122d · 3ed122d
1 parent e0dedbe
commit 3ed122d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/main/java/build/buf/protovalidate/internal/evaluator/ConstraintResolver.java b/src/main/java/build/buf/protovalidate/internal/evaluator/ConstraintResolver.java
@@ -14,6 +14,7 @@
 
 package build.buf.protovalidate.internal.evaluator;
 
+import build.buf.protovalidate.exceptions.CompilationException;
 import build.buf.validate.FieldConstraints;
 import build.buf.validate.MessageConstraints;
 import build.buf.validate.OneofConstraints;
@@ -35,7 +36,7 @@ class ConstraintResolver {
    * @return the resolved {@link MessageConstraints}.
    */
   MessageConstraints resolveMessageConstraints(Descriptor desc)
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, CompilationException {
     DescriptorProtos.MessageOptions options = desc.getOptions();
     if (!options.hasExtension(ValidateProto.message)) {
       return MessageConstraints.getDefaultInstance();
@@ -51,7 +52,7 @@ MessageConstraints resolveMessageConstraints(Descriptor desc)
       // java_package.
       return MessageConstraints.parseFrom(((MessageLite) value).toByteString());
     }
-    return MessageConstraints.getDefaultInstance();
+    throw new CompilationException("unexpected message constraint option type: " + value);
   }
 
   /**
@@ -61,7 +62,7 @@ MessageConstraints resolveMessageConstraints(Descriptor desc)
    * @return the resolved {@link OneofConstraints}.
    */
   OneofConstraints resolveOneofConstraints(OneofDescriptor desc)
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, CompilationException {
     DescriptorProtos.OneofOptions options = desc.getOptions();
     if (!options.hasExtension(ValidateProto.oneof)) {
       return OneofConstraints.getDefaultInstance();
@@ -77,7 +78,7 @@ OneofConstraints resolveOneofConstraints(OneofDescriptor desc)
       // java_package.
       return OneofConstraints.parseFrom(((MessageLite) value).toByteString());
     }
-    return OneofConstraints.getDefaultInstance();
+    throw new CompilationException("unexpected oneof constraint option type: " + value);
   }
 
   /**
@@ -87,7 +88,7 @@ OneofConstraints resolveOneofConstraints(OneofDescriptor desc)
    * @return the resolved {@link FieldConstraints}.
    */
   FieldConstraints resolveFieldConstraints(FieldDescriptor desc)
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, CompilationException {
     DescriptorProtos.FieldOptions options = desc.getOptions();
     if (!options.hasExtension(ValidateProto.field)) {
       return FieldConstraints.getDefaultInstance();
@@ -103,6 +104,6 @@ FieldConstraints resolveFieldConstraints(FieldDescriptor desc)
       // java_package.
       return FieldConstraints.parseFrom(((MessageLite) value).toByteString());
     }
-    return FieldConstraints.getDefaultInstance();
+    throw new CompilationException("unexpected field constraint option type: " + value);
   }
 }
diff --git a/src/main/java/build/buf/protovalidate/internal/evaluator/EvaluatorBuilder.java b/src/main/java/build/buf/protovalidate/internal/evaluator/EvaluatorBuilder.java
@@ -139,7 +139,7 @@ private void processMessageExpressions(
   }
 
   private void processOneofConstraints(Descriptor desc, MessageEvaluator msgEval)
-      throws InvalidProtocolBufferException {
+      throws InvalidProtocolBufferException, CompilationException {
     List<Descriptors.OneofDescriptor> oneofs = desc.getOneofs();
     for (Descriptors.OneofDescriptor oneofDesc : oneofs) {
       OneofConstraints oneofConstraints = resolver.resolveOneofConstraints(oneofDesc);