Fix PojoCodec NPE with automatic mapping of Enums

JAVA-2709

Author: rozza

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

@@ -55,7 +55,7 @@ static <T> void configureClassModelBuilder(final ClassModelBuilder<T> classModel
         TypeData<?> parentClassTypeData = null;
 
         Map<String, PropertyMetadata<?>> propertyNameMap = new HashMap<String, PropertyMetadata<?>>();
-        while (currentClass.getSuperclass() != null) {
+        while (!currentClass.isEnum() && currentClass.getSuperclass() != null) {
             annotations.addAll(asList(currentClass.getDeclaredAnnotations()));
             List<String> genericTypeNames = new ArrayList<String>();
             for (TypeVariable<? extends Class<? super T>> classTypeVariable : currentClass.getTypeParameters()) {

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

@@ -334,7 +334,8 @@ private static <T> boolean shouldSpecialize(final ClassModel<T> classModel) {
 
         for (Map.Entry<String, TypeParameterMap> entry : classModel.getPropertyNameToTypeParameterMap().entrySet()) {
             TypeParameterMap typeParameterMap = entry.getValue();
-            if (typeParameterMap.hasTypeParameters() && classModel.getPropertyModel(entry.getKey()).getCodec() == null) {
+            PropertyModel<?> propertyModel = classModel.getPropertyModel(entry.getKey());
+            if (typeParameterMap.hasTypeParameters() && (propertyModel == null || propertyModel.getCodec() == null)) {
                 return false;
             }
         }

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

@@ -250,11 +250,6 @@ public void testUseGettersForSettersConventionNotEmptyMap() {
         roundTrip(builder, new MapGetterNonEmptyModel(Collections.singletonMap("a", 3)), "{mapField: {a: 3}}");
     }
 
-    @Test
-    public void testEnumSupport() {
-        roundTrip(getPojoCodecProviderBuilder(SimpleEnumModel.class), new SimpleEnumModel(SimpleEnum.BRAVO), "{ 'myEnum': 'BRAVO' }");
-    }
-
     @Test
     public void testEnumSupportWithCustomCodec() {
         CodecRegistry registry = fromRegistries(getCodecRegistry(getPojoCodecProviderBuilder(SimpleEnumModel.class)),

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

@@ -55,6 +55,8 @@
 import org.bson.codecs.pojo.entities.ShapeModelAbstract;
 import org.bson.codecs.pojo.entities.ShapeModelCircle;
 import org.bson.codecs.pojo.entities.ShapeModelRectangle;
+import org.bson.codecs.pojo.entities.SimpleEnum;
+import org.bson.codecs.pojo.entities.SimpleEnumModel;
 import org.bson.codecs.pojo.entities.SimpleGenericsModel;
 import org.bson.codecs.pojo.entities.SimpleModel;
 import org.bson.codecs.pojo.entities.SimpleNestedPojoModel;
@@ -351,6 +353,10 @@ private static List<TestData> testCases() {
                 getPojoCodecProviderBuilder(FieldAndPropertyTypeMismatchModel.class),
                 "{'stringField': 'foo'}"));
 
+        data.add(new TestData("Enums support",
+                new SimpleEnumModel(SimpleEnum.BRAVO),
+                getPojoCodecProviderBuilder(SimpleEnumModel.class),
+                "{ 'myEnum': 'BRAVO' }"));
         return data;
     }