Resolvido bug onde produtor de contexto não produzia se InjectionPoint

no produtor for nulo, mesmo quando um InjectionPoint não é necessário para produzir.

Resolvido bug onde produtor de contexto não produzia se InjectionPoint
no produtor for nulo, mesmo quando um InjectionPoint não é necessário para produzir.
Dancovich
1 parent fd12a4b3
Showing 2 changed files with 37 additions and 9 deletions Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/CustomContextProducer.java
impl/extension/jpa/src/test/java/producer/ProducerTest.java
@@ -134,27 +134,52 @@ public class CustomContextProducer {
 	@Produces
 	public RequestContext getRequestContext(InjectionPoint ip){
-		return getContext(ip);
+		if (ip!=null){
+			return getContext(ip);
+		}
+		else{
+			return getContext(RequestContext.class);
+		}
 	}
 	@Produces
 	public SessionContext getSessionContext(InjectionPoint ip){
-		return getContext(ip);
+		if (ip!=null){
+			return getContext(ip);
+		}
+		else{
+			return getContext(SessionContext.class);
+		}
 	}
 	@Produces
 	public ViewContext getViewContext(InjectionPoint ip){
-		return getContext(ip);
+		if (ip!=null){
+			return getContext(ip);
+		}
+		else{
+			return getContext(ViewContext.class);
+		}
 	}
 	@Produces
 	public StaticContext getStaticContext(InjectionPoint ip){
-		return getContext(ip);
+		if (ip!=null){
+			return getContext(ip);
+		}
+		else{
+			return getContext(StaticContext.class);
+		}
 	}
 	@Produces
 	public ConversationContext getConversationContext(InjectionPoint ip){
-		return getContext(ip);
+		if (ip!=null){
+			return getContext(ip);
+		}
+		else{
+			return getContext(ConversationContext.class);
+		}
 	}
 	/////////////END OF PRODUCERS///////////////////
@@ -175,7 +200,8 @@ public class CustomContextProducer {
 		return producedContext;
 	}
-	private CustomContext getContext(Class<? extends CustomContext> contextClass){
+	@SuppressWarnings("unchecked")
+	private <T extends CustomContext> T getContext(Class<T> contextClass){
 		CustomContext producedContext = null;
 		ArrayList<CustomContext> selectableContexts = new ArrayList<CustomContext>();
@@ -196,7 +222,7 @@ public class CustomContextProducer {
 			producedContext = StrategySelector.selectInstance(CustomContext.class, selectableContexts);
 		}
-		return producedContext;
+		return (T) producedContext;
 	}
 	private Logger getLogger() {
@@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import org.jboss.arquillian.container.test.api.Deployment;
@@ -25,6 +26,9 @@ import br.gov.frameworkdemoiselle.util.NameQualifier;
 public class ProducerTest {
 	private static final String PATH = "src/test/resources/producer";
+	
+	@Inject
+	private RequestContext ctx;
 	@Deployment(name="request_scoped_producer")
 	public static WebArchive createDeployment() {
@@ -46,13 +50,11 @@ public class ProducerTest {
 	@Before
 	public void before(){
-		RequestContext ctx = Beans.getReference(RequestContext.class);
 		ctx.activate();
 	}
 	@After
 	public void after(){
-		RequestContext ctx = Beans.getReference(RequestContext.class);
 		ctx.deactivate();
 	}