[jboss-cvs] JBossAS SVN: r67323 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/annotation/ejb3 and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Nov 21 02:52:58 EST 2007
Author: scott.stark at jboss.org
Date: 2007-11-21 02:52:58 -0500 (Wed, 21 Nov 2007)
New Revision: 67323
Added:
projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/InterceptorsProcessor.java
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
Log:
Add ExcludeClassInterceptors{METHOD}, ExcludeDefaultInterceptors{TYPE, METHOD} and Interceptors{TYPE, METHOD} processor
Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/InterceptorsProcessor.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/InterceptorsProcessor.java (rev 0)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/InterceptorsProcessor.java 2007-11-21 07:52:58 UTC (rev 67323)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.metadata.annotation.creator.ejb;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+
+import javax.interceptor.ExcludeClassInterceptors;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.Interceptors;
+
+import org.jboss.annotation.javaee.Descriptions;
+import org.jboss.metadata.annotation.creator.AbstractFinderUser;
+import org.jboss.metadata.annotation.creator.Processor;
+import org.jboss.metadata.annotation.creator.ProcessorUtils;
+import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorClassesMetaData;
+import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
+import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
+
+/**
+ * @Interceptors processor
+ *
+ * @author Scott.Stark at jboss.org
+ * @version $Revision$
+ */
+public class InterceptorsProcessor<T extends AnnotatedElement>
+ extends AbstractFinderUser
+ implements Processor<InterceptorBindingsMetaData, T>
+{
+ public InterceptorsProcessor(AnnotationFinder<AnnotatedElement> finder)
+ {
+ super(finder);
+ }
+
+ public void process(InterceptorBindingsMetaData metaData, T type)
+ {
+ Interceptors interceptors = finder.getAnnotation(type, Interceptors.class);
+ if(interceptors == null)
+ return;
+ ExcludeClassInterceptors excludeClass = finder.getAnnotation(type, ExcludeClassInterceptors.class);
+ ExcludeDefaultInterceptors excludeDefaults = finder.getAnnotation(type, ExcludeDefaultInterceptors.class);
+
+ Method method = null;
+ if(type instanceof Method)
+ method = (Method) type;
+
+ String ejbName = EjbNameThreadLocal.ejbName.get();
+ InterceptorBindingMetaData interceptor = new InterceptorBindingMetaData();
+ interceptor.setEjbName(ejbName);
+ interceptor.setExcludeClassInterceptors(excludeClass != null);
+ interceptor.setExcludeDefaultInterceptors(excludeDefaults != null);
+ if(method != null)
+ {
+ NamedMethodMetaData namedMethod = new NamedMethodMetaData();
+ namedMethod.setMethodName(method.getName());
+ MethodParametersMetaData methodParams = ProcessorUtils.getMethodParameters(method);
+ namedMethod.setMethodParams(methodParams);
+ interceptor.setMethod(namedMethod);
+ }
+ InterceptorClassesMetaData classes = new InterceptorClassesMetaData();
+ for(Class c : interceptors.value())
+ {
+ classes.add(c.getName());
+ }
+ interceptor.setInterceptorClasses(classes);
+
+ Descriptions descriptions = ProcessorUtils.getDescription("@Interceptors for: "+type);
+ interceptor.setDescriptions(descriptions);
+ metaData.add(interceptor);
+ }
+
+}
Property changes on: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/InterceptorsProcessor.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2007-11-21 07:32:23 UTC (rev 67322)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3UnitTestCase.java 2007-11-21 07:52:58 UTC (rev 67323)
@@ -34,6 +34,7 @@
import java.util.List;
import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
import org.jboss.metadata.annotation.creator.ejb.EjbJar30Creator;
import org.jboss.metadata.annotation.finder.AnnotationFinder;
@@ -59,12 +60,14 @@
import org.jboss.metadata.ejb.spec.InitMethodMetaData;
import org.jboss.metadata.ejb.spec.InitMethodsMetaData;
import org.jboss.metadata.ejb.spec.InterceptorBindingMetaData;
+import org.jboss.metadata.ejb.spec.InterceptorBindingsMetaData;
import org.jboss.metadata.ejb.spec.MessageDrivenBeanMetaData;
import org.jboss.metadata.ejb.spec.MethodMetaData;
import org.jboss.metadata.ejb.spec.MethodParametersMetaData;
import org.jboss.metadata.ejb.spec.MethodPermissionMetaData;
import org.jboss.metadata.ejb.spec.MethodPermissionsMetaData;
import org.jboss.metadata.ejb.spec.MethodsMetaData;
+import org.jboss.metadata.ejb.spec.NamedMethodMetaData;
import org.jboss.metadata.ejb.spec.RemoveMethodMetaData;
import org.jboss.metadata.ejb.spec.RemoveMethodsMetaData;
import org.jboss.metadata.ejb.spec.SecurityIdentityMetaData;
@@ -441,7 +444,49 @@
roles.add("AccessRole2");
assertEquals(roles, rolesAllowed.getRoles());
- InterceptorBindingMetaData interceptorBinding = assembly.getInterceptorBindingByEjbName("MyStatelessBean");
+ // Validate the MyStateless @Interceptors
+ InterceptorBindingsMetaData interceptorBindings = assembly.getInterceptorBindings();
+ assertEquals(2, interceptorBindings.size());
+ InterceptorBindingMetaData ib0 = interceptorBindings.get(0);
+ InterceptorBindingMetaData ib1 = interceptorBindings.get(1);
+ assertEquals("MyStatelessBean", ib0.getEjbName());
+ NamedMethodMetaData ib0Method = ib0.getMethod();
+ if(ib0Method == null)
+ {
+ // The class level @Interceptors
+ assertFalse(ib0.isExcludeClassInterceptors());
+ assertTrue(ib0.isExcludeDefaultInterceptors());
+ assertEquals(TestClassInterceptor.class.getName(),
+ ib0.getInterceptorClasses().iterator().next());
+ }
+ else
+ {
+ // The method level @Interceptors
+ assertTrue(ib0.isExcludeClassInterceptors());
+ assertTrue(ib0.isExcludeDefaultInterceptors());
+ assertEquals(TestMethodInterceptor.class.getName(),
+ ib0.getInterceptorClasses().iterator().next());
+ assertEquals("intercept2", ib0Method.getMethodName());
+ }
+ assertEquals("MyStatelessBean", ib1.getEjbName());
+ NamedMethodMetaData ib1Method = ib1.getMethod();
+ if(ib1Method == null)
+ {
+ // The class level @Interceptors
+ assertFalse(ib1.isExcludeClassInterceptors());
+ assertTrue(ib1.isExcludeDefaultInterceptors());
+ assertEquals(TestClassInterceptor.class.getName(),
+ ib1.getInterceptorClasses().iterator().next());
+ }
+ else
+ {
+ // The method level @Interceptors
+ assertTrue(ib1.isExcludeClassInterceptors());
+ assertTrue(ib1.isExcludeDefaultInterceptors());
+ assertEquals(TestMethodInterceptor.class.getName(),
+ ib1.getInterceptorClasses().iterator().next());
+ assertEquals("intercept2", ib1Method.getMethodName());
+ }
}
/**
More information about the jboss-cvs-commits
mailing list