Synthetic CDI beans should have a beanClass attribute of the CDI exte…

…nsion
eclipse-ee4j · Oct 24, 2022 · 4537b9c · 4537b9c
1 parent aa5933f
commit 4537b9c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 14 deletions.
diff --git a/impl/src/main/java/org/glassfish/soteria/cdi/CdiExtension.java b/impl/src/main/java/org/glassfish/soteria/cdi/CdiExtension.java
@@ -126,7 +126,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(Object.class, IdentityStore.class, EmbeddedIdentityStore.class)
                     .addToId(EmbeddedIdentityStoreDefinition.class)
                     .create(e -> new EmbeddedIdentityStore(embeddedIdentityStoreDefinition))
@@ -139,7 +138,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(Object.class, IdentityStore.class, DatabaseIdentityStore.class)
                     .addToId(DatabaseIdentityStoreDefinition.class)
                     .create(e -> new DatabaseIdentityStore(
@@ -154,7 +152,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(Object.class, IdentityStore.class, LdapIdentityStore.class)
                     .addToId(LdapIdentityStoreDefinition.class)
                     .create(e -> new LdapIdentityStore(
@@ -169,7 +166,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(BasicAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class, BasicAuthenticationMechanism.class)
                     .addToId(BasicAuthenticationMechanismDefinition.class)
                     .create(e -> new BasicAuthenticationMechanism(
@@ -183,7 +179,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(HttpAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class)
                     .addToId(FormAuthenticationMechanismDefinition.class)
                     .create(e -> {
@@ -202,7 +197,6 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(HttpAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class)
                     .addToId(CustomFormAuthenticationMechanismDefinition.class)
                     .create(e -> {
@@ -223,22 +217,19 @@ public <T> void processBean(@Observes ProcessBean<T> eventIn, BeanManager beanMa
 
             authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(HttpAuthenticationMechanism.class)
                     .types(HttpAuthenticationMechanism.class)
                     .addToId(OpenIdAuthenticationMechanism.class)
                     .create(e -> getBeanReference(OpenIdAuthenticationMechanism.class));
 
             identityStoreBeans.add(new CdiProducer<IdentityStore>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStore.class)
                     .types(IdentityStore.class)
                     .addToId(OpenIdIdentityStore.class)
                     .create(e -> getBeanReference(OpenIdIdentityStore.class))
             );
 
             extraBeans.add(new CdiProducer<OpenIdAuthenticationMechanismDefinition>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(OpenIdAuthenticationMechanismDefinition.class)
                     .types(OpenIdAuthenticationMechanismDefinition.class)
                     .addToId("OpenId Definition")
                     .create(e -> definition)
@@ -272,7 +263,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             if ("basic".equalsIgnoreCase(loginConfig.getAuthMethod())) {
                 authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(BasicAuthenticationMechanism.class)
                     .types(Object.class, HttpAuthenticationMechanism.class, BasicAuthenticationMechanism.class)
                     .addToId(BasicAuthenticationMechanismDefinition.class)
                     .create(e ->
@@ -283,7 +273,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             } else if ("form".equalsIgnoreCase(loginConfig.getAuthMethod())) {
                 authenticationMechanismBean = new CdiProducer<HttpAuthenticationMechanism>()
                         .scope(ApplicationScoped.class)
-                        .beanClass(HttpAuthenticationMechanism.class)
                         .types(Object.class, HttpAuthenticationMechanism.class)
                         .addToId(FormAuthenticationMechanismDefinition.class)
                         .create(e -> {
@@ -319,7 +308,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             // Probably can circumvent this using programmatic lookup or Instance injection
             afterBeanDiscovery.addBean()
                 .scope(Dependent.class)
-                .beanClass(OpenIdAuthenticationMechanismDefinition.class)
                 .types(OpenIdAuthenticationMechanismDefinition.class)
                 .id("Null OpenId Definition")
                 .createWith(cc -> null);
@@ -329,7 +317,6 @@ public void afterBean(final @Observes AfterBeanDiscovery afterBeanDiscovery, Bea
             decorator.decorateBean(
                 new CdiProducer<IdentityStoreHandler>()
                     .scope(ApplicationScoped.class)
-                    .beanClass(IdentityStoreHandler.class)
                     .types(Object.class, IdentityStoreHandler.class)
                     .addToId(IdentityStoreHandler.class)
                     .create(e -> {

diff --git a/impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java b/impl/src/main/java/org/glassfish/soteria/cdi/CdiProducer.java
@@ -40,7 +40,7 @@ public class CdiProducer<T> implements Bean<T>, PassivationCapable {
 
     private String id = this.getClass().getName();
     private String name;
-    private Class<?> beanClass = Object.class;
+    private Class<?> beanClass = CdiExtension.class;
     private Set<Type> types = singleton(Object.class);
     private Set<Annotation> qualifiers = unmodifiableSet(asSet(new DefaultAnnotationLiteral(), new AnyAnnotationLiteral()));
     private Class<? extends Annotation> scope = Dependent.class;