PojoCodecProvider improvements for automatic / package based classes.

Logs a warning if a class being lookup is incompatible with the
PojoCodec

JAVA-2838

Author: rozza

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

@@ -18,6 +18,8 @@
 import org.bson.codecs.Codec;
 import org.bson.codecs.configuration.CodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.diagnostics.Logger;
+import org.bson.diagnostics.Loggers;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -27,6 +29,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import static java.lang.String.format;
 import static java.util.Arrays.asList;
 import static org.bson.assertions.Assertions.notNull;
 
@@ -36,6 +39,7 @@
  * @since 3.5
  */
 public final class PojoCodecProvider implements CodecProvider {
+    static final Logger LOGGER = Loggers.getLogger("codecs.pojo");
     private final boolean automatic;
     private final Map<Class<?>, ClassModel<?>> classModels;
     private final Set<String> packages;
@@ -76,14 +80,15 @@ private <T> PojoCodec<T> getPojoCodec(final Class<T> clazz, final CodecRegistry
         } else if (automatic || (clazz.getPackage() != null && packages.contains(clazz.getPackage().getName()))) {
             try {
                 classModel = createClassModel(clazz, conventions);
-            } catch (IllegalStateException e) {
-                return null;
-            }
-            if (!clazz.isInterface() && classModel.getPropertyModels().isEmpty()) {
+                if (!clazz.isInterface() && classModel.getPropertyModels().isEmpty()) {
+                    return null;
+                }
+                discriminatorLookup.addClassModel(classModel);
+                return new AutomaticPojoCodec<T>(new PojoCodecImpl<T>(classModel, registry, propertyCodecProviders, discriminatorLookup));
+            } catch (Exception e) {
+                LOGGER.warn(format("Cannot use '%s' with the PojoCodec.", clazz.getSimpleName()), e);
                 return null;
             }
-            discriminatorLookup.addClassModel(classModel);
-            return new AutomaticPojoCodec<T>(new PojoCodecImpl<T>(classModel, registry, propertyCodecProviders, discriminatorLookup));
         }
         return null;
     }

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

@@ -20,6 +20,7 @@
 import org.bson.codecs.ValueCodecProvider;
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.codecs.pojo.entities.SimpleModel;
+import org.bson.codecs.pojo.entities.conventions.CreatorInvalidMethodModel;
 import org.junit.Test;
 
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
@@ -60,4 +61,12 @@ public void testAutomaticNoProperty() {
         assertNull(codec);
     }
 
+    @Test
+    public void testAutomaticInvalidModel() {
+        PojoCodecProvider provider = PojoCodecProvider.builder().automatic(true).build();
+        CodecRegistry registry = fromProviders(provider, new ValueCodecProvider());
+        Codec<CreatorInvalidMethodModel> codec = provider.get(CreatorInvalidMethodModel.class, registry);
+        assertNull(codec);
+    }
+
 }