Removida a anotação @Alternative dos contextos personalizados, ao invés

disso eles são vetados na portable extension para não conflitar com o produtor.

Removida a anotação @Alternative dos contextos personalizados, ao invés
disso eles são vetados na portable extension para não conflitar com o produtor.
Dancovich
1 parent 37d8ff21
Showing 7 changed files with 8 additions and 14 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/StaticContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
 import br.gov.frameworkdemoiselle.context.CustomContext;
 import br.gov.frameworkdemoiselle.context.StaticContext;
@@ -26,6 +27,13 @@ public class CustomContextBootstrap implements Extension{
 	private List<CustomContext> contexts;
+	public <T extends CustomContext> void vetoCustomContexts(@Observes ProcessAnnotatedType<T> event){
+		//Veta os subtipos de CustomContext, para que não conflitem com o produtor de contextos personalizados. 
+		if( CustomContext.class.isAssignableFrom( event.getAnnotatedType().getJavaClass() )){
+			event.veto();
+		}
+	}
+	
 	public void initializeContexts(@Observes AfterBeanDiscovery event){
 		//Cadastra os contextos contidos no demoiselle-core
 		if (contexts==null || contexts.isEmpty()){
@@ -48,8 +48,6 @@
  */
 package br.gov.frameworkdemoiselle.internal.context;
-import javax.enterprise.inject.Alternative;
-
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.StaticScoped;
 import br.gov.frameworkdemoiselle.context.StaticContext;
@@ -63,7 +61,6 @@ import br.gov.frameworkdemoiselle.context.StaticContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class StaticContextImpl extends AbstractStaticContext implements StaticContext {
 	public StaticContextImpl() {
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
 import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Alternative;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.ConversationContext;
@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.ConversationContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryConversationContextImpl extends AbstractStaticContext implements ConversationContext {
 	public TemporaryConversationContextImpl() {
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Alternative;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.RequestContext;
@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.RequestContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryRequestContextImpl extends AbstractThreadLocalContext implements RequestContext {
 	public TemporaryRequestContextImpl() {
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Alternative;
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.SessionContext;
@@ -66,7 +65,6 @@ import br.gov.frameworkdemoiselle.context.SessionContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporarySessionContextImpl extends AbstractStaticContext implements SessionContext {
 	public TemporarySessionContextImpl() {
@@ -48,8 +48,6 @@
  */
 package br.gov.frameworkdemoiselle.internal.context;
-import javax.enterprise.inject.Alternative;
-
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
 import br.gov.frameworkdemoiselle.context.ViewContext;
@@ -65,7 +63,6 @@ import br.gov.frameworkdemoiselle.context.ViewContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryViewContextImpl extends AbstractThreadLocalContext implements ViewContext {
 	public TemporaryViewContextImpl() {
@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.context;
 import java.util.Map;
-import javax.enterprise.inject.Alternative;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
@@ -57,7 +56,6 @@ import br.gov.frameworkdemoiselle.util.Faces;
  *
  */
 @Priority(Priority.L2_PRIORITY)
-@Alternative
 public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
 	public FacesViewContextImpl() {