Skip to content

Commit

Permalink
Refactor in prep for child activities
Browse files Browse the repository at this point in the history
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2273 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
pmuir committed Mar 30, 2009
1 parent 485ca52 commit 5413b5e
Show file tree
Hide file tree
Showing 38 changed files with 279 additions and 110 deletions.
4 changes: 2 additions & 2 deletions impl/src/main/java/org/jboss/webbeans/BeanValidator.java
Expand Up @@ -63,9 +63,9 @@
public class BeanValidator
{

private final ManagerImpl manager;
private final RootManager manager;

public BeanValidator(ManagerImpl manager)
public BeanValidator(RootManager manager)
{
this.manager = manager;
}
Expand Down
169 changes: 169 additions & 0 deletions impl/src/main/java/org/jboss/webbeans/ChildManager.java
@@ -0,0 +1,169 @@
package org.jboss.webbeans;

import java.io.InputStream;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Set;

import javax.context.Context;
import javax.context.CreationalContext;
import javax.event.Observer;
import javax.inject.TypeLiteral;
import javax.inject.manager.Bean;
import javax.inject.manager.Decorator;
import javax.inject.manager.InjectionPoint;
import javax.inject.manager.InterceptionType;
import javax.inject.manager.Interceptor;
import javax.inject.manager.Manager;

import org.jboss.webbeans.manager.api.WebBeansManager;

public class ChildManager implements WebBeansManager, Serializable
{

private final WebBeansManager parentManager;

public ChildManager(WebBeansManager manager)
{
this.parentManager = manager;
}

public void injectNonContextualInstance(Object instance)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public void shutdown()
{
throw new UnsupportedOperationException("Must call shutdown() on root manager");
}

public Manager addBean(Bean<?> bean)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Manager addContext(Context context)
{
throw new UnsupportedOperationException("Must add contexts to root manager");
}

public Manager addDecorator(Decorator decorator)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Manager addInterceptor(Interceptor interceptor)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Manager createActivity()
{
return new ChildManager(this);
}

public void fireEvent(Object event, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Context getContext(Class<? extends Annotation> scopeType)
{
return parentManager.getContext(scopeType);
}

public <T> T getInstance(Bean<T> bean)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Object getInstanceByName(String name)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> T getInstanceByType(Class<T> type, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> T getInstanceToInject(InjectionPoint injectionPoint, CreationalContext<?> creationalContext)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> T getInstanceToInject(InjectionPoint injectionPoint)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Manager parse(InputStream xmlStream)
{
throw new UnsupportedOperationException("Can only add XML metadata to root manager");
}

public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Set<Bean<?>> resolveByName(String name)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> Set<Bean<T>> resolveByType(Class<T> type, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> type, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public List<Decorator> resolveDecorators(Set<Type> types, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings)
{
throw new UnsupportedOperationException("Not yet implemented");
}

public Manager setCurrent(Class<? extends Annotation> scopeType)
{
// TODO Auto-generated method stub
return null;
}

}
6 changes: 3 additions & 3 deletions impl/src/main/java/org/jboss/webbeans/CurrentManager.java
Expand Up @@ -26,14 +26,14 @@
public class CurrentManager
{
// The root manager instance
protected static ManagerImpl rootManager;
protected static RootManager rootManager;

/**
* Gets the root manager
*
* @return The root manager
*/
public static ManagerImpl rootManager()
public static RootManager rootManager()
{
return rootManager;
}
Expand All @@ -43,7 +43,7 @@ public static ManagerImpl rootManager()
*
* @param rootManager The root manager
*/
public static void setRootManager(ManagerImpl rootManager)
public static void setRootManager(RootManager rootManager)
{
CurrentManager.rootManager = rootManager;
}
Expand Down
2 changes: 1 addition & 1 deletion impl/src/main/java/org/jboss/webbeans/InstanceImpl.java
Expand Up @@ -35,7 +35,7 @@ public class InstanceImpl<T> extends FacadeImpl<T> implements Instance<T>
{


public static <I> Instance<I> of(Class<I> clazz, ManagerImpl manager, Set<Annotation> annotations)
public static <I> Instance<I> of(Class<I> clazz, RootManager manager, Set<Annotation> annotations)
{
return new InstanceImpl<I>(clazz, manager, annotations);
}
Expand Down
Expand Up @@ -91,10 +91,10 @@
* @author Pete Muir
*
*/
public class ManagerImpl implements WebBeansManager, Serializable
public class RootManager implements WebBeansManager, Serializable
{

private static final Log log = Logging.getLog(ManagerImpl.class);
private static final Log log = Logging.getLog(RootManager.class);

private static final long serialVersionUID = 3021562879133838561L;

Expand Down Expand Up @@ -146,7 +146,7 @@ public class ManagerImpl implements WebBeansManager, Serializable
* @param ejbServices
* the ejbResolver to use
*/
public ManagerImpl(ServiceRegistry simpleServiceRegistry)
public RootManager(ServiceRegistry simpleServiceRegistry)
{
this.simpleServiceRegistry = simpleServiceRegistry;
this.beans = new CopyOnWriteArrayList<Bean<?>>();
Expand Down Expand Up @@ -944,7 +944,7 @@ public Manager parse(InputStream xmlStream)

public Manager createActivity()
{
throw new UnsupportedOperationException();
return new ChildManager(this);
}

public Manager setCurrent(Class<? extends Annotation> scopeType)
Expand Down Expand Up @@ -1009,7 +1009,7 @@ public void shutdown()
ApplicationContext.INSTANCE.destroy();
ApplicationContext.INSTANCE.setActive(false);
ApplicationContext.INSTANCE.setBeanStore(null);
getServices().get(NamingContext.class).unbind(ManagerImpl.JNDI_KEY);
getServices().get(NamingContext.class).unbind(RootManager.JNDI_KEY);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
Expand Up @@ -34,7 +34,7 @@
import javax.inject.Standard;
import javax.inject.manager.Bean;

import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.RootManager;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.DependentInstancesStore;
import org.jboss.webbeans.conversation.ConversationImpl;
Expand Down Expand Up @@ -62,7 +62,7 @@ public abstract class AbstractBean<T, E> extends RIBean<T>
{

@SuppressWarnings("unchecked")
private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(Event.class, ManagerImpl.class, ConversationImpl.class));
private static Set<Class<?>> STANDARD_WEB_BEAN_CLASSES = new HashSet<Class<?>>(Arrays.asList(Event.class, RootManager.class, ConversationImpl.class));

private boolean proxyable;

Expand Down Expand Up @@ -112,7 +112,7 @@ public static Class<? extends Annotation> getDeploymentType(List<Class<? extends
// If the type a primitive?
private boolean primitive;
// The Web Beans manager
protected ManagerImpl manager;
protected RootManager manager;

protected boolean _serializable;

Expand All @@ -128,7 +128,7 @@ protected boolean isInitialized()
*
* @param manager The Web Beans manager
*/
public AbstractBean(ManagerImpl manager)
public AbstractBean(RootManager manager)
{
super(manager);
this.manager = manager;
Expand Down
Expand Up @@ -33,7 +33,7 @@
import javax.inject.Produces;
import javax.inject.Production;

import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.RootManager;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.injection.FieldInjectionPoint;
import org.jboss.webbeans.injection.MethodInjectionPoint;
Expand Down Expand Up @@ -75,7 +75,7 @@ public abstract class AbstractClassBean<T> extends AbstractBean<T, Class<T>>
* @param type The type
* @param manager The Web Beans manager
*/
protected AbstractClassBean(AnnotatedClass<T> type, ManagerImpl manager)
protected AbstractClassBean(AnnotatedClass<T> type, RootManager manager)
{
super(manager);
this.annotatedItem = type;
Expand Down
Expand Up @@ -37,7 +37,7 @@
import javax.inject.Produces;
import javax.inject.manager.InjectionPoint;

import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.RootManager;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
import org.jboss.webbeans.context.CreationalContextImpl;
import org.jboss.webbeans.context.DependentContext;
Expand Down Expand Up @@ -71,7 +71,7 @@ public abstract class AbstractProducerBean<T, S extends Member> extends Abstract
* @param declaringBean The declaring bean
* @param manager The Web Beans manager
*/
public AbstractProducerBean(AbstractClassBean<?> declaringBean, ManagerImpl manager)
public AbstractProducerBean(AbstractClassBean<?> declaringBean, RootManager manager)
{
super(manager);
this.declaringBean = declaringBean;
Expand Down
Expand Up @@ -35,7 +35,7 @@
import javax.inject.DefinitionException;
import javax.interceptor.Interceptor;

import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.RootManager;
import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance;
import org.jboss.webbeans.bean.proxy.EnterpriseBeanProxyMethodHandler;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
Expand Down Expand Up @@ -77,7 +77,7 @@ public class EnterpriseBean<T> extends AbstractClassBean<T>
* @param manager the current manager
* @return An Enterprise Web Bean
*/
public static <T> EnterpriseBean<T> of(AnnotatedClass<T> clazz, ManagerImpl manager)
public static <T> EnterpriseBean<T> of(AnnotatedClass<T> clazz, RootManager manager)
{
return new EnterpriseBean<T>(clazz, manager);
}
Expand All @@ -88,7 +88,7 @@ public static <T> EnterpriseBean<T> of(AnnotatedClass<T> clazz, ManagerImpl mana
* @param type The type of the bean
* @param manager The Web Beans manager
*/
protected EnterpriseBean(AnnotatedClass<T> type, ManagerImpl manager)
protected EnterpriseBean(AnnotatedClass<T> type, RootManager manager)
{
super(type, manager);
initType();
Expand Down
Expand Up @@ -24,7 +24,7 @@
import javax.context.Dependent;
import javax.inject.Standard;

import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.RootManager;
import org.jboss.webbeans.introspector.AnnotatedClass;
import org.jboss.webbeans.literal.NewLiteral;

Expand All @@ -44,7 +44,7 @@ public class NewEnterpriseBean<T> extends EnterpriseBean<T> implements NewBean
* @param manager The Web Beans manager
* @return a new NewEnterpriseBean instance
*/
public static <T> NewEnterpriseBean<T> of(AnnotatedClass<T> clazz, ManagerImpl manager)
public static <T> NewEnterpriseBean<T> of(AnnotatedClass<T> clazz, RootManager manager)
{
return new NewEnterpriseBean<T>(clazz, manager);
}
Expand All @@ -55,7 +55,7 @@ public static <T> NewEnterpriseBean<T> of(AnnotatedClass<T> clazz, ManagerImpl m
* @param type An annotated class
* @param manager The Web Beans manager
*/
protected NewEnterpriseBean(AnnotatedClass<T> type, ManagerImpl manager)
protected NewEnterpriseBean(AnnotatedClass<T> type, RootManager manager)
{
super(type, manager);
}
Expand Down

0 comments on commit 5413b5e

Please sign in to comment.