Skip to content
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.

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

Use empty Set when no annotation present in injection point #45356

Merged
merged 1 commit into from
Jan 4, 2025
Merged
Changes from all 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 @@ -2386,7 +2386,6 @@ public static ResultHandle collectInjectionPointAnnotations(BeanDeployment beanD
if (injectionPoint.isSynthetic()) {
return bytecode.invokeStaticMethod(MethodDescriptors.COLLECTIONS_EMPTY_SET);
}
ResultHandle annotationsHandle = bytecode.newInstance(MethodDescriptor.ofConstructor(HashSet.class));
Collection<AnnotationInstance> annotations;
if (Kind.FIELD.equals(injectionPoint.getAnnotationTarget().kind())) {
FieldInfo field = injectionPoint.getAnnotationTarget().asField();
Expand All @@ -2396,6 +2395,10 @@ public static ResultHandle collectInjectionPointAnnotations(BeanDeployment beanD
annotations = Annotations.getParameterAnnotations(beanDeployment,
method, injectionPoint.getPosition());
}
if (annotations.isEmpty()) {
return bytecode.invokeStaticMethod(MethodDescriptors.COLLECTIONS_EMPTY_SET);
}
ResultHandle annotationsHandle = bytecode.newInstance(MethodDescriptor.ofConstructor(HashSet.class));
for (AnnotationInstance annotation : annotations) {
if (!injectionPointAnnotationsPredicate.test(annotation.name())) {
continue;
Expand Down
Loading