Refatorando contextos personalizados de escopo para resolver problema de

contextos não serializáveis.

Refatorando contextos personalizados de escopo para resolver problema de
contextos não serializáveis.
Dancovich
1 parent 59e1a071
Showing 7 changed files with 112 additions and 83 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractCustomContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractStaticContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/AbstractThreadLocalContext.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/BeanStore.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/ContextualStore.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
@@ -15,6 +15,7 @@ import br.gov.frameworkdemoiselle.internal.context.TemporarySessionContextImpl;
 import br.gov.frameworkdemoiselle.internal.context.StaticContextImpl;
 import br.gov.frameworkdemoiselle.internal.context.TemporaryConversationContextImpl;
 import br.gov.frameworkdemoiselle.internal.context.TemporaryViewContextImpl;
+import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
 /**
  * This portable extension registers and starts custom contexts used by
@@ -71,13 +72,17 @@ public class CustomContextBootstrap implements Extension{
 		}
 	}
+	public void terminateContexts(@Observes AfterShutdownProccess event){
+		if (contexts!=null){
+			for (CustomContext context : contexts){
+				context.deactivate();
+			}
+			
+			contexts.clear();
+		}
+	}
+	
 	public List<CustomContext> getCustomContexts(){
 		return this.contexts;
 	}
-	
-	/*public void storeContexts(@Observes AfterDeploymentValidation event){
-		CustomContextProducer producer = Beans.getReference(CustomContextProducer.class);
-		producer.addRegisteredContexts(contexts);
-	}*/
-	
 }
@@ -37,16 +37,12 @@
 package br.gov.frameworkdemoiselle.internal.context;
 import java.lang.annotation.Annotation;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.Locale;
-import java.util.Map;
 import javax.enterprise.context.ContextNotActiveException;
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import org.slf4j.Logger;
@@ -71,7 +67,9 @@ public abstract class AbstractCustomContext implements CustomContext {
 		this.active = false;
 	}
-	protected abstract Store getStore();
+	protected abstract BeanStore getStore();
+	
+	protected abstract ContextualStore getContextualStore();
 	protected abstract boolean isStoreInitialized();
@@ -89,22 +87,22 @@ public abstract class AbstractCustomContext implements CustomContext {
 			throw new ContextNotActiveException();
 		}
-		Class<?> type = getType(contextual);
-		if (getStore().contains(type)) {
-			instance = (T) getStore().get(type);
-
-		} else if (creationalContext != null) {
+		String id = getContextualStore().tryRegisterAndGetId(contextual);
+		if (getStore().contains(id)) {
+			instance = (T) getStore().getInstance(id);
+		} 
+		else if (creationalContext!=null){
 			instance = contextual.create(creationalContext);
-			getStore().put(type, instance);
+			getStore().put(id, instance,creationalContext);
 		}
 		return instance;
 	}
-	private <T> Class<?> getType(final Contextual<T> contextual) {
+	/*private <T> Class<?> getType(final Contextual<T> contextual) {
 		Bean<T> bean = (Bean<T>) contextual;
 		return bean.getBeanClass();
-	}
+	}*/
 	@Override
 	public boolean isActive() {
@@ -136,15 +134,27 @@ public abstract class AbstractCustomContext implements CustomContext {
 		return this.active;
 	}
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void deactivate(){
 		if (this.active){
 			if (isStoreInitialized()){
+				for (String id : getStore()){
+					Contextual contextual = getContextualStore().getContextual(id);
+					Object instance = getStore().getInstance(id);
+					CreationalContext creationalContext = getStore().getCreationalContext(id);
+					
+					if (contextual!=null && instance!=null){
+						contextual.destroy(instance, creationalContext);
+					}
+				}
+
 				getStore().clear();
+				getContextualStore().clear();
 			}
-			
+
 			this.active = false;
-			
+
 			Logger logger = getLogger();
 			ResourceBundle bundle = getBundle();
 			logger.debug( bundle.getString("custom-context-was-deactivated" , this.getClass().getCanonicalName() , this.getScope().getSimpleName() ) );
@@ -156,8 +166,12 @@ public abstract class AbstractCustomContext implements CustomContext {
 		return this.scope;
 	}
-	protected static Store createStore() {
-		return new Store();
+	protected static BeanStore createStore() {
+		return new BeanStore();
+	}
+	
+	protected static ContextualStore createContextualStore() {
+		return new ContextualStore();
 	}
 	private ResourceBundle getBundle(){
@@ -192,39 +206,4 @@ public abstract class AbstractCustomContext implements CustomContext {
 			return false;
 		return true;
 	}
-
-	static class Store {
-
-		private Map<ClassLoader, Map<Class<?>, Object>> cache = Collections
-				.synchronizedMap(new HashMap<ClassLoader, Map<Class<?>, Object>>());
-
-		private Store() {
-		}
-
-		private boolean contains(final Class<?> type) {
-			return this.getMap().containsKey(type);
-		}
-
-		private Object get(final Class<?> type) {
-			return this.getMap().get(type);
-		}
-
-		private void put(final Class<?> type, final Object instance) {
-			this.getMap().put(type, instance);
-		}
-
-		public void clear() {
-			cache.clear();
-		}
-
-		private Map<Class<?>, Object> getMap() {
-			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
-			if (!cache.containsKey(classLoader)) {
-				cache.put(classLoader, Collections.synchronizedMap(new HashMap<Class<?>, Object>()));
-			}
-
-			return cache.get(classLoader);
-		}
-	}
 }
@@ -61,7 +61,9 @@ import br.gov.frameworkdemoiselle.configuration.Configuration;
 @Priority(Priority.MIN_PRIORITY)
 public abstract class AbstractStaticContext extends AbstractCustomContext {
-	private final static Map<String, Store> staticStore = Collections.synchronizedMap(new HashMap<String, Store>());
+	private final static Map<String, BeanStore> staticBeanStore = Collections.synchronizedMap(new HashMap<String, BeanStore>());
+	
+	private final static Map<String, ContextualStore> staticContextualStore = Collections.synchronizedMap(new HashMap<String, ContextualStore>());
 	/**
 	 * Constructs this context to control the provided scope
@@ -71,11 +73,22 @@ public abstract class AbstractStaticContext extends AbstractCustomContext {
 	}
 	@Override
-	protected Store getStore() {
-		Store store = staticStore.get( this.getClass().getCanonicalName() );
+	protected BeanStore getStore() {
+		BeanStore store = staticBeanStore.get( this.getClass().getCanonicalName() );
 		if (store==null){
 			store = createStore();
-			staticStore.put(this.getClass().getCanonicalName(), store);
+			staticBeanStore.put(this.getClass().getCanonicalName(), store);
+		}
+		
+		return store;
+	}
+	
+	@Override
+	protected ContextualStore getContextualStore() {
+		ContextualStore store = staticContextualStore.get( this.getClass().getCanonicalName() );
+		if (store==null){
+			store = createContextualStore();
+			staticContextualStore.put(this.getClass().getCanonicalName(), store);
 		}
 		return store;
@@ -83,6 +96,6 @@ public abstract class AbstractStaticContext extends AbstractCustomContext {
 	@Override
 	protected boolean isStoreInitialized() {
-		return staticStore!=null;
+		return staticBeanStore!=null;
 	}
 }
@@ -59,7 +59,9 @@ import java.lang.annotation.Annotation;
  */
 public abstract class AbstractThreadLocalContext extends AbstractCustomContext {
-	private final ThreadLocal<Store> threadLocal = new ThreadLocal<Store>();
+	private final ThreadLocal<BeanStore> threadLocalBeans = new ThreadLocal<BeanStore>();
+	
+	private final ThreadLocal<ContextualStore> threadLocalContextual = new ThreadLocal<ContextualStore>();
 	AbstractThreadLocalContext(final Class<? extends Annotation> scope) {
 		super(scope);
@@ -67,15 +69,24 @@ public abstract class AbstractThreadLocalContext extends AbstractCustomContext {
 	@Override
 	protected boolean isStoreInitialized() {
-		return threadLocal.get()!=null;
+		return threadLocalBeans.get()!=null;
 	}
 	@Override
-	protected Store getStore() {
-		if (this.threadLocal.get() == null) {
-			this.threadLocal.set(createStore());
+	protected BeanStore getStore() {
+		if (this.threadLocalBeans.get() == null) {
+			this.threadLocalBeans.set(createStore());
+		}
+
+		return this.threadLocalBeans.get();
+	}
+	
+	@Override
+	protected ContextualStore getContextualStore() {
+		if (this.threadLocalContextual.get() == null) {
+			this.threadLocalContextual.set(createContextualStore());
 		}
-		return this.threadLocal.get();
+		return this.threadLocalContextual.get();
 	}
 }
@@ -8,25 +8,26 @@ import java.util.Map;
 import javax.enterprise.context.spi.CreationalContext;
-public class BeanStore<T> implements Iterable<String>,Serializable {
+@SuppressWarnings("rawtypes")
+public class BeanStore implements Iterable<String>,Serializable {
 	private static final long serialVersionUID = 1L;
-	private Map<String, T> instanceCache = Collections.synchronizedMap( new HashMap<String, T>() );
-	private Map<String, CreationalContext<T>> creationalCache = Collections.synchronizedMap( new HashMap<String, CreationalContext<T>>() );;
+	private Map<String, Object> instanceCache = Collections.synchronizedMap( new HashMap<String, Object>() );
+	private Map<String, CreationalContext> creationalCache = Collections.synchronizedMap( new HashMap<String, CreationalContext>() );;
-	public void put(String id, T instance,CreationalContext<T> creationalContext){
+	public <T> void put(String id, T instance,CreationalContext<T> creationalContext){
 		if (!instanceCache.containsKey(id)){
 			instanceCache.put(id, instance);
 			creationalCache.put(id, creationalContext);
 		}
 	}
-	public T getInstance(String id){
+	public Object getInstance(String id){
 		return instanceCache.get(id);
 	}
-	public CreationalContext<T> getCreationalContext(String id){
+	public CreationalContext getCreationalContext(String id){
 		return creationalCache.get(id);
 	}
@@ -8,7 +8,8 @@ import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.inject.spi.PassivationCapable;
-public class ContextualStore<T> implements Serializable {
+@SuppressWarnings("rawtypes")
+public class ContextualStore implements Serializable {
 	private static final long serialVersionUID = 1L;
@@ -16,11 +17,18 @@ public class ContextualStore&lt;T&gt; implements Serializable {
 	private AtomicInteger idGenerator = new AtomicInteger();
-	private HashMap<String, Contextual<T>> idToContextual = new HashMap<String, Contextual<T>>();
+	private HashMap<String, Contextual> idToContextual = new HashMap<String, Contextual>();
-	private HashMap<Contextual<T>, String> contextualToId = new HashMap<Contextual<T>, String>();
+	private HashMap<Contextual, String> contextualToId = new HashMap<Contextual, String>();
-	public String tryRegisterAndGetId(Contextual<T> contextual){
+	/**
+	 * The an unique ID for the given contextual. If it's the first time
+	 * this contextual is accessed, registers the contextual for latter retrieval. 
+	 * 
+	 * @param contextual The contextual to generate an ID
+	 * @return The unique ID for the contextual
+	 */
+	public String tryRegisterAndGetId(Contextual contextual){
 		String returnedId;
 		if (contextualToId.containsKey(contextual)){
@@ -40,7 +48,7 @@ public class ContextualStore&lt;T&gt; implements Serializable {
 		return returnedId;
 	}
-	public Contextual<T> getContextual(String id){
+	public Contextual getContextual(String id){
 		return idToContextual.get(id);
 	}
@@ -70,14 +70,26 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
 	}
 	@Override
-	protected Store getStore() {
+	protected BeanStore getStore() {
 		Map<String, Object> viewMap = Faces.getViewMap();
-		String key = Store.class.getName();
+		String key = BeanStore.class.getName();
 		if (!viewMap.containsKey(key)) {
 			viewMap.put(key, createStore());
 		}
-		return (Store) viewMap.get(key);
+		return (BeanStore) viewMap.get(key);
+	}
+
+	@Override
+	protected ContextualStore getContextualStore() {
+		Map<String, Object> viewMap = Faces.getViewMap();
+		String key = ContextualStore.class.getName();
+
+		if (!viewMap.containsKey(key)) {
+			viewMap.put(key, createContextualStore());
+		}
+
+		return (ContextualStore) viewMap.get(key);
 	}
 }