[jboss-cvs] JBossAS SVN: r98921 - in projects/kernel/trunk/kernel/src: test/java/org/jboss/test/kernel/qualifiers/test and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2009-12-23 12:48:15 -0500 (Wed, 23 Dec 2009)
New Revision: 98921

Modified:
   projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java
   projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java
   projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java
   projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testBeanQualifiersIgnored.xml
Log:
[JBKERNEL-63] Relax the requirement for an injection point needing ALL the supplied qualifiers of a target context. Enough to resolve any ambiguities is enough

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-23 17:03:31 UTC (rev 98920)
+++ projects/kernel/trunk/kernel/src/main/java/org/jboss/kernel/plugins/dependency/ClassAndQualifierKey.java	2009-12-23 17:48:15 UTC (rev 98921)
@@ -214,8 +214,7 @@
                }
             }
          }
-         int size = suppliedQualifiers != null ? suppliedQualifiers.size() : 0;
-         if (matches >= size && allRequired)
+         if (allRequired)
          {
             if (matches > max)
             {

Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java	2009-12-23 17:03:31 UTC (rev 98920)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/BeanQualifiersTestCase.java	2009-12-23 17:48:15 UTC (rev 98921)
@@ -489,9 +489,11 @@
       KernelControllerContext targetContext = deploy(targetBuilder.getBeanMetaData());
       try
       {
-         assertBean("bean1", Bean.class);
+         Bean bean1 = assertBean("bean1", Bean.class);
          assertBean("bean2", Bean.class);
-         assertNoBean("target");
+         TargetBean target = assertBean("target", TargetBean.class);
+         assertNotNull(target.getBean());
+         assertEquals(bean1, target.getBean());
       }
       finally
       {

Modified: projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java
===================================================================
--- projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java	2009-12-23 17:03:31 UTC (rev 98920)
+++ projects/kernel/trunk/kernel/src/test/java/org/jboss/test/kernel/qualifiers/test/InjectionPointQualifiersTestCase.java	2009-12-23 17:48:15 UTC (rev 98921)
@@ -433,7 +433,7 @@
       bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
       KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
 
-      KernelControllerContext targetContext = deploy(addRequiredQualifiers(createTargetMetaData(targetClass, "test"), "notignored"));
+      KernelControllerContext targetContext = deploy(addRequiredQualifiersAtBeanLevel(createTargetMetaData(targetClass, "test"), "notignored"));
       try
       {
          Bean bean1 = assertBean("bean1", Bean.class);
@@ -480,7 +480,7 @@
       bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
       KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
 
-      KernelControllerContext targetContext = deploy(addOptionalQualifiers(createTargetMetaData(targetClass, "test"), "notignored"));
+      KernelControllerContext targetContext = deploy(addOptionalQualifiersAtBeanLevel(createTargetMetaData(targetClass, "test"), "notignored"));
       try
       {
          Bean bean1 = assertBean("bean1", Bean.class);
@@ -524,10 +524,10 @@
       KernelControllerContext bean1Context = deploy(bean1Builder.getBeanMetaData());
 
       BeanMetaDataBuilder bean2Builder = BeanMetaDataBuilder.createBuilder("bean2", Bean.class.getName());
-      bean2Builder.addQualifiers(QualifierType.SUPPLIED, "other");
+      bean2Builder.addQualifiers(QualifierType.SUPPLIED, "ignored");
       KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
 
-      KernelControllerContext targetContext = deploy(addRequiredQualifiers(createTargetMetaData(targetClass, true, "test"), "ignored"));
+      KernelControllerContext targetContext = deploy(addRequiredQualifiersAtBeanLevel(createTargetMetaData(targetClass, true, "test"), "ignored"));
       try
       {
          Bean bean1 = assertBean("bean1", Bean.class);
@@ -574,14 +574,12 @@
       bean2Builder.addQualifiers(QualifierType.SUPPLIED, "test");
       KernelControllerContext bean2Context = deploy(bean2Builder.getBeanMetaData());
 
-      KernelControllerContext targetContext = deploy(addOptionalQualifiers(createTargetMetaData(targetClass, true, "test"), "ignored"));
+      KernelControllerContext targetContext = deploy(addOptionalQualifiersAtBeanLevel(createTargetMetaData(targetClass, true, "test"), "ignored"));
       try
       {
          assertBean("bean1", Bean.class);
-         Bean bean2 = assertBean("bean2", Bean.class);
-         T target = assertBean("target", targetClass);
-         assertNotNull(target.getBean());
-         assertSame(bean2, target.getBean());
+         assertBean("bean2", Bean.class);
+         assertNoBean("target");
       }
       finally
       {
@@ -887,14 +885,14 @@
       }
    }
    
-   private BeanMetaData addRequiredQualifiers(BeanMetaData bmd, Object...qualifiers)
+   private BeanMetaData addRequiredQualifiersAtBeanLevel(BeanMetaData bmd, Object...qualifiers)
    {
       BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(bmd);
       builder.addQualifiers(QualifierType.REQUIRED, qualifiers);
       return builder.getBeanMetaData();
    }
 
-   private BeanMetaData addOptionalQualifiers(BeanMetaData bmd, Object...qualifiers)
+   private BeanMetaData addOptionalQualifiersAtBeanLevel(BeanMetaData bmd, Object...qualifiers)
    {
       BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder(bmd);
       builder.addQualifiers(QualifierType.OPTIONAL, qualifiers);

Modified: projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testBeanQualifiersIgnored.xml
===================================================================
--- projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testBeanQualifiersIgnored.xml	2009-12-23 17:03:31 UTC (rev 98920)
+++ projects/kernel/trunk/kernel/src/test/resources/org/jboss/test/kernel/qualifiers/test/QualifiersXmlTestCase#testBeanQualifiersIgnored.xml	2009-12-23 17:48:15 UTC (rev 98921)
@@ -3,7 +3,6 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
    
    <bean name="bean1" class="org.jboss.test.kernel.qualifiers.support.Bean">
-      <qualifier>test</qualifier>
       <qualifier>ignored</qualifier>
    </bean>