Code review updates

Author: rozza

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

@@ -28,12 +28,15 @@ final class ConventionSetPrivateFieldImpl implements Convention {
     @Override
     public void apply(final ClassModelBuilder<?> classModelBuilder) {
         for (PropertyModelBuilder<?> propertyModelBuilder : classModelBuilder.getPropertyModelBuilders()) {
-            if (propertyModelBuilder.getPropertyAccessor() instanceof PropertyAccessorImpl) {
-                PropertyAccessorImpl<?> defaultAccessor = (PropertyAccessorImpl<?>) propertyModelBuilder.getPropertyAccessor();
-                PropertyMetadata<?> propertyMetaData = defaultAccessor.getPropertyMetadata();
-                if (!propertyMetaData.isDeserializable() && isPrivate(propertyMetaData.getField().getModifiers())) {
-                    setPropertyAccessor(propertyModelBuilder);
-                }
+            if (!(propertyModelBuilder.getPropertyAccessor() instanceof PropertyAccessorImpl)) {
+                throw new CodecConfigurationException(format("The SET_PRIVATE_FIELDS_CONVENTION is not compatible with "
+                        + "propertyModelBuilder instance that have custom implementations of org.bson.codecs.pojo.PropertyAccessor: %s",
+                        propertyModelBuilder.getPropertyAccessor().getClass().getName()));
+            }
+            PropertyAccessorImpl<?> defaultAccessor = (PropertyAccessorImpl<?>) propertyModelBuilder.getPropertyAccessor();
+            PropertyMetadata<?> propertyMetaData = defaultAccessor.getPropertyMetadata();
+            if (!propertyMetaData.isDeserializable() && isPrivate(propertyMetaData.getField().getModifiers())) {
+                setPropertyAccessor(propertyModelBuilder);
             }
         }
     }
@@ -49,6 +52,12 @@ private static final class PrivateProperyAccessor<T> implements PropertyAccessor
 
         private PrivateProperyAccessor(final PropertyAccessorImpl<T> wrapped) {
             this.wrapped = wrapped;
+            try {
+                wrapped.getPropertyMetadata().getField().setAccessible(true);
+             } catch (Exception e) {
+                throw new CodecConfigurationException(format("Unable to make private field accessible '%s' in %s",
+                        wrapped.getPropertyMetadata().getName(), wrapped.getPropertyMetadata().getDeclaringClassName()), e);
+            }
         }
 
         @Override
@@ -64,8 +73,7 @@ public <S> void set(final S instance, final T value) {
                 field.set(instance, value);
             } catch (Exception e) {
                 throw new CodecConfigurationException(format("Unable to set value for property '%s' in %s",
-                        wrapped.getPropertyMetadata().getName(),
-                        wrapped.getPropertyMetadata().getDeclaringClassName()), e);
+                        wrapped.getPropertyMetadata().getName(), wrapped.getPropertyMetadata().getDeclaringClassName()), e);
             }
         }
     }

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

@@ -52,7 +52,7 @@ public final class Conventions {
     /**
      * A convention that enables private fields to be set using reflection.
      *
-     * <p>This convention, mimics how some other JSON libraries directly set a private field when there is no setter.</p>
+     * <p>This convention mimics how some other JSON libraries directly set a private field when there is no setter.</p>
      * <p>Note: This convention is not part of the {@code DEFAULT_CONVENTIONS} list and must explicitly be set.</p>
      *
      * @since 3.6