Add Pojo support for the primitive type 'void'

JAVA-4209

Author: robxyy

bson/src/main/org/bson/codecs/pojo/PropertyMetadata.java

@@ -33,6 +33,7 @@
 import static java.lang.reflect.Modifier.isTransient;
 
 final class PropertyMetadata<T> {
+    private static final TypeData<Void> VOID_TYPE_DATA = TypeData.builder(Void.class).build();
     private final String name;
     private final String declaringClassName;
     private final TypeData<T> typeData;
@@ -146,6 +147,9 @@ void setError(final String error) {
     }
 
     public boolean isSerializable() {
+        if (isVoidType()) {
+            return false;
+        }
         if (getter != null) {
             return field == null || notStaticOrTransient(field.getModifiers());
         } else {
@@ -154,13 +158,20 @@ public boolean isSerializable() {
     }
 
     public boolean isDeserializable() {
+        if (isVoidType()) {
+            return false;
+        }
         if (setter != null) {
             return field == null || !isFinal(field.getModifiers()) && notStaticOrTransient(field.getModifiers());
         } else {
             return field != null && !isFinal(field.getModifiers()) && isPublicAndNotStaticOrTransient(field.getModifiers());
         }
     }
 
+    private boolean isVoidType() {
+        return VOID_TYPE_DATA.equals(typeData);
+    }
+
     private boolean notStaticOrTransient(final int modifiers) {
         return !(isTransient(modifiers) || isStatic(modifiers));
     }

bson/src/main/org/bson/codecs/pojo/TypeData.java

@@ -236,6 +236,7 @@ private <S> Class<S> boxType(final Class<S> clazz) {
         map.put(int.class, Integer.class);
         map.put(long.class, Long.class);
         map.put(short.class, Short.class);
+        map.put(void.class, Void.class);
         PRIMITIVE_CLASS_MAP = map;
     }
 }

bson/src/test/unit/org/bson/codecs/pojo/ClassModelTest.java

@@ -265,6 +265,7 @@ public void testSimpleWithStaticModel() {
         assertEquals(2, classModel.getPropertyModels().size());
         assertEquals(createTypeData(Integer.class), classModel.getPropertyModel("integerField").getTypeData());
         assertEquals(createTypeData(String.class), classModel.getPropertyModel("stringField").getTypeData());
+
     }
 
     <T> TypeData.Builder<T> createBuilder(final Class<T> clazz, final Class<?>... types) {

bson/src/test/unit/org/bson/codecs/pojo/PojoRoundTripTest.java

@@ -27,6 +27,7 @@
 import org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel;
 import org.bson.codecs.pojo.entities.ContainsAlternativeMapAndCollectionModel;
 import org.bson.codecs.pojo.entities.ConventionModel;
+import org.bson.codecs.pojo.entities.DuplicateAnnotationAllowedModel;
 import org.bson.codecs.pojo.entities.FieldAndPropertyTypeMismatchModel;
 import org.bson.codecs.pojo.entities.GenericHolderModel;
 import org.bson.codecs.pojo.entities.GenericTreeModel;
@@ -79,6 +80,7 @@
 import org.bson.codecs.pojo.entities.conventions.BsonIgnoreDuplicatePropertyMultipleTypes;
 import org.bson.codecs.pojo.entities.conventions.BsonIgnoreInvalidMapModel;
 import org.bson.codecs.pojo.entities.conventions.BsonIgnoreSyntheticProperty;
+import org.bson.codecs.pojo.entities.conventions.BsonRepresentationModel;
 import org.bson.codecs.pojo.entities.conventions.CollectionDiscriminatorAbstractClassesModel;
 import org.bson.codecs.pojo.entities.conventions.CollectionDiscriminatorInterfacesModel;
 import org.bson.codecs.pojo.entities.conventions.CreatorAllFinalFieldsModel;
@@ -91,14 +93,12 @@
 import org.bson.codecs.pojo.entities.conventions.CreatorMethodModel;
 import org.bson.codecs.pojo.entities.conventions.CreatorNoArgsConstructorModel;
 import org.bson.codecs.pojo.entities.conventions.CreatorNoArgsMethodModel;
-import org.bson.codecs.pojo.entities.DuplicateAnnotationAllowedModel;
 import org.bson.codecs.pojo.entities.conventions.InterfaceModel;
 import org.bson.codecs.pojo.entities.conventions.InterfaceModelImplA;
 import org.bson.codecs.pojo.entities.conventions.InterfaceModelImplB;
 import org.bson.codecs.pojo.entities.conventions.Subclass1Model;
 import org.bson.codecs.pojo.entities.conventions.Subclass2Model;
 import org.bson.codecs.pojo.entities.conventions.SuperClassModel;
-import org.bson.codecs.pojo.entities.conventions.BsonRepresentationModel;
 import org.bson.types.ObjectId;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -518,7 +518,6 @@ private static List<TestData> testCases() {
                 getPojoCodecProviderBuilder(BsonRepresentationModel.class),
                 "{'_id': {'$oid': '111111111111111111111111'}, 'age': 1}"));
 
-
         return data;
     }
 

bson/src/test/unit/org/bson/codecs/pojo/PojoTestCase.java

@@ -29,6 +29,7 @@
 import org.bson.codecs.EncoderContext;
 import org.bson.codecs.ValueCodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.jsr310.Jsr310CodecProvider;
 import org.bson.codecs.pojo.entities.CollectionNestedPojoModel;
 import org.bson.codecs.pojo.entities.ConcreteCollectionsModel;
 import org.bson.codecs.pojo.entities.ConventionModel;
@@ -222,7 +223,7 @@ PojoCodecProvider.Builder getPojoCodecProviderBuilder(final ClassModelBuilder<?>
     }
 
     CodecRegistry getCodecRegistry(final PojoCodecProvider.Builder builder) {
-        return fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider(), builder.build());
+        return fromProviders(new BsonValueCodecProvider(), new ValueCodecProvider(), new Jsr310CodecProvider(), builder.build());
     }
 
     static SimpleModel getSimpleModel() {

bson/src/test/unit/org/bson/codecs/pojo/entities/SimpleWithStaticModel.java

@@ -50,6 +50,10 @@ public String getStringField() {
         // Mimics the static kotlin synthetic annotations field
     }
 
+    public void getStringField$Alternative() {
+        // Non static void getter field
+    }
+
     public void setStringField(final String stringField) {
         this.stringField = stringField;
     }