[jboss-cvs] JBossAS SVN: r66488 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/ejb and 1 other directory.

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

Author: wolfc
Date: 2007-10-26 07:45:14 -0400 (Fri, 26 Oct 2007)
New Revision: 66488

Modified:
   projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java
   projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
Log:
JBAS-4506: added interceptorBindingMetaData.totalOrdering

Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java	2007-10-26 11:30:45 UTC (rev 66487)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/ejb/spec/InterceptorBindingMetaData.java	2007-10-26 11:45:14 UTC (rev 66488)
@@ -23,6 +23,7 @@
 
 import org.jboss.metadata.javaee.support.NamedMetaDataWithDescriptions;
 import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
 import javax.xml.bind.annotation.XmlType;
 
 /**
@@ -142,10 +143,23 @@
    {
       if (interceptorClasses == null)
          throw new IllegalArgumentException("Null interceptorClasses");
+      
+      assert interceptorOrder == null : "Can't have both interceptorClasses and interceptorOrder";
+      
       this.interceptorClasses = interceptorClasses;
    }
 
    /**
+    * Is this binding a total ordering or a list of interceptor classes.
+    * @return   true if it is a total ordering
+    */
+   @XmlTransient
+   public boolean isTotalOrdering()
+   {
+      return interceptorOrder != null;
+   }
+   
+   /**
     * Get the interceptorOrder.
     * 
     * @return the interceptorOrder.
@@ -165,6 +179,9 @@
    {
       if (interceptorOrder == null)
          throw new IllegalArgumentException("Null interceptorOrder");
+      
+      assert interceptorClasses == null : "Can't have both interceptorOrder and interceptorClasses";
+      
       this.interceptorOrder = interceptorOrder;
    }
 

Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java	2007-10-26 11:30:45 UTC (rev 66487)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/ejb/EjbJar3xEverythingUnitTestCase.java	2007-10-26 11:45:14 UTC (rev 66488)
@@ -404,12 +404,14 @@
             assertInterceptorClasses("interceptorBinding" + count, 2, interceptorBindingMetaData.getInterceptorClasses());
             assertTrue(interceptorBindingMetaData.isExcludeDefaultInterceptors());
             assertTrue(interceptorBindingMetaData.isExcludeClassInterceptors());
+            assertFalse(interceptorBindingMetaData.isTotalOrdering());
          }
          else
          {
             assertInterceptorOrder("interceptorBinding" + count, 2, interceptorBindingMetaData.getInterceptorOrder());
             assertFalse(interceptorBindingMetaData.isExcludeDefaultInterceptors());
             assertFalse(interceptorBindingMetaData.isExcludeClassInterceptors());
+            assertTrue(interceptorBindingMetaData.isTotalOrdering());
          }
          assertNamedMethod("interceptorBinding" + count + "Method", 2, interceptorBindingMetaData.getMethod());
          ++count;