Throw if one sets a null to a omit-identity enum in Java

square · Aug 4, 2020 · 8343d8a · 8343d8a
1 parent 98dafdf
commit 8343d8a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/wire-library/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java b/wire-library/wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java
@@ -1404,9 +1404,11 @@ private MethodSpec messageConstructor(
         result.addParameter(param.build());
       }
 
-      if (field.getEncodeMode() == Field.EncodeMode.OMIT_IDENTITY && field.getType().isScalar()) {
+      if (field.getEncodeMode() == Field.EncodeMode.OMIT_IDENTITY) {
         // Other scalars use not-boxed types to guarantee a value.
-        if (field.getType() == ProtoType.STRING || field.getType() == ProtoType.BYTES) {
+        if (field.getType().isScalar()
+            && (field.getType() == ProtoType.STRING || field.getType() == ProtoType.BYTES)
+            || isEnum(field.getType())) {
           result.beginControlFlow("if ($L == null)", fieldAccessName);
           result.addStatement("throw new IllegalArgumentException($S)",
               fieldAccessName + " == null");

diff --git a/...compatibility-tests/src/test/java/com/squareup/wire/Proto3WireProtocCompatibilityTests.kt b/...compatibility-tests/src/test/java/com/squareup/wire/Proto3WireProtocCompatibilityTests.kt
@@ -346,6 +346,15 @@ class Proto3WireProtocCompatibilityTests {
     }
   }
 
+  @Test fun cannotPassNullToIdentityEnum(){
+    try {
+      AllTypesJ.Builder().nested_enum(null).build()
+      fail()
+    } catch (exception: IllegalArgumentException) {
+      assertThat(exception).hasMessage("builder.nested_enum == null")
+    }
+  }
+
   companion object {
     private val defaultAllTypesProtoc = AllTypesOuterClass.AllTypes.newBuilder()
         .setMyInt32(111)