You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by ro...@apache.org on 2019/12/05 22:17:49 UTC
[aries-cdi] branch master updated: use simpler bean registration
pattern for extensions
This is an automated email from the ASF dual-hosted git repository.
rotty3000 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/aries-cdi.git
The following commit(s) were added to refs/heads/master by this push:
new 77707d2 use simpler bean registration pattern for extensions
new 5695480 Merge pull request #23 from rotty3000/master
77707d2 is described below
commit 77707d2ea6bb7eb54dcd0ddabb42bcd2f1dc9752
Author: Raymond Augé <ro...@apache.org>
AuthorDate: Thu Dec 5 16:34:06 2019 -0500
use simpler bean registration pattern for extensions
Signed-off-by: Raymond Augé <ro...@apache.org>
---
.../aries/cdi/extension/mp/config/StubExtension.java | 9 +++------
.../aries/cdi/extension/mp/metrics/StubExtension.java | 16 ++++++----------
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/StubExtension.java b/cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/StubExtension.java
index 84040cd..7c0cf3b 100644
--- a/cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/StubExtension.java
+++ b/cdi-extension-mp-config/src/main/java/org/apache/aries/cdi/extension/mp/config/StubExtension.java
@@ -18,8 +18,8 @@ import static org.apache.aries.cdi.extension.mp.config.StubExtension.EXTENSION_N
import static org.osgi.service.cdi.CDIConstants.CDI_EXTENSION_PROPERTY;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.Extension;
import org.apache.geronimo.config.cdi.ConfigExtension;
@@ -42,11 +42,8 @@ public class StubExtension extends ConfigExtension {
public final static String EXTENSION_NAME = "eclipse.microprofile.config";
- @Override
- public void registerConfigProducer(@Observes AfterBeanDiscovery abd, BeanManager bm) {
- abd.addBean().beanClass(ConfigInjectionProducer.class).createWith(c -> new ConfigInjectionProducer());
-
- super.registerConfigProducer(abd, bm);
+ public void addBeans(@Observes BeforeBeanDiscovery bbd, BeanManager bm) {
+ bbd.addAnnotatedType(bm.createAnnotatedType(ConfigInjectionProducer.class));
}
}
diff --git a/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubExtension.java b/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubExtension.java
index 4604d99..f6eda9f 100644
--- a/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubExtension.java
+++ b/cdi-extension-mp-metrics/src/main/java/org/apache/aries/cdi/extension/mp/metrics/StubExtension.java
@@ -15,7 +15,6 @@
package org.apache.aries.cdi.extension.mp.metrics;
import static javax.interceptor.Interceptor.Priority.LIBRARY_AFTER;
-import static javax.interceptor.Interceptor.Priority.LIBRARY_BEFORE;
import static org.apache.aries.cdi.extension.mp.metrics.StubExtension.EXTENSION_NAME;
import static org.osgi.framework.Constants.SERVICE_DESCRIPTION;
import static org.osgi.framework.Constants.SERVICE_RANKING;
@@ -34,11 +33,11 @@ import java.util.Hashtable;
import javax.annotation.Priority;
import javax.enterprise.event.Observes;
import javax.enterprise.event.ObservesAsync;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
import javax.enterprise.inject.spi.AfterDeploymentValidation;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
import javax.enterprise.inject.spi.BeforeShutdown;
import javax.enterprise.inject.spi.Extension;
import javax.enterprise.inject.spi.InjectionTargetFactory;
@@ -79,14 +78,11 @@ public class StubExtension extends MetricsExtension {
this.configuration = configuration;
}
- void addExtensionBeans(
- @Priority(LIBRARY_BEFORE + 800)
- @Observes final AfterBeanDiscovery abd, final BeanManager bm) {
-
- abd.addBean().beanClass(CountedInterceptor.class).createWith(c -> new CountedInterceptor());
- abd.addBean().beanClass(MeteredInterceptor.class).createWith(c -> new MeteredInterceptor());
- abd.addBean().beanClass(TimedInterceptor.class).createWith(c -> new TimedInterceptor());
- abd.addBean().beanClass(CdiMetricsEndpoints.class).createWith(c -> new CdiMetricsEndpoints());
+ public void addBeans(@Observes BeforeBeanDiscovery bbd, BeanManager bm) {
+ bbd.addAnnotatedType(bm.createAnnotatedType(CountedInterceptor.class));
+ bbd.addAnnotatedType(bm.createAnnotatedType(MeteredInterceptor.class));
+ bbd.addAnnotatedType(bm.createAnnotatedType(TimedInterceptor.class));
+ bbd.addAnnotatedType(bm.createAnnotatedType(CdiMetricsEndpoints.class));
}
void registerMetricsEndpoint(