Implementando fix para bug que impede a serialização de beans presentes

nos contextos personalizados, devido ao uso de ClassLoader como chave do mapa interno dos contextos.

Implementando fix para bug que impede a serialização de beans presentes
nos contextos personalizados, devido ao uso de ClassLoader como chave do mapa interno dos contextos.
Dancovich
1 parent 1267e2a2
Showing 7 changed files with 69 additions and 52 deletions Show diff stats
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/CustomContextProducer.java
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/AbstractEntityManagerStore.java
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/EntityManagerProxy.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
@@ -36,6 +36,7 @@
  */
 package br.gov.frameworkdemoiselle.internal.context;
+import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.util.Collections;
 import java.util.HashMap;
@@ -156,8 +157,8 @@ public abstract class AbstractCustomContext implements CustomContext {
 		return this.scope;
 	}
-	protected static Store createStore() {
-		return new Store();
+	protected static Store createStore(Class<?> owningClass) {
+		return new Store(owningClass);
 	}
 	private ResourceBundle getBundle(){
@@ -193,38 +194,47 @@ public abstract class AbstractCustomContext implements CustomContext {
 		return true;
 	}
-	static class Store {
+	static class Store implements Serializable {
-		private Map<ClassLoader, Map<Class<?>, Object>> cache = Collections
-				.synchronizedMap(new HashMap<ClassLoader, Map<Class<?>, Object>>());
+		private static final long serialVersionUID = -8237464177510563034L;
+		
+		private final String SEPARATOR = "#";
+		
+		private final String ID_PREFIX;
+		
+		private Map<String, Object> cache = Collections.synchronizedMap(new HashMap<String, Object>());
-		private Store() {
+		private Store(Class<?> owningClass) {
+			ID_PREFIX = Thread.currentThread().getContextClassLoader().toString()
+					+ SEPARATOR + owningClass.getCanonicalName();
 		}
 		private boolean contains(final Class<?> type) {
-			return this.getMap().containsKey(type);
+			return cache.containsKey( prefixId(type.getCanonicalName()) );
 		}
 		private Object get(final Class<?> type) {
-			return this.getMap().get(type);
+			return cache.get( prefixId(type.getCanonicalName()) );
 		}
 		private void put(final Class<?> type, final Object instance) {
-			this.getMap().put(type, instance);
+			cache.put( prefixId(type.getCanonicalName()) , instance);
 		}
 		public void clear() {
 			cache.clear();
 		}
+		
+		private String prefixId(String id){
+			return ID_PREFIX + SEPARATOR + id;
+		}
-		private Map<Class<?>, Object> getMap() {
-			ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
-
+		/*private Map<String, Object> getMap() {
 			if (!cache.containsKey(classLoader)) {
 				cache.put(classLoader, Collections.synchronizedMap(new HashMap<Class<?>, Object>()));
 			}
 			return cache.get(classLoader);
-		}
+		}*/
 	}
 }
@@ -37,6 +37,9 @@
 package br.gov.frameworkdemoiselle.internal.context;
 import java.lang.annotation.Annotation;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.StaticScoped;
@@ -58,7 +61,7 @@ import br.gov.frameworkdemoiselle.configuration.Configuration;
 @Priority(Priority.MIN_PRIORITY)
 public abstract class AbstractStaticContext extends AbstractCustomContext {
-	private final static Store store = createStore();
+	private static Map<String, Store> cache = Collections.synchronizedMap( new HashMap<String, Store>() );
 	/**
 	 * Constructs this context to control the provided scope
@@ -69,11 +72,16 @@ public abstract class AbstractStaticContext extends AbstractCustomContext {
 	@Override
 	protected Store getStore() {
+		Store store = cache.get( this.getClass().getCanonicalName() );
+		if ( store==null ){
+			store = createStore(this.getClass());
+			cache.put(this.getClass().getCanonicalName(), store);
+		}
 		return store;
 	}
 	@Override
 	protected boolean isStoreInitialized() {
-		return store!=null;
+		return cache.get( this.getClass().getCanonicalName() )!=null;
 	}
 }
@@ -73,7 +73,7 @@ public abstract class AbstractThreadLocalContext extends AbstractCustomContext {
 	@Override
 	protected Store getStore() {
 		if (this.threadLocal.get() == null) {
-			this.threadLocal.set(createStore());
+			this.threadLocal.set(createStore(getClass()));
 		}
 		return this.threadLocal.get();
@@ -60,6 +60,7 @@ import javax.enterprise.inject.spi.InjectionPoint;
 import org.slf4j.Logger;
+import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.ConversationContext;
 import br.gov.frameworkdemoiselle.context.CustomContext;
 import br.gov.frameworkdemoiselle.context.RequestContext;
@@ -133,7 +134,7 @@ public class CustomContextProducer {
 	/////////////PRODUCERS///////////////////
 	@Produces
-	public RequestContext getRequestContext(InjectionPoint ip){
+	protected RequestContext getRequestContext(InjectionPoint ip){
 		if (ip!=null){
 			return getContext(ip);
 		}
@@ -143,7 +144,7 @@ public class CustomContextProducer {
 	}
 	@Produces
-	public SessionContext getSessionContext(InjectionPoint ip){
+	protected SessionContext getSessionContext(InjectionPoint ip){
 		if (ip!=null){
 			return getContext(ip);
 		}
@@ -153,7 +154,7 @@ public class CustomContextProducer {
 	}
 	@Produces
-	public ViewContext getViewContext(InjectionPoint ip){
+	protected ViewContext getViewContext(InjectionPoint ip){
 		if (ip!=null){
 			return getContext(ip);
 		}
@@ -163,7 +164,7 @@ public class CustomContextProducer {
 	}
 	@Produces
-	public StaticContext getStaticContext(InjectionPoint ip){
+	protected StaticContext getStaticContext(InjectionPoint ip){
 		if (ip!=null){
 			return getContext(ip);
 		}
@@ -173,7 +174,7 @@ public class CustomContextProducer {
 	}
 	@Produces
-	public ConversationContext getConversationContext(InjectionPoint ip){
+	protected ConversationContext getConversationContext(InjectionPoint ip){
 		if (ip!=null){
 			return getContext(ip);
 		}
@@ -184,8 +185,17 @@ public class CustomContextProducer {
 	/////////////END OF PRODUCERS///////////////////
+	/**
+	 * Obtain a custom context for the provided injection point.
+	 * 
+	 * @param ip The object containing information about the injection point - most importantly
+	 * the declared type of the injection point, to decide the context to return
+	 * 
+	 * @return A context of a type compatible with the type of the injection point, or <code>null</code> if there is
+	 * no such context.
+	 */
 	@SuppressWarnings("unchecked")
-	private <T extends CustomContext> T getContext(InjectionPoint ip){
+	public <T extends CustomContext> T getContext(InjectionPoint ip){
 		T producedContext = null;
 		if (ip!=null){
@@ -200,8 +210,16 @@ public class CustomContextProducer {
 		return producedContext;
 	}
+	/**
+	 * Obtain a context compatible with the provided type.
+	 * 
+	 * @param contextClass The type of the desired context. The returned context will be compatible with this type, if there
+	 * is more than one compatible type, this method will decide witch one to return based on the {@link Priority} annotation. 
+	 * 
+	 * @return A context of a type compatible with the informed type, or <code>null</code> if there is no such context.
+	 */
 	@SuppressWarnings("unchecked")
-	private <T extends CustomContext> T getContext(Class<T> contextClass){
+	public <T extends CustomContext> T getContext(Class<T> contextClass){
 		CustomContext producedContext = null;
 		ArrayList<CustomContext> selectableContexts = new ArrayList<CustomContext>();
@@ -41,13 +41,11 @@ import java.util.HashMap;
 import java.util.Map;
 import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.persistence.FlushModeType;
 import org.slf4j.Logger;
-import br.gov.frameworkdemoiselle.annotation.Name;
 import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig;
 import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig.EntityManagerScope;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -74,19 +72,6 @@ public abstract class AbstractEntityManagerStore implements EntityManagerStore {
 	private final Map<String, EntityManager> cache = Collections.synchronizedMap(new HashMap<String, EntityManager>());
-	@Inject
-	private EntityManagerFactoryProducer factory;
-	
-	@Inject
-	private Logger logger;
-
-	@Inject
-	@Name("demoiselle-jpa-bundle")
-	private ResourceBundle bundle;
-	
-	@Inject
-	private EntityManagerConfig configuration;
-	
 	public EntityManager getEntityManager(String persistenceUnit) {
 		EntityManager entityManager = null;
@@ -114,6 +99,7 @@ public abstract class AbstractEntityManagerStore implements EntityManagerStore {
 		//Se o produtor não possui escopo, então o ciclo de vida
 		//de EntityManager produzidos é responsabilidade do desenvolvedor. Não
 		//fechamos os EntityManagers aqui.
+		EntityManagerConfig configuration = getConfiguration();
 		if (configuration.getEntityManagerScope() != EntityManagerScope.NOSCOPE){
 			for (EntityManager entityManager : cache.values()) {
 				entityManager.close();
@@ -131,23 +117,18 @@ public abstract class AbstractEntityManagerStore implements EntityManagerStore {
 	}
 	private EntityManagerFactoryProducer getFactory(){
-		if (factory==null){
-			factory = Beans.getReference(EntityManagerFactoryProducer.class);
-		}
-		return factory;
+		return Beans.getReference(EntityManagerFactoryProducer.class);
 	}
 	private Logger getLogger(){
-		if (logger==null){
-			logger = Beans.getReference(Logger.class);
-		}
-		return logger;
+		return Beans.getReference(Logger.class);
 	}
 	private ResourceBundle getBundle(){
-		if (bundle==null){
-			bundle = Beans.getReference(ResourceBundle.class , new NameQualifier("demoiselle-jpa-bundle"));
-		}
-		return bundle;
+		return Beans.getReference(ResourceBundle.class , new NameQualifier("demoiselle-jpa-bundle"));
+	}
+	
+	private EntityManagerConfig getConfiguration(){
+		return Beans.getReference(EntityManagerConfig.class);
 	}
 }
@@ -117,8 +117,8 @@ public class EntityManagerProxy implements EntityManager, Serializable {
 	@Override
 	public void persist(Object entity) {
 		joinTransactionIfNecessary();
-		checkEntityManagerScopePassivable(entity);
 		getEntityManagerDelegate().persist(entity);
+		checkEntityManagerScopePassivable(entity);
 	}
 	/*
@@ -75,7 +75,7 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
 		String key = Store.class.getName();
 		if (!viewMap.containsKey(key)) {
-			viewMap.put(key, createStore());
+			viewMap.put(key, createStore( getClass() ));
 		}
 		return (Store) viewMap.get(key);
	@@ -73,7 +73,7 @@ public abstract class AbstractThreadLocalContext extends AbstractCustomContext {		@@ -73,7 +73,7 @@ public abstract class AbstractThreadLocalContext extends AbstractCustomContext {
73	@Override	73	@Override
74	protected Store getStore() {	74	protected Store getStore() {
75	if (this.threadLocal.get() == null) {	75	if (this.threadLocal.get() == null) {
76	- this.threadLocal.set(createStore());	76	+ this.threadLocal.set(createStore(getClass()));
77	}	77	}
78		78
79	return this.threadLocal.get();	79	return this.threadLocal.get();
	@@ -75,7 +75,7 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC		@@ -75,7 +75,7 @@ public class FacesViewContextImpl extends AbstractCustomContext implements ViewC
75	String key = Store.class.getName();	75	String key = Store.class.getName();
76		76
77	if (!viewMap.containsKey(key)) {	77	if (!viewMap.containsKey(key)) {
78	- viewMap.put(key, createStore());	78	+ viewMap.put(key, createStore( getClass() ));
79	}	79	}
80		80
81	return (Store) viewMap.get(key);	81	return (Store) viewMap.get(key);