Include oneOfs in constructorTakesAllFields() and fix null check in generateOptionType (#3310)

* Include oneOfs in count for constructorTakesAllFields()

* Fix null check in generateOptionType

* Spotless

Author: brunofrts

wire-java-generator/src/main/java/com/squareup/wire/java/JavaGenerator.java

@@ -879,7 +879,7 @@ private TypeSpec generateMessage(MessageType type) {
 
   /** Decides if a constructor should take all fields or a builder as a parameter. */
   private boolean constructorTakesAllFields(MessageType type) {
-    return type.fields().size() < MAX_PARAMS_IN_CONSTRUCTOR;
+    return type.getFieldsAndOneOfFields().size() < MAX_PARAMS_IN_CONSTRUCTOR;
   }
 
   private TypeSpec generateEnclosingType(EnclosingType type) {
@@ -2340,7 +2340,7 @@ public ClassName generatedTypeName(ProtoMember member) {
 
     if (!eligibleAsAnnotationMember(schema, field)) return null;
     TypeName returnType;
-    if (field.getLabel().equals(Field.Label.REPEATED)) {
+    if (Field.Label.REPEATED.equals(field.getLabel())) {
       TypeName typeName = typeName(field.getType());
       if (typeName.equals(TypeName.LONG)
           || typeName.equals(TypeName.INT)

wire-java-generator/src/test/java/com/squareup/wire/java/JavaGeneratorTest.java

@@ -84,16 +84,64 @@ public void tooManyFieldsTest() throws Exception {
                 ""
                     + "message Message {\n"
                     + s.toString()
-                    + "    oneof oneof_name {\n"
-                    + "       int32 foo = 257;\n"
-                    + "       int32 bar = 258;\n"
-                    + "    }\n"
+                    + "  oneof oneof_name {\n"
+                    + "    int32 foo = 257;\n"
+                    + "    int32 bar = 258;\n"
+                    + "  }\n"
+                    + "}\n")
+            .build();
+    assertThat(new JavaWithProfilesGenerator(schema).generateJava("Message"))
+        .contains("" + "public Message(Builder builder, ByteString unknownFields)");
+  }
+
+  @Test
+  public void tooManyFieldsInOneOfTest() throws Exception {
+    StringBuilder s = new StringBuilder();
+    for (int i = 3; i < 259; i++) {
+      s.append("    int32 field_" + i + " = " + i + ";\n");
+    }
+    Schema schema =
+        new SchemaBuilder()
+            .add(
+                Path.get("message.proto"),
+                ""
+                    + "message Message {\n"
+                    + "  repeated int32 foo = 1;\n"
+                    + "  repeated int32 bar = 2;\n"
+                    + "  oneof oneof_name {\n"
+                    + s.toString()
+                    + "  }\n"
                     + "}\n")
             .build();
     assertThat(new JavaWithProfilesGenerator(schema).generateJava("Message"))
         .contains("" + "public Message(Builder builder, ByteString unknownFields)");
   }
 
+  @Test
+  public void nullLabelIsHandledDuringOptionGeneration() throws Exception {
+    Schema schema =
+        new SchemaBuilder()
+            .add(
+                Path.get("message.proto"),
+                ""
+                    + "syntax = \"proto3\";\n"
+                    + "import \"google/protobuf/descriptor.proto\";\n"
+                    + "message Message {\n"
+                    + "  extend google.protobuf.MessageOptions {\n"
+                    + "    string owner = 55682;\n"
+                    + "  }\n"
+                    + "}")
+            .build();
+    assertThat(new JavaWithProfilesGenerator(schema).generateJava("Message", null, false, true))
+        .contains(
+            ""
+                + "  @Retention(RetentionPolicy.RUNTIME)\n"
+                + "  @Target(ElementType.TYPE)\n"
+                + "  public @interface OwnerOption {\n"
+                + "    String value();\n"
+                + "  }");
+  }
+
   @Test
   public void map() throws Exception {
     Schema schema =

wire-java-generator/src/test/java/com/squareup/wire/java/JavaWithProfilesGenerator.kt

@@ -53,10 +53,13 @@ internal class JavaWithProfilesGenerator(private val schema: Schema) {
     typeName: String,
     profileName: String? = null,
     buildersOnly: Boolean = false,
+    emitDeclaredOptions: Boolean = false,
+    emitAppliedOptions: Boolean = false,
   ): String {
     val javaGenerator = JavaGenerator.get(schema)
       .withProfile(profile(profileName))
       .withBuildersOnly(buildersOnly)
+      .withOptions(emitDeclaredOptions, emitAppliedOptions)
     val type = schema.getType(typeName)
     val typeSpec = javaGenerator.generateType(type)
     val packageName = javaGenerator.generatedTypeName(type).packageName()