[jboss-cvs] JBossAS SVN: r97878 - in projects/kernel/trunk/kernel/src/main/java/org/jboss: kernel/plugins/dependency and 1 other directory.

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

Author: kabir.khan at jboss.com
Date: 2009-12-16 06:09:44 -0500 (Wed, 16 Dec 2009)
New Revision: 97878

Modified:
   projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java
Log:
[JBKERNEL-63] Extract ClassAndQualifierMatcher interface

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2009-12-16 11:07:57 UTC (rev 97877)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/AbstractInjectionValueMetaData.java	2009-12-16 11:09:44 UTC (rev 97878)
@@ -46,6 +46,7 @@
 import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.kernel.plugins.dependency.ClassAndQualifierKey;
+import org.jboss.kernel.plugins.dependency.ClassAndQualifierMatcher;
 import org.jboss.kernel.plugins.dependency.QualifiersMdrUtil;
 import org.jboss.reflect.spi.TypeInfo;
 import org.jboss.util.JBossStringBuilder;
@@ -422,7 +423,7 @@
          return new ContextualInjectionDependencyItem(this, context.getName(), injectionClass, whenRequired, dependentState, search);
       else
       {
-         ClassAndQualifierKey classAndQualifierMatcher = createClassAndQualifierMatcher(injectionClass, allQualifiers);
+         ClassAndQualifierMatcher classAndQualifierMatcher = createClassAndQualifierMatcher(injectionClass, allQualifiers);
          return new ContextualInjectionDependencyItem(this, context.getName(), classAndQualifierMatcher, whenRequired, dependentState, search);
       }
    }
@@ -488,7 +489,7 @@
     * @param injectionClass the class
     * @return the created key
     */
-   ClassAndQualifierKey createClassAndQualifierMatcher(Class<?> injectionClass, Set<Object> allQualifiers) throws Exception 
+   ClassAndQualifierMatcher createClassAndQualifierMatcher(Class<?> injectionClass, Set<Object> allQualifiers) throws Exception 
    {
       QualifierPoint point = determineQualifierPoint();
       if (point == null)

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java	2009-12-16 11:07:57 UTC (rev 97877)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/beans/metadata/plugins/ContextualInjectionDependencyItem.java	2009-12-16 11:09:44 UTC (rev 97878)
@@ -33,6 +33,7 @@
 import org.jboss.dependency.spi.graph.LookupStrategy;
 import org.jboss.dependency.spi.graph.SearchInfo;
 import org.jboss.kernel.plugins.dependency.ClassAndQualifierKey;
+import org.jboss.kernel.plugins.dependency.ClassAndQualifierMatcher;
 
 /**
  * A dependency item for looking up by class, or by class and qualifiers
@@ -56,7 +57,7 @@
       this.injectionValueMetaData = injectionValueMetaData;
    }
 
-   public ContextualInjectionDependencyItem(AbstractInjectionValueMetaData injectionValueMetaData, Object name, ClassAndQualifierKey key, ControllerState whenRequired, ControllerState dependentState, SearchInfo search)
+   public ContextualInjectionDependencyItem(AbstractInjectionValueMetaData injectionValueMetaData, Object name, ClassAndQualifierMatcher key, ControllerState whenRequired, ControllerState dependentState, SearchInfo search)
    {
       super(name, key, whenRequired, dependentState);
       this.type = LookupType.KEY;
@@ -70,7 +71,7 @@
       {
          super.setIDependOn(injectionValueMetaData.createClassAndQualifierMatcher((Class<?>)getIDependOn(), null));
       }
-      ((ClassAndQualifierKey)getIDependOn()).addQualifiersFromAnnotations(qualifiers);
+      ((ClassAndQualifierMatcher)getIDependOn()).addQualifiersFromAnnotations(qualifiers);
    }
    
    /**

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2009-12-16 11:07:57 UTC (rev 97877)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/AbstractKernelController.java	2009-12-16 11:09:44 UTC (rev 97878)
@@ -107,8 +107,8 @@
    public KernelRegistryEntry getEntry(Object name)
    {
       List<KernelControllerContext> list;
-      if (name instanceof ClassAndQualifierKey)
-         return ((ClassAndQualifierKey)name).search(this);
+      if (name instanceof ClassAndQualifierMatcher)
+         return ((ClassAndQualifierMatcher)name).search(this);
       else if (name instanceof Matcher)
          list = matchSupplies((Matcher)name);
       else

Modified: projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java
===================================================================
--- projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java	2009-12-16 11:07:57 UTC (rev 97877)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java	2009-12-16 11:09:44 UTC (rev 97878)
@@ -44,7 +44,7 @@
  * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
  * @version $Revision: 1.1 $
  */
-public class ClassAndQualifierKey extends JBossObject
+public class ClassAndQualifierKey extends JBossObject implements ClassAndQualifierMatcher
 {
    /** The type of class we are looking for */
    protected final Class<?> type;