[jboss-cvs] JBossAS SVN: r99110 - in projects/metadata/ejb/trunk/src: main/java/org/jboss/metadata/ejb/spec and 1 other directories.

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

Author: jaikiran
Date: 2010-01-07 06:54:33 -0500 (Thu, 07 Jan 2010)
New Revision: 99110

Modified:
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
   projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
   projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java
Log:
JBMETA-244 Added isEJB31() API on EjbJarMetaData and JBossMetaData

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2010-01-07 11:28:20 UTC (rev 99109)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/jboss/JBossMetaData.java	2010-01-07 11:54:33 UTC (rev 99110)
@@ -268,6 +268,12 @@
    {
       return ejbVersion != null && ejbVersion.contains("3.");
    }
+   
+   @XmlTransient
+   public boolean isEJB31()
+   {
+      return ejbVersion != null && ejbVersion.trim().equals("3.1");
+   }
 
    /**
     * Get the loaderRepository.

Modified: projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java
===================================================================
--- projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java	2010-01-07 11:28:20 UTC (rev 99109)
+++ projects/metadata/ejb/trunk/src/main/java/org/jboss/metadata/ejb/spec/EjbJarMetaData.java	2010-01-07 11:54:33 UTC (rev 99110)
@@ -173,6 +173,15 @@
    }
    
    /**
+    * Whether this is EJB3.1 bean
+    * @return
+    */
+   public boolean isEJB31()
+   {
+      return this.version != null && this.version.trim().equals("3.1");
+   }
+   
+   /**
     * Get the ejbClientJar.
     * 
     * @return the ejbClientJar.

Modified: projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java
===================================================================
--- projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java	2010-01-07 11:28:20 UTC (rev 99109)
+++ projects/metadata/ejb/trunk/src/test/java/org/jboss/metadata/ejb/test/ejbversion/unit/EjbVersionTestCase.java	2010-01-07 11:54:33 UTC (rev 99110)
@@ -21,8 +21,10 @@
 */
 package org.jboss.metadata.ejb.test.ejbversion.unit;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
 
 import java.lang.reflect.AnnotatedElement;
 import java.net.URL;
@@ -119,6 +121,7 @@
       
       EjbJarMetaData ejb31 = unmarshal(EjbJarMetaData.class, "/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml");
       assertEquals("ejb-version EJB 3.1 metadata was incorrect","3.1", ejb31.getVersion());
+      assertTrue("isEJB31() API on EjbJarMetadata returned incorrect value", ejb31.isEJB31());
    }
    
    /**
@@ -142,8 +145,23 @@
       mergedMetadata.merge(metadataFromAnnotations, ejb30XmlMetadata);
       
       assertEquals("ejb-version in merged metadata is incorrect","3.0", mergedMetadata.getEjbVersion());
+      assertTrue("isEJB3x() in merged metadata returned incorrect value",mergedMetadata.isEJB3x());
+      assertFalse("isEJB31() returned true for a EJB 3.0 bean",mergedMetadata.isEJB31());
       
+      // now do the same test with a ejb-jar.xml for EJB 3.1
+      EjbJarMetaData ejb31XmlMetadata = unmarshal(EjbJarMetaData.class, "/org/jboss/metadata/ejb/test/ejbversion/ejb-jar-version-31.xml");
+      assertEquals("ejb-version EJB 3.1 metadata was incorrect","3.1", ejb31XmlMetadata.getVersion());
       
+      
+      // now merge (final ejb-version should be 3.1 - the one set in ejb-jar.xml)
+      JBossMetaData mergedEJB31Metdata = new JBossMetaData();
+      mergedEJB31Metdata.merge(metadataFromAnnotations, ejb31XmlMetadata);
+      
+      assertEquals("ejb-version in merged metadata is incorrect","3.1", mergedEJB31Metdata.getEjbVersion());
+      assertTrue("isEJB3x() in merged metadata returned incorrect value",mergedEJB31Metdata.isEJB3x());
+      assertTrue("isEJB31() in merged metadata returned incorrect value",mergedEJB31Metdata.isEJB31());
+      
+      
    }
 
    /**