[jboss-cvs] JBossAS SVN: r75553 - in projects/jpa/trunk/deployers/src: test/java/org/jboss/jpa/deployers/test/resolvers and 1 other directory.

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

Author: wolfc
Date: 2008-07-09 11:23:51 -0400 (Wed, 09 Jul 2008)
New Revision: 75553

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java
   projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java
Log:
Allow empty name for resolving default persistence unit

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java	2008-07-09 14:17:35 UTC (rev 75552)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/DefaultPersistenceUnitDependencyResolver.java	2008-07-09 15:23:51 UTC (rev 75553)
@@ -78,7 +78,7 @@
          return null;
       for(PersistenceUnitMetaData persistenceUnit : persistenceMetaData.getPersistenceUnits())
       {
-         if(persistenceUnitName == null || persistenceUnit.getName().equals(persistenceUnitName))
+         if(persistenceUnitName == null || persistenceUnitName.length() == 0 || persistenceUnit.getName().equals(persistenceUnitName))
             return createBeanName(unit, persistenceUnit.getName());
       }
       return null;

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java	2008-07-09 14:17:35 UTC (rev 75552)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/resolvers/PersistenceUnitDependencyResolver.java	2008-07-09 15:23:51 UTC (rev 75553)
@@ -41,6 +41,11 @@
    String createBeanName(DeploymentUnit deploymentUnit, String persistenceUnitName);
    
    /**
+    * Get the name of the bean that supplies the specified persistence unit.
+    * 
+    * Note that a null or empty persistence unit name returns the default (first available)
+    * persistence unit.
+    *  
     * @param deploymentUnit the deployment unit that has a persistence unit reference
     * @param persistenceUnitName the (relative) name of a persistence unit or null for the default persistence unit
     * @return the bean name of the persistence unit

Modified: projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java
===================================================================
--- projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java	2008-07-09 14:17:35 UTC (rev 75552)
+++ projects/jpa/trunk/deployers/src/test/java/org/jboss/jpa/deployers/test/resolvers/DefaultPersistenceUnitDependencyResolverTestCase.java	2008-07-09 15:23:51 UTC (rev 75553)
@@ -75,5 +75,10 @@
       String persistenceUnitName = null;
       String beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
       assertEquals("persistence.unit:unitName=#dummy", beanName);
+      
+      // We want the default persistence unit
+      persistenceUnitName = "";
+      beanName = resolver.resolvePersistenceUnitSupplier(deploymentUnit, persistenceUnitName);
+      assertEquals("persistence.unit:unitName=#dummy", beanName);
    }
 }