Support wildcard types in the PojoCodec

JAVA-3390

Author: jstewart148

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

@@ -21,6 +21,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
+import java.lang.reflect.WildcardType;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -79,6 +80,8 @@ private static <T> void getNestedTypeData(final TypeData.Builder<T> builder, fin
                 getNestedTypeData(paramBuilder, argType);
             }
             builder.addTypeParameter(paramBuilder.build());
+        } else if (type instanceof WildcardType) {
+            builder.addTypeParameter(TypeData.builder((Class) ((WildcardType) type).getUpperBounds()[0]).build());
         } else if (type instanceof TypeVariable) {
             builder.addTypeParameter(TypeData.builder(Object.class).build());
         } else if (type instanceof Class) {

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

@@ -17,7 +17,9 @@
 package org.bson.codecs.pojo;
 
 import org.bson.codecs.pojo.entities.CollectionNestedPojoModel;
+import org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel;
 import org.bson.codecs.pojo.entities.GenericHolderModel;
+import org.bson.codecs.pojo.entities.InterfaceBasedModel;
 import org.bson.codecs.pojo.entities.NestedGenericHolderMapModel;
 import org.bson.codecs.pojo.entities.PropertySelectionModel;
 import org.bson.codecs.pojo.entities.ShapeHolderCircleModel;
@@ -94,6 +96,15 @@ public void testCollectionNestedPojoModelPropertyTypes() {
         assertEquals(listMapSet, classModel.getPropertyModel("listMapSetSimple").getTypeData());
     }
 
+    @Test
+    @SuppressWarnings("rawtypes")
+    public void testWildcardModel() {
+        TypeData<InterfaceBasedModel> model = TypeData.builder(InterfaceBasedModel.class).build();
+        TypeData<List> wildcard = TypeData.builder(List.class).addTypeParameter(model).build();
+        ClassModel<?> classModel = ClassModel.builder(ConcreteAndNestedAbstractInterfaceModel.class).build();
+        assertEquals(wildcard, classModel.getPropertyModel("wildcardList").getTypeData());
+    }
+
     @Test
     public void testPropertySelection() {
         ClassModel<PropertySelectionModel> classModel = ClassModel.builder(PropertySelectionModel.class).build();

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

@@ -26,15 +26,19 @@
 import org.bson.codecs.MapCodec;
 import org.bson.codecs.configuration.CodecConfigurationException;
 import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.codecs.pojo.entities.AbstractInterfaceModel;
 import org.bson.codecs.pojo.entities.AsymmetricalCreatorModel;
 import org.bson.codecs.pojo.entities.AsymmetricalIgnoreModel;
 import org.bson.codecs.pojo.entities.AsymmetricalModel;
+import org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel;
 import org.bson.codecs.pojo.entities.ConcreteCollectionsModel;
+import org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel;
 import org.bson.codecs.pojo.entities.ConstructorNotPublicModel;
 import org.bson.codecs.pojo.entities.ConventionModel;
 import org.bson.codecs.pojo.entities.ConverterModel;
 import org.bson.codecs.pojo.entities.CustomPropertyCodecOptionalModel;
 import org.bson.codecs.pojo.entities.GenericTreeModel;
+import org.bson.codecs.pojo.entities.InterfaceBasedModel;
 import org.bson.codecs.pojo.entities.InvalidCollectionModel;
 import org.bson.codecs.pojo.entities.InvalidGetterAndSetterModel;
 import org.bson.codecs.pojo.entities.InvalidMapModel;
@@ -77,6 +81,7 @@
 
 import static java.lang.String.format;
 import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.bson.codecs.configuration.CodecRegistries.fromCodecs;
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries;
@@ -253,6 +258,23 @@ public void testUseGettersForSettersConvention() {
         roundTrip(builder, new MapGetterMutableModel(Collections.singletonMap("a", 3)), "{mapField: {a: 3}}");
     }
 
+    @Test
+    public void testWithWildcardListField() {
+        ClassModel<InterfaceBasedModel> interfaceBasedModelClassModel =
+                ClassModel.builder(InterfaceBasedModel.class).enableDiscriminator(true).build();
+        PojoCodecProvider.Builder builder = PojoCodecProvider.builder().automatic(true)
+                .register(interfaceBasedModelClassModel)
+                .register(AbstractInterfaceModel.class, ConcreteStandAloneAbstractInterfaceModel.class,
+                        ConcreteAndNestedAbstractInterfaceModel.class);
+
+        roundTrip(builder,
+                new ConcreteAndNestedAbstractInterfaceModel("A",
+                        singletonList(new ConcreteStandAloneAbstractInterfaceModel("B"))),
+                "{'_t': 'org.bson.codecs.pojo.entities.ConcreteAndNestedAbstractInterfaceModel', 'name': 'A', "
+                        + "  'wildcardList': [{'_t': 'org.bson.codecs.pojo.entities.ConcreteStandAloneAbstractInterfaceModel', "
+                        + "'name': 'B'}]}");
+    }
+
     @Test(expected = CodecConfigurationException.class)
     public void testUseGettersForSettersConventionInvalidTypeForCollection() {
         PojoCodecProvider.Builder builder = getPojoCodecProviderBuilder(CollectionsGetterMutableModel.class)

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

@@ -19,9 +19,12 @@
 
 import org.bson.codecs.pojo.annotations.BsonProperty;
 
+import java.util.List;
+
 public final class ConcreteAndNestedAbstractInterfaceModel extends AbstractInterfaceModel {
     @BsonProperty(useDiscriminator = true)
     private InterfaceBasedModel child;
+    private List<? extends InterfaceBasedModel> wildcardList;
 
     public ConcreteAndNestedAbstractInterfaceModel() {
         super();
@@ -32,6 +35,12 @@ public ConcreteAndNestedAbstractInterfaceModel(final String name, final Interfac
         this.child = child;
     }
 
+    public ConcreteAndNestedAbstractInterfaceModel(final String name, final List<? extends InterfaceBasedModel> wildcardList) {
+        super(name);
+        this.child = null;
+        this.wildcardList = wildcardList;
+    }
+
     public InterfaceBasedModel getChild() {
         return child;
     }
@@ -40,6 +49,14 @@ public void setChild(final InterfaceBasedModel child) {
         this.child = child;
     }
 
+    public List<? extends InterfaceBasedModel> getWildcardList() {
+        return wildcardList;
+    }
+
+    public void setWildcardList(final List<? extends InterfaceBasedModel> wildcardList) {
+        this.wildcardList = wildcardList;
+    }
+
     @Override
     public boolean equals(final Object o) {
         if (this == o) {