details: https://code.openbravo.com/erp/devel/pi/rev/e7f7f338f322
changeset: 36015:e7f7f338f322
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Thu Jun 06 11:24:08 2019 +0200
summary: related to issue 41033: avoid API change
diffstat:
modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java |
9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diffs (47 lines):
diff -r 2db86bead3d4 -r e7f7f338f322
modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
---
a/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
Thu Jun 06 11:03:21 2019 +0200
+++
b/modules/org.openbravo.base.weld/src/org/openbravo/base/weld/WeldUtils.java
Thu Jun 06 11:24:08 2019 +0200
@@ -26,6 +26,7 @@
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -74,6 +75,8 @@
staticBeanManager = theBeanManager;
}
+ public static final AnnotationLiteral<Any> ANY_LITERAL =
Any.Literal.INSTANCE;
+
/**
* Method which uses the static instance of the bean manager cached in this
class. This method
* should only be used by objects which are not created by Weld. Objects
created by Weld should
@@ -84,7 +87,7 @@
@SuppressWarnings("unchecked")
public static <T> T getInstanceFromStaticBeanManager(Class<T> type) {
final BeanManager theBeanManager = getStaticInstanceBeanManager();
- final Set<Bean<?>> beans = theBeanManager.getBeans(type,
Any.Literal.INSTANCE);
+ final Set<Bean<?>> beans = theBeanManager.getBeans(type, ANY_LITERAL);
for (Bean<?> bean : beans) {
if (bean.getBeanClass() == type) {
return (T) theBeanManager.getReference(bean, type,
@@ -109,7 +112,7 @@
*/
@SuppressWarnings("unchecked")
public <T> T getInstance(Class<T> type) {
- final Set<Bean<?>> beans = beanManager.getBeans(type,
Any.Literal.INSTANCE);
+ final Set<Bean<?>> beans = beanManager.getBeans(type, ANY_LITERAL);
for (Bean<?> bean : beans) {
if (bean.getBeanClass() == type) {
return (T) beanManager.getReference(bean, type,
beanManager.createCreationalContext(bean));
@@ -124,7 +127,7 @@
@SuppressWarnings("unchecked")
public static <T> List<T> getInstances(Class<T> type) {
final BeanManager beanManager = WeldUtils.getStaticInstanceBeanManager();
- final Set<Bean<?>> beans = beanManager.getBeans(type,
Any.Literal.INSTANCE);
+ final Set<Bean<?>> beans = beanManager.getBeans(type, ANY_LITERAL);
final List<T> instances = new ArrayList<>();
for (Bean<?> bean : beans) {
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
