Skip to content

Commit 89cbb64

Browse files
committed
Fix ChangeStreamDocumentCodec registry order
Previously, prevented the use of automatic codecs. JAVA-2800
1 parent 692cf58 commit 89cbb64

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

driver-core/src/main/com/mongodb/client/model/changestream/ChangeStreamDocumentCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ final class ChangeStreamDocumentCodec<TResult> implements Codec<ChangeStreamDocu
5656
.register(changeStreamDocumentClassModel)
5757
.build();
5858

59-
CodecRegistry registry = fromRegistries(codecRegistry, fromProviders(provider));
59+
CodecRegistry registry = fromRegistries(fromProviders(provider), codecRegistry);
6060
this.codec = (Codec<ChangeStreamDocument<TResult>>) (Codec<? extends ChangeStreamDocument>)
6161
registry.get(ChangeStreamDocument.class);
6262
}

driver-core/src/test/unit/com/mongodb/client/model/changestream/ChangeStreamDocumentCodecSpecification.groovy

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import org.bson.codecs.DecoderContext
2828
import org.bson.codecs.DocumentCodecProvider
2929
import org.bson.codecs.EncoderContext
3030
import org.bson.codecs.ValueCodecProvider
31+
import org.bson.codecs.pojo.PojoCodecProvider
3132
import spock.lang.Specification
3233

3334
import static org.bson.codecs.configuration.CodecRegistries.fromProviders
@@ -37,7 +38,8 @@ class ChangeStreamDocumentCodecSpecification extends Specification {
3738
def 'should round trip ChangeStreamDocument successfully'() {
3839

3940
given:
40-
def codecRegistry = fromProviders([new DocumentCodecProvider(), new BsonValueCodecProvider(), new ValueCodecProvider()])
41+
def codecRegistry = fromProviders([new DocumentCodecProvider(), new BsonValueCodecProvider(), new ValueCodecProvider(),
42+
PojoCodecProvider.builder().automatic(true).build()])
4143
def codec = new ChangeStreamDocumentCodec(clazz, codecRegistry)
4244

4345
when:

0 commit comments

Comments
 (0)