Return-Path: X-Original-To: apmail-openwebbeans-commits-archive@www.apache.org Delivered-To: apmail-openwebbeans-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E6BB611589 for ; Thu, 4 Sep 2014 05:20:00 +0000 (UTC) Received: (qmail 7372 invoked by uid 500); 4 Sep 2014 05:20:00 -0000 Delivered-To: apmail-openwebbeans-commits-archive@openwebbeans.apache.org Received: (qmail 7354 invoked by uid 500); 4 Sep 2014 05:20:00 -0000 Mailing-List: contact commits-help@openwebbeans.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwebbeans.apache.org Delivered-To: mailing list commits@openwebbeans.apache.org Received: (qmail 7341 invoked by uid 99); 4 Sep 2014 05:20:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 05:20:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Sep 2014 05:19:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1C34F23889BB; Thu, 4 Sep 2014 05:19:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1622401 - in /openwebbeans/trunk/webbeans-impl/src: main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java test/java/org/apache/webbeans/test/portable/CustomBeanDestroyCalledTest.java Date: Thu, 04 Sep 2014 05:19:36 -0000 To: commits@openwebbeans.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140904051936.1C34F23889BB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Thu Sep 4 05:19:35 2014 New Revision: 1622401 URL: http://svn.apache.org/r1622401 Log: OWB-934 calling destroy for dependent custom beans - port on trunk Added: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/CustomBeanDestroyCalledTest.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java?rev=1622401&r1=1622400&r2=1622401&view=diff ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java (original) +++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/component/third/ThirdpartyBeanImpl.java Thu Sep 4 05:19:35 2014 @@ -20,6 +20,7 @@ package org.apache.webbeans.component.th import java.util.Set; +import javax.enterprise.context.Dependent; import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; import javax.enterprise.inject.spi.InjectionPoint; @@ -29,12 +30,13 @@ import org.apache.webbeans.component.Abs import org.apache.webbeans.component.BeanAttributesImpl; import org.apache.webbeans.component.WebBeansType; import org.apache.webbeans.config.WebBeansContext; +import org.apache.webbeans.context.creational.CreationalContextImpl; import org.apache.webbeans.inject.AlternativesManager; public class ThirdpartyBeanImpl extends AbstractOwbBean implements Bean { private Bean bean = null; - + public ThirdpartyBeanImpl(WebBeansContext webBeansContext, Bean bean) { super(webBeansContext, @@ -81,8 +83,21 @@ public class ThirdpartyBeanImpl exten @Override public T create(CreationalContext context) { - - return bean.create(context); + final CreationalContextImpl contextImpl; + if(!CreationalContextImpl.class.isInstance(context)) + { + contextImpl = webBeansContext.getCreationalContextFactory().wrappedCreationalContext(context, this); + } + else + { + contextImpl = CreationalContextImpl.class.cast(context); + } + final T t = bean.create(context); + if (getScope().equals(Dependent.class)) + { + contextImpl.addDependent(this, t); + } + return t; } @Override Added: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/CustomBeanDestroyCalledTest.java URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/CustomBeanDestroyCalledTest.java?rev=1622401&view=auto ============================================================================== --- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/CustomBeanDestroyCalledTest.java (added) +++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/CustomBeanDestroyCalledTest.java Thu Sep 4 05:19:35 2014 @@ -0,0 +1,204 @@ +/* + * 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.portable; + +import org.apache.webbeans.annotation.DefaultLiteral; +import org.apache.webbeans.spi.ContextsService; +import org.apache.webbeans.test.AbstractUnitTest; +import org.junit.Assert; +import org.junit.Test; + +import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; +import javax.enterprise.context.Dependent; +import javax.enterprise.context.RequestScoped; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.AnnotatedType; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.InjectionTarget; +import javax.inject.Inject; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.Set; + +public class CustomBeanDestroyCalledTest extends AbstractUnitTest +{ + + @Test + public void dependentScopedBeanTest() + { + addExtension(new ExternalBeanExtension()); + startContainer(BeanHolder.class); + + final ContextsService contextsService = getWebBeansContext().getContextsService(); + + contextsService.startContext(RequestScoped.class, null); + + final BeanHolder beanHolder = getInstance(BeanHolder.class); + Assert.assertNotNull(beanHolder.getManuelBean()); + Assert.assertTrue(beanHolder.getManuelBean().isConstructCalled()); + + ManuelBean refToPreviousManuelBean = beanHolder.getManuelBean(); + + contextsService.endContext(RequestScoped.class, null); + + Assert.assertTrue(refToPreviousManuelBean.isLifecycleDestroyCalled()); + Assert.assertTrue(refToPreviousManuelBean.isDestroyCalled()); + } + + public static class ExternalBeanExtension implements Extension + { + protected void addBeans(@Observes AfterBeanDiscovery abd, BeanManager beanManager) + { + final AnnotatedType annotatedType = beanManager.createAnnotatedType(ManuelBean.class); + + final InjectionTarget injectionTarget = beanManager.createInjectionTarget(annotatedType); + final Bean newBean = new Bean() + { + @Override + public Set getTypes() + { + return Collections.singleton(ManuelBean.class); + } + + @Override + public Set getQualifiers() + { + return Collections.singleton(DefaultLiteral.INSTANCE); + } + + @Override + public Class getScope() + { + return Dependent.class; + } + + @Override + public String getName() + { + return null; + } + + @Override + public boolean isNullable() + { + return false; + } + + @Override + public Set getInjectionPoints() + { + return Collections.emptySet(); + } + + @Override + public Class getBeanClass() + { + return ManuelBean.class; + } + + @Override + public Set> getStereotypes() + { + return Collections.emptySet(); + } + + @Override + public boolean isAlternative() + { + return false; + } + + @Override + public ManuelBean create(CreationalContext manuelBeanCreationalContext) + { + final ManuelBean result = new ManuelBean(); + injectionTarget.postConstruct(result); + return result; + } + + @Override + public void destroy(ManuelBean manuelBean, CreationalContext manuelBeanCreationalContext) + { + manuelBean.setLifecycleDestroyCalled(true); + injectionTarget.preDestroy(manuelBean); + manuelBeanCreationalContext.release(); + } + }; + abd.addBean(newBean); + } + + } + @RequestScoped + public static class BeanHolder + { + @Inject + private ManuelBean manuelBean; + + public ManuelBean getManuelBean() + { + return manuelBean; + } + } + + public static class ManuelBean + { + private boolean constructCalled; + private boolean destroyCalled; + private boolean lifecycleDestroyCalled; + + @PostConstruct + protected void onConstruct() + { + this.constructCalled = true; + } + + @PreDestroy + protected void onDestroy() + { + this.destroyCalled = true; + } + + public boolean isConstructCalled() + { + return constructCalled; + } + + public boolean isDestroyCalled() + { + return destroyCalled; + } + + public boolean isLifecycleDestroyCalled() + { + return lifecycleDestroyCalled; + } + + public void setLifecycleDestroyCalled(boolean lifecycleDestroyCalled) + { + this.lifecycleDestroyCalled = lifecycleDestroyCalled; + } + } +}