IPROTO-218 Support uninitialized Date and Instant

infinispan · Aug 29, 2022 · 5381e23 · 5381e23
1 parent 43a4f8c
commit 5381e23
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/...ain/java/org/infinispan/protostream/annotations/impl/AbstractMarshallerCodeGenerator.java b/...ain/java/org/infinispan/protostream/annotations/impl/AbstractMarshallerCodeGenerator.java
@@ -267,7 +267,9 @@ protected String generateReadMethodBody(ProtoMessageTypeMetadata messageTypeMeta
                      || fieldMetadata.getProtobufType().getJavaType() == JavaType.STRING
                      || fieldMetadata.getProtobufType().getJavaType() == JavaType.BYTE_STRING
                      || fieldMetadata.getProtobufType().getJavaType() == JavaType.ENUM
-                     || fieldMetadata.getProtobufType().getJavaType() == JavaType.MESSAGE) {
+                     || fieldMetadata.getProtobufType().getJavaType() == JavaType.MESSAGE
+                     || fieldMetadata.getJavaType().getCanonicalName().equals(Date.class.getCanonicalName())
+                     || fieldMetadata.getJavaType().getCanonicalName().equals(Instant.class.getCanonicalName())) {
                   iw.append(" = null");
                } else if (fieldMetadata.isPrimitive()) {
                   if (fieldMetadata.getProtobufType() == Type.BOOL) {

diff --git a/core/src/test/java/org/infinispan/protostream/annotations/impl/ProtoSchemaBuilderTest.java b/core/src/test/java/org/infinispan/protostream/annotations/impl/ProtoSchemaBuilderTest.java
@@ -892,6 +892,12 @@ static class MessageWithAllFieldTypes {
       @ProtoField(number = 36, defaultValue = "36")
       Byte[] testField36 = {1, 2, 3};
 
+      @ProtoField(number = 37)
+      Date getTestField37;
+
+      @ProtoField(number = 38)
+      Instant getTestField38;
+
       private char testField51;
 
       @ProtoField(number = 51, defaultValue = "A")
@@ -1287,6 +1293,28 @@ public Byte[] getTestField86() {
       public void setTestField86(Byte[] testField86) {
          this.testField86 = testField86;
       }
+
+      private Date testField87;
+
+      @ProtoField(number = 87)
+      public Date getTestField87() {
+         return testField87;
+      }
+
+      public void setTestField87(Date testField87) {
+         this.testField87 = testField87;
+      }
+
+      private Instant testField88;
+
+      @ProtoField(number = 88)
+      public Instant getTestField88() {
+         return testField88;
+      }
+
+      public void setTestField88(Instant testField88) {
+         this.testField88 = testField88;
+      }
    }
 
    @Test

diff --git a/...g/infinispan/protostream/annotations/impl/processor/tests/AutoProtoSchemaBuilderTest.java b/...g/infinispan/protostream/annotations/impl/processor/tests/AutoProtoSchemaBuilderTest.java
@@ -373,6 +373,12 @@ static class MessageWithAllFieldTypes {
       @ProtoField(number = 36, defaultValue = "36")
       Byte[] testField36 = {1, 2, 3};
 
+      @ProtoField(number = 37)
+      Date getTestField37;
+
+      @ProtoField(number = 38)
+      Instant getTestField38;
+
       private char testField51;
 
       @ProtoField(number = 51, defaultValue = "A")
@@ -768,6 +774,28 @@ public Byte[] getTestField86() {
       public void setTestField86(Byte[] testField86) {
          this.testField86 = testField86;
       }
+
+      private Date testField87;
+
+      @ProtoField(number = 87)
+      public Date getTestField87() {
+         return testField87;
+      }
+
+      public void setTestField87(Date testField87) {
+         this.testField87 = testField87;
+      }
+
+      private Instant testField88;
+
+      @ProtoField(number = 88)
+      public Instant getTestField88() {
+         return testField88;
+      }
+
+      public void setTestField88(Instant testField88) {
+         this.testField88 = testField88;
+      }
    }
 
    @AutoProtoSchemaBuilder(includeClasses = MessageWithAllFieldTypes.class)