Ensure required message fields are validated.

Fixes #21
scalapb · Sep 25, 2020 · 5deda0a · 5deda0a
1 parent 03e74e2
commit 5deda0a
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 5 deletions.
diff --git a/code-gen/src/main/scala/scalapb/validate/compiler/CodeGenerator.scala b/code-gen/src/main/scala/scalapb/validate/compiler/CodeGenerator.scala
@@ -213,7 +213,16 @@ class MessagePrinter(
       else Seq.empty
 
     val messageRules = if (fd.isMessage) {
-      val maybeRequired: Option[SingularResult] = None
+      val maybeRequired: Option[SingularResult] = Rule.ifSet(
+        !fd.supportsPresence && !fd.isRepeated && !fd.isInOneof && !rulesProto.getMessage.getSkip &&
+          !fd.getMessageType.getFullName.startsWith("google.protobuf")
+      )(
+        SingularResult(
+          fd,
+          accessor,
+          Rule.messageValidate(validatorName(fd.getMessageType).fullName)
+        )
+      )
 
       val maybeNested = Rule.ifSet(
         (fd.supportsPresence || fd.isInOneof) && !rulesProto.getMessage.getSkip &&
@@ -250,13 +259,13 @@ class MessagePrinter(
       case OptionalResult(fd, accessor, lines0) =>
         val lines = lines0.map(_.render(fd, "_value"))
         Seq(s"scalapb.validate.Result.optional($accessor) { _value =>") ++
-          lines.dropRight(1).map(l => l + " &&") ++
-          Seq(lines.last, "}")
+          lines.dropRight(1).map(l => "  " + l + " &&") ++
+          Seq("  " + lines.last, "}")
       case RepeatedResult(fd, accessor, lines0) =>
         val lines = lines0.map(_.render(fd, "_value"))
         Seq(s"scalapb.validate.Result.repeated($accessor) { _value =>") ++
-          lines.dropRight(1).map(l => l + " &&") ++
-          Seq(lines.last, "}")
+          lines.dropRight(1).map(l => "  " + l + " &&") ++
+          Seq("  " + lines.last, "}")
     }
 
   def formattedRulesForOneofs(oneof: OneofDescriptor): Seq[Seq[String]] = {

diff --git a/e2e/src/main/protobuf/required.proto b/e2e/src/main/protobuf/required.proto
@@ -0,0 +1,16 @@
+syntax = "proto2";
+
+package examplepb2;
+
+import "validate/validate.proto";
+
+message Person {
+  message Location {
+    required double lat = 1 [(validate.rules).double = { gte: -90,  lte: 90 }];
+    required double lng = 2 [(validate.rules).double = { gte: -180, lte: 180 }];
+  }
+
+  required string email = 1 [(validate.rules).string.email = true];
+  required Location home = 2;
+  optional Location second_home = 3;
+}
diff --git a/e2e/src/test/scala/scalapb/validate/ValidatorSpec.scala b/e2e/src/test/scala/scalapb/validate/ValidatorSpec.scala
@@ -1,6 +1,7 @@
 package scalapb.validate
 
 import examplepb.example.Person
+import examplepb2.required.{Person => Person2}
 
 class ValidatorSpec extends munit.FunSuite {
 
@@ -51,4 +52,16 @@ class ValidatorSpec extends munit.FunSuite {
       ("Person.Location.lat", Double.box(100)) :: Nil
     )
   }
+
+  // See issue #21
+  test("Required message is validated") {
+    assertFailure(
+      Validator[Person2]
+        .validate(
+          Person2(email = "foo@foo.com", home = Person2.Location(91, 0))
+        ),
+      ("Person.Location.lat", Double.box(91.0)) :: Nil
+    )
+
+  }
 }