Skip to content

Commit 8aee72c

Browse files
committed
Minor clean up
1 parent 07af004 commit 8aee72c

File tree

1 file changed

+13
-12
lines changed

1 file changed

+13
-12
lines changed

src/main/java/tools/jackson/databind/introspect/JacksonAnnotationIntrospector.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -678,17 +678,16 @@ private List<NamedType> findSubtypesByJsonSubTypesAnnotation(MapperConfig<?> con
678678
// of names
679679
if (t.failOnRepeatedNames()) {
680680
return findSubtypesByJsonSubTypesAnnotationCheckRepeatedNames(a.getName(), types);
681-
} else {
682-
ArrayList<NamedType> result = new ArrayList<>(types.length);
683-
for (JsonSubTypes.Type type : types) {
684-
result.add(new NamedType(type.value(), type.name()));
685-
// [databind#2761]: alternative set of names to use
686-
for (String name : type.names()) {
687-
result.add(new NamedType(type.value(), name));
688-
}
681+
}
682+
ArrayList<NamedType> result = new ArrayList<>(types.length);
683+
for (JsonSubTypes.Type type : types) {
684+
result.add(new NamedType(type.value(), type.name()));
685+
// [databind#2761]: alternative set of names to use
686+
for (String name : type.names()) {
687+
result.add(new NamedType(type.value(), name));
689688
}
690-
return result;
691689
}
690+
return result;
692691
}
693692

694693
// @since 3.0
@@ -721,10 +720,12 @@ private List<NamedType> findSubtypesByJsonSubTypesAnnotationCheckRepeatedNames(S
721720
}
722721

723722
// @since 3.0
724-
private List<NamedType> findSubtypesByPermittedSubclasses(MapperConfig<?> config, Annotated a, Class<?> clazz)
723+
private List<NamedType> findSubtypesByPermittedSubclasses(MapperConfig<?> config,
724+
Annotated a, Class<?> clazz)
725725
{
726-
List<NamedType> result = new ArrayList<>(clazz.getPermittedSubclasses().length);
727-
for (Class<?> subtype : clazz.getPermittedSubclasses()) {
726+
Class<?>[] subtypes = clazz.getPermittedSubclasses();
727+
List<NamedType> result = new ArrayList<>(subtypes.length);
728+
for (Class<?> subtype : subtypes) {
728729
result.add(new NamedType(subtype));
729730
}
730731
return result;

0 commit comments

Comments
 (0)