Skip to content

Fix type parameters not being passed to fallback property codec #1765

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix type parameters not being passed to fallback property codec #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e60e49e
Fix type parameters not being passed to fallback property codec
GliczDev Jul 11, 2025
dd532f2
Resolve some of requested changes
GliczDev Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions bson/src/main/org/bson/codecs/pojo/FallbackPropertyCodecProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
import org.bson.codecs.Codec;
import org.bson.codecs.configuration.CodecRegistry;

import java.lang.reflect.Type;
import java.util.List;
import java.util.stream.Collectors;

final class FallbackPropertyCodecProvider implements PropertyCodecProvider {
private final CodecRegistry codecRegistry;
private final PojoCodec<?> pojoCodec;
Expand All @@ -35,6 +39,10 @@ public <S> Codec<S> get(final TypeWithTypeParameters<S> type, final PropertyCode
if (clazz == pojoCodec.getEncoderClass()) {
return (Codec<S>) pojoCodec;
}
List<Type> types = type.getTypeParameters().stream().<Type>map(TypeWithTypeParameters::getType).collect(Collectors.toList());
if (!types.isEmpty()) {
return codecRegistry.get(type.getType(), types);
}
return codecRegistry.get(type.getType());
}
}
18 changes: 15 additions & 3 deletions bson/src/test/unit/org/bson/codecs/pojo/PojoCodecCyclicalLookupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.bson.codecs.pojo.entities.SimpleModel;
import org.junit.jupiter.api.Test;

import java.lang.reflect.Type;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
Expand Down Expand Up @@ -136,20 +137,31 @@ static class LookupCountingCodecRegistry implements CodecRegistry {

@Override
public <T> Codec<T> get(final Class<T> clazz) {
return get(clazz, this);
}

@Override
public <T> Codec<T> get(final Class<T> clazz, final List<Type> typeArguments) {
return get(clazz, typeArguments, this);
}

@Override
public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
incrementCount(clazz);
for (CodecProvider provider : codecProviders) {
Codec<T> codec = provider.get(clazz, this);
Codec<T> codec = provider.get(clazz, registry);
if (codec != null) {
return codec;
}
}
return null;
}

public <T> Codec<T> get(final Class<T> clazz, final CodecRegistry registry) {
@Override
public <T> Codec<T> get(final Class<T> clazz, final List<Type> typeArguments, final CodecRegistry registry) {
incrementCount(clazz);
for (CodecProvider provider : codecProviders) {
Codec<T> codec = provider.get(clazz, registry);
Codec<T> codec = provider.get(clazz, typeArguments, registry);
if (codec != null) {
return codec;
}
Expand Down