openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1765934 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/container/BeanManagerImpl.java test/java/org/apache/webbeans/test/bean/ThirdPartyBeanLookupTest.java
Date Fri, 21 Oct 2016 07:12:05 GMT
Author: rmannibucau
Date: Fri Oct 21 07:12:05 2016
New Revision: 1765934

URL: http://svn.apache.org/viewvc?rev=1765934&view=rev
Log:
OWB-1157 ensure to use OwbBean instances whenever possible

Added:
    openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/bean/ThirdPartyBeanLookupTest.java
Modified:
    openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java

Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1765934&r1=1765933&r2=1765934&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
(original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
Fri Oct 21 07:12:05 2016
@@ -214,6 +214,10 @@ public class BeanManagerImpl implements
     private static Map<Class<? extends Annotation>, Boolean> isScopeTypeNormalCache
=
             new ConcurrentHashMap<Class<? extends Annotation>, Boolean>();
 
+    /**
+     * Map to be able to lookup always 3rd party beans when user does lookups with custom
beans.
+     */
+    private Map<Bean<?>, Bean<?>> thirdPartyMapping = new HashMap<>();
 
     /**
      * Creates a new {@link BeanManager} instance.
@@ -374,6 +378,7 @@ public class BeanManagerImpl implements
             }
             addPassivationInfo(bean);
             deploymentBeans.add(bean);
+            thirdPartyMapping.put(newBean, bean);
         }
 
         return this;
@@ -703,13 +708,18 @@ public class BeanManagerImpl implements
      * {@inheritDoc}
      */
     @Override
-    public Object getReference(Bean<?> bean, Type beanType, CreationalContext<?>
creationalContext)
+    public Object getReference(Bean<?> providedBean, Type beanType, CreationalContext<?>
creationalContext)
     {
-        Asserts.assertNotNull(bean, "bean parameter");
+        Asserts.assertNotNull(providedBean, "bean parameter");
 
         Context context = null;
         Object instance = null;
 
+        Bean<?> bean =  !OwbBean.class.isInstance(providedBean) ? thirdPartyMapping.get(providedBean)
: providedBean;
+        if (bean == null) // more than unlikely but still possible and not invalid (user
could create new instance of bean each time, not forbidden)
+        {
+            bean = providedBean;
+        }
         if (bean instanceof SerializableBean)
         {
             bean = ((SerializableBean)bean).getBean();

Added: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/bean/ThirdPartyBeanLookupTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/bean/ThirdPartyBeanLookupTest.java?rev=1765934&view=auto
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/bean/ThirdPartyBeanLookupTest.java
(added)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/bean/ThirdPartyBeanLookupTest.java
Fri Oct 21 07:12:05 2016
@@ -0,0 +1,161 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.webbeans.test.bean;
+
+import org.apache.webbeans.annotation.DefaultLiteral;
+import org.apache.webbeans.test.AbstractUnitTest;
+import org.junit.Test;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AfterDeploymentValidation;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.CDI;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.InjectionPoint;
+import javax.inject.Inject;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+
+public class ThirdPartyBeanLookupTest extends AbstractUnitTest
+{
+    @Inject
+    private Ext ext;
+    @Inject
+    private Some some;
+
+    @Test
+    public void areEquals()
+    {
+        addExtension(new Ext());
+        startContainer(Collections.<Class<?>>emptyList(), Collections.<String>emptyList(),
true);
+        assertEquals(ext.getInstance().getVal(), some.getVal());
+
+        final BeanManager bm = CDI.current().getBeanManager();
+        final Bean<?> bean = bm.resolve(bm.getBeans(Some.class));
+        final Some instance = Some.class.cast(bm.getReference(bean, bean.getBeanClass(),
null));
+        assertEquals(instance.getVal(), some.getVal());
+    }
+
+    public static class Ext implements Extension
+    {
+        private SomeBean bean;
+        private Some instance;
+
+        void add(@Observes final AfterBeanDiscovery abf)
+        {
+            bean = new SomeBean();
+            abf.addBean(bean);
+        }
+
+        void lookup(@Observes final AfterDeploymentValidation adv, final BeanManager bm)
+        {
+            instance = Some.class.cast(bm.getReference(bean, bean.getBeanClass(), null));
+        }
+
+        public Some getInstance()
+        {
+            return instance;
+        }
+    }
+
+    private static class SomeBean implements Bean<Some>
+    {
+        @Override
+        public Set<InjectionPoint> getInjectionPoints()
+        {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public Class<?> getBeanClass()
+        {
+            return Some.class;
+        }
+
+        @Override
+        public boolean isNullable()
+        {
+            return false;
+        }
+
+        @Override
+        public Some create(final CreationalContext<Some> context)
+        {
+            return new Some();
+        }
+
+        @Override
+        public void destroy(final Some instance, final CreationalContext<Some> context)
+        {
+            // no-op
+        }
+
+        @Override
+        public Set<Type> getTypes()
+        {
+            return Collections.<Type>singleton(Some.class);
+        }
+
+        @Override
+        public Set<Annotation> getQualifiers()
+        {
+            return Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);
+        }
+
+        @Override
+        public Class<? extends Annotation> getScope()
+        {
+            return ApplicationScoped.class;
+        }
+
+        @Override
+        public String getName()
+        {
+            return null;
+        }
+
+        @Override
+        public Set<Class<? extends Annotation>> getStereotypes()
+        {
+            return Collections.emptySet();
+        }
+
+        @Override
+        public boolean isAlternative()
+        {
+            return false;
+        }
+    }
+
+    public static class Some {
+        private final int val = System.identityHashCode(this);
+
+        public int getVal() {
+            return val;
+        }
+    }
+}



Mime
View raw message