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.

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

Jump to bottom

WELD-2659 BeanAttributesConfiguratorImpl now correctly determines qua… #2268

Merged
merged 1 commit into from Feb 23, 2021
Merged

WELD-2659 BeanAttributesConfiguratorImpl now correctly determines qua… #2268

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ain/java/org/jboss/weld/bootstrap/events/configurator/BeanAttributesConfiguratorImpl.java
View file
Open in desktop
Expand Up @@ -269,7 +269,7 @@ private Set<Annotation> initQualifiers(Set<Annotation> qualifiers) {
} else {
ImmutableSet.Builder<Annotation> builder = ImmutableSet.builder();
if (normalized.size() == 1) {
if (qualifiers.iterator().next().annotationType().equals(Named.class)) {
if (normalized.iterator().next().annotationType().equals(Named.class)) {
builder.add(Default.Literal.INSTANCE);
}
}
Expand Down
5 changes: 5 additions & 0 deletions ...llian/src/test/java/org/jboss/weld/tests/extensions/custombeans/BeanConfiguratorTest.java
View file
Open in desktop
Expand Up @@ -133,6 +133,11 @@ public void testConfigurator(BeanManager beanManager) throws Exception {
assertEquals(1, beans.size());
blaBean = (Bean<Configuration>) beans.iterator().next();
assertEquals(RequestScoped.class, blaBean.getScope());

beans = beanManager.getBeans(String.class);
assertEquals(1, beans.size());
Bean<String> stringBean = (Bean<String>) beans.iterator().next();
assertEquals(3, stringBean.getQualifiers().size());
}

}
11 changes: 11 additions & 0 deletions ...rquillian/src/test/java/org/jboss/weld/tests/extensions/custombeans/BuilderExtension.java
View file
Open in desktop
Expand Up @@ -21,9 +21,12 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.context.Dependent;
import jakarta.enterprise.event.Observes;
import jakarta.enterprise.inject.Any;
import jakarta.enterprise.inject.Model;
import jakarta.enterprise.inject.literal.NamedLiteral;
import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
import jakarta.enterprise.inject.spi.AnnotatedType;
import jakarta.enterprise.inject.spi.BeanManager;
Expand Down Expand Up @@ -88,5 +91,13 @@ public void afterBeanDiscovery(@Observes AfterBeanDiscovery event, BeanManager b
event.addBean().addQualifier(Bla.Literal.of("dependent")).addType(Integer.class).createWith((ctx) -> 1);
event.addBean().addQualifier(Bla.Literal.of("model")).addStereotype(Model.class).addType(Integer.class).createWith((ctx) -> 2);
event.addBean().addQualifier(Bla.Literal.of("more")).addStereotype(Model.class).addStereotype(SuperCoolStereotype.class).addType(Integer.class).createWith((ctx) -> 3);

// add a bean testing that when a bean has @Named and @Any, @Default will be added automatically
event.addBean()
.beanClass(String.class)
.addType(String.class)
.addQualifiers(NamedLiteral.of("string"), Any.Literal.INSTANCE)
.createWith(a -> "foo")
.scope(ApplicationScoped.class);
}
}