fix JAVA-5764

mongodb · Jan 16, 2025 · cc9996c · cc9996c
1 parent e022dbd
commit cc9996c
Showing 1 changed file with 19 additions and 5 deletions.
diff --git a/bson/src/main/org/bson/codecs/pojo/PojoCodecImpl.java b/bson/src/main/org/bson/codecs/pojo/PojoCodecImpl.java
@@ -76,13 +76,10 @@ public void encode(final BsonWriter writer, final T value, final EncoderContext
             writer.writeStartDocument();
 
             encodeIdProperty(writer, value, encoderContext, classModel.getIdPropertyModelHolder());
-
-            if (classModel.useDiscriminator()) {
-                writer.writeString(classModel.getDiscriminatorKey(), classModel.getDiscriminator());
-            }
+            encodeDiscriminatorProperty(writer);
 
             for (PropertyModel<?> propertyModel : classModel.getPropertyModels()) {
-                if (propertyModel.equals(classModel.getIdPropertyModel())) {
+                if (idProperty(propertyModel) || discriminatorProperty(propertyModel)) {
                     continue;
                 }
                 encodeProperty(writer, value, encoderContext, propertyModel);
@@ -140,6 +137,23 @@ private <S> void encodeIdProperty(final BsonWriter writer, final T instance, fin
         }
     }
 
+    private boolean idProperty(final PropertyModel<?> propertyModel) {
+        return propertyModel.equals(classModel.getIdPropertyModel());
+    }
+
+    private void encodeDiscriminatorProperty(final BsonWriter writer) {
+        if (classModel.useDiscriminator()) {
+            writer.writeString(classModel.getDiscriminatorKey(), classModel.getDiscriminator());
+        }
+    }
+
+    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()) {