Skip to content

Fix Dynamic proxy #5747

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 1 commit into
base: 3.1
Choose a base branch
from
Open

Fix Dynamic proxy #5747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 21 additions & 5 deletions inject/hk2/src/main/java/org/glassfish/jersey/inject/hk2/ContextInjectionResolverImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,14 @@

package org.glassfish.jersey.inject.hk2;

import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.function.Function;

Expand Down Expand Up @@ -194,11 +197,24 @@ public Injectee apply(CacheKey cacheKey) {
final Class<?> clazz = f.getType();
if (serviceLocator.getServiceHandle(clazz).getActiveDescriptor().getScopeAnnotation()
== RequestScoped.class) {
final AbstractActiveDescriptor<Object> descriptor =
BuilderHelper.activeLink(clazz)
.to(clazz)
.in(RequestScoped.class)
.build();
//to fix proxy issue from Singletons was needed to review if the injecteeClass contains
//Singleton annotation to indicate Singleton scope instead of Request
Optional<Annotation> optAnnotation =
Arrays.stream(injectee.getInjecteeClass().getAnnotations())
.filter(p -> p.annotationType().getName().equals("jakarta.ejb.Singleton"))
.findFirst();
AbstractActiveDescriptor<Object> descriptor;
if (optAnnotation.isPresent()) {
descriptor = BuilderHelper.activeLink(clazz)
.to(clazz)
.in(Singleton.class)
.build();
} else {
descriptor = BuilderHelper.activeLink(clazz)
.to(clazz)
.in(RequestScoped.class)
.build();
}
return new DescriptorOverridingInjectee(injectee, descriptor);
}
}
Expand Down