Injecting the generic configuration now requires the @Generic annotation

weld · Oct 12, 2010 · 1663d96 · 1663d96
1 parent 8b3393e
commit 1663d96
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanExtension.java b/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanExtension.java
@@ -308,12 +308,7 @@ public void redefine(RedefinitionContext<Inject> ctx)
             {
                if (ctx.getAnnotatedElement() instanceof Field)
                {
-                  if (ctx.getRawType().equals(genericConfigurationType))
-                  {
-                     // This is a Generic configuration injection point
-                     ctx.getAnnotationBuilder().remove(Inject.class).add(InjectGenericLiteral.INSTANCE);
-                  }
-                  else if (ctx.getAnnotatedElement().isAnnotationPresent(Generic.class))
+                  if (ctx.getAnnotatedElement().isAnnotationPresent(Generic.class))
                   {
                      // This is a Generic bean injection point
                      ctx.getAnnotationBuilder().remove(Inject.class).add(InjectGenericLiteral.INSTANCE);

diff --git a/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/Bar.java b/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/Bar.java
@@ -21,6 +21,7 @@
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
+import org.jboss.weld.extensions.bean.generic.Generic;
 import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 
 /**
@@ -37,6 +38,7 @@ public class Bar implements Serializable
    private static final long serialVersionUID = -6679070875886826999L;
 
    @Inject
+   @Generic
    private Message injectedMessage;
 
    // A Message with no @Inject

diff --git a/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/Baz.java b/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/field/Baz.java
@@ -24,8 +24,8 @@
 import javax.inject.Inject;
 
 import org.jboss.weld.extensions.bean.generic.ApplyScope;
-import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 import org.jboss.weld.extensions.bean.generic.Generic;
+import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 import org.jboss.weld.extensions.unwraps.Unwraps;
 
 /**
@@ -51,6 +51,7 @@ public class Baz implements Serializable
    private Corge corge;
 
    @Inject 
+   @Generic
    private Message message;
 
    public Bar getBar()

diff --git a/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/Bar.java b/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/Bar.java
@@ -19,6 +19,7 @@
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 
+import org.jboss.weld.extensions.bean.generic.Generic;
 import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 
 /**
@@ -32,6 +33,7 @@
 public class Bar
 {
    @Inject
+   @Generic
    private Message injectedMessage;
 
    // A Message with no @Inject

diff --git a/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/Baz.java b/impl/src/test/java/org/jboss/weld/extensions/test/bean/generic/method/Baz.java
@@ -18,8 +18,8 @@
 
 import javax.inject.Inject;
 
-import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 import org.jboss.weld.extensions.bean.generic.Generic;
+import org.jboss.weld.extensions.bean.generic.GenericConfiguration;
 
 /**
  * A generic bean for the config annotation Message
@@ -39,6 +39,7 @@ public class Baz
    private Corge corge;
 
    @Inject 
+   @Generic
    private Message message;
 
    public Bar getBar()