Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -651,13 +651,26 @@ public TypeResolverBuilder<?> findPropertyContentTypeResolver(MapperConfig<?> co
public List<NamedType> findSubtypes(MapperConfig<?> config, Annotated a)
{
JsonSubTypes t = _findAnnotation(a, JsonSubTypes.class);
if (t == null) return null;
if(t != null) {
return findSubtypesByJsonSubTypesAnnotation(config, a, t);
}

if(a.getAnnotated() instanceof Class<?> clazz && clazz.isSealed()
&& clazz.getPermittedSubclasses().length > 0) {
return findSubtypesByPermittedSubclasses(config, a, clazz);
}

return null;
}

private List<NamedType> findSubtypesByJsonSubTypesAnnotation(MapperConfig<?> config, Annotated a, JsonSubTypes t)
{
JsonSubTypes.Type[] types = t.value();

// 02-Aug-2022, tatu: As per [databind#3500], may need to check uniqueness
// of names
if (t.failOnRepeatedNames()) {
return findSubtypesCheckRepeatedNames(a.getName(), types);
return findSubtypesByJsonSubTypesAnnotationCheckRepeatedNames(a.getName(), types);
} else {
ArrayList<NamedType> result = new ArrayList<NamedType>(types.length);
for (JsonSubTypes.Type type : types) {
Expand All @@ -672,7 +685,7 @@ public List<NamedType> findSubtypes(MapperConfig<?> config, Annotated a)
}

// @since 2.14
private List<NamedType> findSubtypesCheckRepeatedNames(String annotatedTypeName, JsonSubTypes.Type[] types)
private List<NamedType> findSubtypesByJsonSubTypesAnnotationCheckRepeatedNames(String annotatedTypeName, JsonSubTypes.Type[] types)
{
ArrayList<NamedType> result = new ArrayList<NamedType>(types.length);
Set<String> seenNames = new HashSet<>();
Expand All @@ -698,6 +711,15 @@ private List<NamedType> findSubtypesCheckRepeatedNames(String annotatedTypeName,

return result;
}

private List<NamedType> findSubtypesByPermittedSubclasses(MapperConfig<?> config, Annotated a, Class<?> clazz)
{
List<NamedType> result = new ArrayList<>(clazz.getPermittedSubclasses().length);
for (Class<?> subtype : clazz.getPermittedSubclasses()) {
result.add(new NamedType(subtype));
}
return result;
}

@Override
public String findTypeName(MapperConfig<?> config, AnnotatedClass ac)
Expand Down
Loading