Fix PojoCodecProvider handling of registered packages

Ensure registered packages and automatic codecs work in the
same manner.

JAVA-2799

Author: rozza

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

@@ -71,13 +71,9 @@ public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
     @SuppressWarnings("unchecked")
     private <T> PojoCodec<T> getPojoCodec(final Class<T> clazz, final CodecRegistry registry) {
         ClassModel<T> classModel = (ClassModel<T>) classModels.get(clazz);
-        if (classModel != null || (clazz.getPackage() != null && packages.contains(clazz.getPackage().getName()))) {
-            if (classModel == null) {
-                classModel = createClassModel(clazz, conventions);
-                discriminatorLookup.addClassModel(classModel);
-            }
+        if (classModel != null) {
             return new PojoCodecImpl<T>(classModel, registry, propertyCodecProviders, discriminatorLookup);
-        } else if (automatic) {
+        } else if (automatic || (clazz.getPackage() != null && packages.contains(clazz.getPackage().getName()))) {
             try {
                 classModel = createClassModel(clazz, conventions);
             } catch (IllegalStateException e) {

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

@@ -371,11 +371,14 @@ public static Collection<Object[]> data() {
         for (TestData testData : testCases()) {
             data.add(new Object[]{format("%s", testData.getName()), testData.getModel(), testData.getJson(), testData.getBuilder()});
             data.add(new Object[]{format("%s [Auto]", testData.getName()), testData.getModel(), testData.getJson(), AUTOMATIC_BUILDER});
+            data.add(new Object[]{format("%s [Package]", testData.getName()), testData.getModel(), testData.getJson(), PACKAGE_BUILDER});
         }
         return data;
     }
 
     private static final PojoCodecProvider.Builder AUTOMATIC_BUILDER = PojoCodecProvider.builder().automatic(true);
+    private static final PojoCodecProvider.Builder PACKAGE_BUILDER = PojoCodecProvider.builder().register("org.bson.codecs.pojo.entities",
+            "org.bson.codecs.pojo.entities.conventions");
 
     private static class TestData {
         private final String name;