Address #3801#3802
Merged
rbygrave merged 2 commits intoJun 30, 2026
Merged
Conversation
…hierarchies The fix introduced in ebc90e0 resolved TypeVariables only one level at a time: mapGenerics(beanType) read only the direct generic superclass, so for a chain like A extends B<String> / B<T> extends C<T>, processing C's fields produced an empty map, genericTypeMap.get(TypeVariable) returned null, propertyType became null, and AnnotationFields.readField threw an NPE calling prop.getPropertyType().isEnum(). Fix: build the full type-variable map once for the concrete bean type using TypeResolver.getTypeVariableMap, which walks the entire superclass/interface hierarchy and composes TypeVariable bindings transitively. The same map is passed at every level of the recursive createProperties walk, so any TypeVariable at any depth resolves correctly. Type-resolution helpers (resolveType, resolveToClass, resolveCollectionTarget, ResolvedParameterizedType) are consolidated in TypeReflectHelper so they are shared across callers and independently testable. Tests: TypeReflectHelperTest covers single and multi-level TypeVariable resolution and collection-element resolution. QProductWithGenericTest adds an integration regression test using a two-level generic chain (ProductWithGenericMiddle extends GenericMiddleModel<Long> extends GenericBaseModel<Long>).
rbygrave
approved these changes
Jun 30, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Address #3801