[jboss-cvs] JBossAS SVN: r96215 - in projects/kernel/trunk/weld-int/src: test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2009-11-10 05:52:09 -0500 (Tue, 10 Nov 2009)
New Revision: 96215

Modified:
   projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/weld/McBeanRegistryObserver.java
   projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java
Log:
[JBKERNEL-51] Use generics in observer methods, and get rid of @SuppressWarnings now that Weld has been fixed

Modified: projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/weld/McBeanRegistryObserver.java
===================================================================
--- projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/weld/McBeanRegistryObserver.java	2009-11-10 10:50:28 UTC (rev 96214)
+++ projects/kernel/trunk/weld-int/src/main/java/org/jboss/kernel/weld/plugins/weld/McBeanRegistryObserver.java	2009-11-10 10:52:09 UTC (rev 96215)
@@ -57,26 +57,25 @@
       }
    }
    
-   public void processInjectionTarget(@Observes ProcessInjectionTarget<?> event)
+   public <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> event)
    {
       AnnotatedType<?> type = event.getAnnotatedType();
       KernelControllerContext context = WeldFromMcRegistry.getInstance().getContext(type);
       if (context != null)
       {
-         InjectionTarget<?> target = event.getInjectionTarget();
-         @SuppressWarnings("unchecked")
-         ExistingInstanceInjectionTarget tgt = new ExistingInstanceInjectionTarget(target, context);
+         InjectionTarget<X> target = event.getInjectionTarget();
+         ExistingInstanceInjectionTarget<X> tgt = new ExistingInstanceInjectionTarget<X>(target, context);
          event.setInjectionTarget(tgt);
       }
    }
    
-   public void processProducer(@Observes ProcessProducer<?, ?> event)
+   public <X> void processProducer(@Observes ProcessProducer<?, X> event)
    {
       AnnotatedType<?> type = event.getAnnotatedMember().getDeclaringType();
       KernelControllerContext context = WeldFromMcRegistry.getInstance().getContext(type);
       if (context != null)
       {
-         Producer<?> producer = event.getProducer();
+         Producer<X> producer = event.getProducer();
          if (producer.getInjectionPoints().size() > 0)
          {
             throw new IllegalStateException("Only producer fields or parameterless producer methods can be used");
@@ -86,14 +85,12 @@
          
          if (member instanceof Field)
          {
-            @SuppressWarnings("unchecked")
-            Producer wrapped = new ExisitingInstanceFieldProducer((Field)member, producer, context);
+            Producer<X> wrapped = new ExisitingInstanceFieldProducer<X>((Field)member, producer, context);
             event.setProducer(wrapped);
          }
          else if (member instanceof Method)
          {
-            @SuppressWarnings("unchecked")
-            Producer wrapped = new ExisitingInstanceMethodProducer((Method)member, producer, context);
+            Producer<X> wrapped = new ExisitingInstanceMethodProducer<X>((Method)member, producer, context);
             event.setProducer(wrapped);
          }
          else

Modified: projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java
===================================================================
--- projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java	2009-11-10 10:50:28 UTC (rev 96214)
+++ projects/kernel/trunk/weld-int/src/test/java/org/jboss/test/kernel/weld/mctowb/support/validateobserver/TestObserver.java	2009-11-10 10:52:09 UTC (rev 96215)
@@ -46,7 +46,7 @@
    }
 
    @Override
-   public void processInjectionTarget(@Observes ProcessInjectionTarget<?> event)
+   public <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> event)
    {
       super.processInjectionTarget(event);
    }