moves the duplicate discriminator keys check in ConventionAnnotationImpl

Author: raffaeleflorio

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

@@ -25,6 +25,8 @@
 import org.bson.codecs.pojo.annotations.BsonIgnore;
 import org.bson.codecs.pojo.annotations.BsonProperty;
 import org.bson.codecs.pojo.annotations.BsonRepresentation;
+import org.bson.diagnostics.Logger;
+import org.bson.diagnostics.Loggers;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Constructor;
@@ -41,6 +43,8 @@
 
 final class ConventionAnnotationImpl implements Convention {
 
+    private static final Logger LOGGER = Loggers.getLogger("ConventionAnnotation");
+
     @Override
     public void apply(final ClassModelBuilder<?> classModelBuilder) {
         for (final Annotation annotation : classModelBuilder.getAnnotations()) {
@@ -240,6 +244,15 @@ private void cleanPropertyBuilders(final ClassModelBuilder<?> classModelBuilder)
             if (!propertyModelBuilder.isReadable() && !propertyModelBuilder.isWritable()) {
                 propertiesToRemove.add(propertyModelBuilder.getName());
             }
+            if (classModelBuilder.useDiscriminator() && propertyModelBuilder.getReadName().equals(classModelBuilder.getDiscriminatorKey())) {
+                propertiesToRemove.add(propertyModelBuilder.getName());
+                LOGGER.warn(
+                        format(
+                                "Removed the property '%s' from the model because the discriminator has the same key",
+                                classModelBuilder.getDiscriminatorKey()
+                        )
+                );
+            }
         }
         for (String propertyName : propertiesToRemove) {
             classModelBuilder.removeProperty(propertyName);

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

@@ -79,7 +79,7 @@ public void encode(final BsonWriter writer, final T value, final EncoderContext
             encodeDiscriminatorProperty(writer);
 
             for (PropertyModel<?> propertyModel : classModel.getPropertyModels()) {
-                if (idProperty(propertyModel) || discriminatorProperty(propertyModel)) {
+                if (idProperty(propertyModel)) {
                     continue;
                 }
                 encodeProperty(writer, value, encoderContext, propertyModel);
@@ -147,13 +147,6 @@ private void encodeDiscriminatorProperty(final BsonWriter writer) {
         }
     }
 
-    private boolean discriminatorProperty(final PropertyModel<?> propertyModel) {
-        if (classModel.useDiscriminator()) {
-            return propertyModel.getReadName().equals(classModel.getDiscriminatorKey());
-        }
-        return false;
-    }
-
     private <S> void encodeProperty(final BsonWriter writer, final T instance, final EncoderContext encoderContext,
                                     final PropertyModel<S> propertyModel) {
         if (propertyModel != null && propertyModel.isReadable()) {

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

@@ -80,7 +80,7 @@ private <T> PojoCodec<T> createCodec(final Class<T> clazz, final CodecRegistry r
         } else if (automatic || (clazz.getPackage() != null && packages.contains(clazz.getPackage().getName()))) {
             try {
                 classModel = createClassModel(clazz, conventions);
-                if (clazz.isInterface() || !classModel.getPropertyModels().isEmpty()) {
+                if (clazz.isInterface() || !classModel.getPropertyModels().isEmpty() || classModel.useDiscriminator()) {
                     discriminatorLookup.addClassModel(classModel);
                     return new AutomaticPojoCodec<>(createCodec(classModel, registry, propertyCodecProviders,
                             discriminatorLookup));