IPROTO-350 Proto3 record default values initialized to null

core/src/main/java/org/infinispan/protostream/annotations/impl/ProtoMessageTypeMetadata.java

@@ -769,7 +769,7 @@ private void discoverFieldsFromRecord(XClass clazz, Map<Integer, ProtoFieldMetad
          String oneof = null;
          Object defaultValue;
          if (annotation == null) {
-            defaultValue = getDefaultValue(clazz, fieldName, javaType, protobufType, null, false);
+            defaultValue = getDefaultValue(clazz, fieldName, javaType, protobufType, "", false);
          } else {
             if (annotation.number() > 0) fieldNumber = annotation.number();
             if (!annotation.name().isEmpty()) fieldName = annotation.name();

integrationtests/src/test/java/org/infinispan/protostream/integrationtests/processor/marshaller/GeneratedMarshallerTest.java

@@ -24,6 +24,7 @@
 import org.infinispan.protostream.integrationtests.processor.marshaller.model.NullTestModel;
 import org.infinispan.protostream.integrationtests.processor.marshaller.model.Player;
 import org.infinispan.protostream.integrationtests.processor.marshaller.model.SimpleEnum;
+import org.infinispan.protostream.integrationtests.processor.marshaller.model.SimpleRecord;
 import org.junit.Test;
 
 public class GeneratedMarshallerTest {
@@ -84,6 +85,11 @@ public void proto2NullFields() throws IOException {
       assertNull(player.getShirtNumber());
       assertEquals(0, player.getMatchRating());
       assertNull(player.getBytes());
+
+      bytes = ProtobufUtil.toWrappedByteArray(ctx, new SimpleRecord(null, null));
+      SimpleRecord record = ProtobufUtil.fromWrappedByteArray(ctx, bytes);
+      assertNull(record.string());
+      assertNull(record.boxedInt());
    }
 
    @Test
@@ -100,6 +106,11 @@ public void proto3AllowNullFields() throws IOException {
       assertEquals(0, model.primitiveInt);
       assertNull(model.bytes);
       assertNull(model.simpleEnum);
+
+      bytes = ProtobufUtil.toWrappedByteArray(ctx, new SimpleRecord(null, null));
+      SimpleRecord record = ProtobufUtil.fromWrappedByteArray(ctx, bytes);
+      assertNull(record.string());
+      assertNull(record.boxedInt());
    }
 
    @Test
@@ -116,12 +127,18 @@ public void proto3NoNullFields() throws IOException {
       assertEquals(0, model.primitiveInt);
       assertEquals(0, model.bytes.length);
       assertEquals(SimpleEnum.FIRST, model.simpleEnum);
+
+      bytes = ProtobufUtil.toWrappedByteArray(ctx, new SimpleRecord(null, null));
+      SimpleRecord record = ProtobufUtil.fromWrappedByteArray(ctx, bytes);
+      assertEquals("", record.string());
+      assertEquals((Integer) 0, record.boxedInt());
    }
 
    @ProtoSchema(
          includeClasses = {
                NullTestModel.class,
-               SimpleEnum.class
+               SimpleEnum.class,
+               SimpleRecord.class
          },
          schemaPackageName = "nonulls",
          schemaFilePath = "proto",
@@ -135,7 +152,8 @@ interface NoNullsSchema extends GeneratedSchema {
          allowNullFields = true,
          includeClasses = {
                NullTestModel.class,
-               SimpleEnum.class
+               SimpleEnum.class,
+               SimpleRecord.class
          },
          schemaPackageName = "allownulls",
          schemaFilePath = "proto",

integrationtests/src/test/java/org/infinispan/protostream/integrationtests/processor/marshaller/model/FootballSchema.java

@@ -3,7 +3,7 @@
 import org.infinispan.protostream.GeneratedSchema;
 import org.infinispan.protostream.annotations.AutoProtoSchemaBuilder;
 
-@AutoProtoSchemaBuilder(includeClasses = { FootballTeam.class, Player.class }, schemaPackageName = "org.football",
+@AutoProtoSchemaBuilder(includeClasses = { FootballTeam.class, Player.class, SimpleRecord.class }, schemaPackageName = "org.football",
       schemaFileName = "football.proto", schemaFilePath = "proto")
 public interface FootballSchema extends GeneratedSchema {
    GeneratedSchema INSTANCE = new FootballSchemaImpl();

integrationtests/src/test/java/org/infinispan/protostream/integrationtests/processor/marshaller/model/SimpleRecord.java

@@ -0,0 +1,7 @@
+package org.infinispan.protostream.integrationtests.processor.marshaller.model;
+
+import org.infinispan.protostream.annotations.Proto;
+
+@Proto
+public record SimpleRecord(String string, Integer boxedInt) {
+}