Skip to content

Commit

Permalink
Fix disposal methods for enterprise beans, use OO for DisposalMethodBean
Browse files Browse the repository at this point in the history
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3231 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
pmuir committed Jul 25, 2009
1 parent 3f614f3 commit d53a65a
Show file tree
Hide file tree
Showing 8 changed files with 161 additions and 214 deletions.
7 changes: 0 additions & 7 deletions impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
Expand Up @@ -233,13 +233,6 @@ protected void initDeploymentTypeFromStereotype()
}
}

/**
* Gets the default deployment type
*
* @return The default deployment type
*/
protected abstract Class<? extends Annotation> getDefaultDeploymentType();

/**
* Initializes the name
*/
Expand Down
Expand Up @@ -426,12 +426,6 @@ public String toString()
return "AbstractClassBean " + getName();
}

@Override
/*
* Gets the default deployment type
*
* @return The default deployment type
*/
protected Class<? extends Annotation> getDefaultDeploymentType()
{
return Production.class;
Expand All @@ -442,5 +436,6 @@ public String getId()
{
return id;
}


}
Expand Up @@ -40,7 +40,6 @@
import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.DefinitionException;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.introspector.WBMember;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;
Expand All @@ -57,11 +56,8 @@
* @param <T>
* @param <S>
*/
public abstract class AbstractProducerBean<T, S extends Member> extends AbstractBean<T, S>
public abstract class AbstractProducerBean<T, S extends Member> extends AbstractReceiverBean<T, S>
{
// The declaring bean
protected AbstractClassBean<?> declaringBean;

private static final LogProvider log = Logging.getLogProvider(AbstractProducerBean.class);

/**
Expand All @@ -72,8 +68,7 @@ public abstract class AbstractProducerBean<T, S extends Member> extends Abstract
*/
public AbstractProducerBean(AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
{
super(manager);
this.declaringBean = declaringBean;
super(declaringBean, manager);
}

@Override
Expand All @@ -86,28 +81,9 @@ public Class<?> getBeanClass()
return getDeclaringBean().getBeanClass();
}

@Override
public String getId()
{
// TODO Auto-generated method stub
return null;
}

public void destroy(T instance, CreationalContext<T> creationalContext)
{
// TODO Auto-generated method stub

}

/**
* Gets the deployment types
*
* @return The deployment types of the declaring bean
*/
@Override
protected Class<? extends Annotation> getDefaultDeploymentType()
{
return deploymentType = declaringBean.getDeploymentType();
return getDeclaringBean().getDeploymentType();
}

/**
Expand Down Expand Up @@ -171,16 +147,6 @@ protected Type getDeclaredBeanType()
return null;
}

/**
* Returns the declaring bean
*
* @return The bean representation
*/
public AbstractClassBean<?> getDeclaringBean()
{
return declaringBean;
}

/**
* Validates the producer method
*/
Expand Down Expand Up @@ -209,7 +175,7 @@ protected void checkProducerReturnType()
@Override
public void initialize(BeanDeployerEnvironment environment)
{
declaringBean.initialize(environment);
getDeclaringBean().initialize(environment);
super.initialize(environment);
checkProducerReturnType();
}
Expand Down Expand Up @@ -321,35 +287,6 @@ protected void initSerializable()
_serializable = true;
}

/**
* Gets the receiver of the product
*
* @return The receiver
*/
protected Object getReceiver(CreationalContext<?> creationalContext)
{
// This is a bit dangerous, as it means that producer methods can end of
// executing on partially constructed instances. Also, it's not required
// by the spec...
if (getAnnotatedItem().isStatic())
{
return null;
}
else
{
if (creationalContext instanceof CreationalContextImpl)
{
CreationalContextImpl<?> creationalContextImpl = (CreationalContextImpl<?>) creationalContext;
if (creationalContextImpl.containsIncompleteInstance(getDeclaringBean()))
{
log.warn("Executing producer field or method " + getAnnotatedItem() + " on incomplete declaring bean " + getDeclaringBean() + " due to circular injection");
return creationalContextImpl.getIncompleteInstance(getDeclaringBean());
}
}
return manager.getReference(getDeclaringBean(), Object.class, creationalContext);
}
}

/**
* Creates an instance of the bean
*
Expand Down
@@ -0,0 +1,92 @@
/*
* JBoss, Home of Professional Open Source
* Copyright 2008, Red Hat Middleware LLC, and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* Licensed 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.jboss.webbeans.bean;

import java.lang.reflect.Member;

import javax.enterprise.context.spi.CreationalContext;

import org.jboss.webbeans.BeanManagerImpl;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.log.LogProvider;
import org.jboss.webbeans.log.Logging;

/**
* @author pmuir
*
*/
public abstract class AbstractReceiverBean<T, S extends Member> extends AbstractBean<T, S>
{

private static final LogProvider log = Logging.getLogProvider(AbstractReceiverBean.class);

private AbstractClassBean<?> declaringBean;

public AbstractReceiverBean(AbstractClassBean<?> declaringBean, BeanManagerImpl manager)
{
super(manager);
this.declaringBean = declaringBean;
}

@Override
public void initialize(BeanDeployerEnvironment environment)
{
super.initialize(environment);
}

/**
* Gets the receiver of the product
*
* @return The receiver
*/
protected Object getReceiver(CreationalContext<?> creationalContext)
{
// This is a bit dangerous, as it means that producer methods can end of
// executing on partially constructed instances. Also, it's not required
// by the spec...
if (getAnnotatedItem().isStatic())
{
return null;
}
else
{
if (creationalContext instanceof CreationalContextImpl<?>)
{
CreationalContextImpl<?> creationalContextImpl = (CreationalContextImpl<?>) creationalContext;
if (creationalContextImpl.containsIncompleteInstance(getDeclaringBean()))
{
log.warn("Executing producer field or method " + getAnnotatedItem() + " on incomplete declaring bean " + getDeclaringBean() + " due to circular injection");
return creationalContextImpl.getIncompleteInstance(getDeclaringBean());
}
}
return manager.getReference(getDeclaringBean(), Object.class, creationalContext);
}
}


/**
* Returns the declaring bean
*
* @return The bean representation
*/
public AbstractClassBean<?> getDeclaringBean()
{
return declaringBean;
}

}

0 comments on commit d53a65a

Please sign in to comment.