[jboss-cvs] jboss-seam/src/main/org/jboss/seam/intercept ...
Gavin King
gavin.king at jboss.com
Wed Jun 20 13:45:56 EDT 2007
User: gavin
Date: 07/06/20 13:45:56
Modified: src/main/org/jboss/seam/intercept
ClientSideInterceptor.java Interceptor.java
JavaBeanInterceptor.java RootInterceptor.java
SessionBeanInterceptor.java
Log:
refactored interception annotations
Revision Changes Path
1.12 +2 -2 jboss-seam/src/main/org/jboss/seam/intercept/ClientSideInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ClientSideInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/ClientSideInterceptor.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ClientSideInterceptor.java 6 Mar 2007 04:35:42 -0000 1.11
+++ ClientSideInterceptor.java 20 Jun 2007 17:45:56 -0000 1.12
@@ -1,4 +1,4 @@
-//$Id: ClientSideInterceptor.java,v 1.11 2007/03/06 04:35:42 gavin Exp $
+//$Id: ClientSideInterceptor.java,v 1.12 2007/06/20 17:45:56 gavin Exp $
package org.jboss.seam.intercept;
import java.lang.reflect.Method;
@@ -8,7 +8,7 @@
import org.jboss.seam.Component;
import org.jboss.seam.ComponentType;
-import org.jboss.seam.InterceptorType;
+import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.ejb.SeamInterceptor;
/**
1.8 +6 -6 jboss-seam/src/main/org/jboss/seam/intercept/Interceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Interceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/Interceptor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Interceptor.java 16 Feb 2007 18:52:08 -0000 1.7
+++ Interceptor.java 20 Jun 2007 17:45:56 -0000 1.8
@@ -1,4 +1,4 @@
-//$Id: Interceptor.java,v 1.7 2007/02/16 18:52:08 gavin Exp $
+//$Id: Interceptor.java,v 1.8 2007/06/20 17:45:56 gavin Exp $
package org.jboss.seam.intercept;
import static org.jboss.seam.util.EJB.AROUND_INVOKE;
@@ -11,8 +11,8 @@
import java.lang.reflect.Method;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptorType;
import org.jboss.seam.annotations.AroundInvoke;
+import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.interceptors.OptimizedInterceptor;
import org.jboss.seam.util.Reflections;
@@ -39,8 +39,8 @@
private boolean isStateless()
{
- return userInterceptorClass.isAnnotationPresent(org.jboss.seam.annotations.Interceptor.class) &&
- userInterceptorClass.getAnnotation(org.jboss.seam.annotations.Interceptor.class).stateless();
+ return userInterceptorClass.isAnnotationPresent(org.jboss.seam.annotations.intercept.Interceptor.class) &&
+ userInterceptorClass.getAnnotation(org.jboss.seam.annotations.intercept.Interceptor.class).stateless();
}
public Object createUserInterceptor()
@@ -161,8 +161,8 @@
}
}
- type = userInterceptorClass.isAnnotationPresent(org.jboss.seam.annotations.Interceptor.class) ?
- userInterceptorClass.getAnnotation(org.jboss.seam.annotations.Interceptor.class).type() :
+ type = userInterceptorClass.isAnnotationPresent(org.jboss.seam.annotations.intercept.Interceptor.class) ?
+ userInterceptorClass.getAnnotation(org.jboss.seam.annotations.intercept.Interceptor.class).type() :
InterceptorType.SERVER;
optimized = OptimizedInterceptor.class.isAssignableFrom(userInterceptorClass);
1.14 +2 -2 jboss-seam/src/main/org/jboss/seam/intercept/JavaBeanInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JavaBeanInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/JavaBeanInterceptor.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- JavaBeanInterceptor.java 6 Mar 2007 04:35:40 -0000 1.13
+++ JavaBeanInterceptor.java 20 Jun 2007 17:45:56 -0000 1.14
@@ -1,4 +1,4 @@
-//$Id: JavaBeanInterceptor.java,v 1.13 2007/03/06 04:35:40 gavin Exp $
+//$Id: JavaBeanInterceptor.java,v 1.14 2007/06/20 17:45:56 gavin Exp $
package org.jboss.seam.intercept;
import java.lang.reflect.Method;
@@ -10,8 +10,8 @@
import org.jboss.seam.Component;
import org.jboss.seam.ComponentType;
-import org.jboss.seam.InterceptorType;
import org.jboss.seam.annotations.ReadOnly;
+import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.core.Mutable;
/**
1.13 +10 -5 jboss-seam/src/main/org/jboss/seam/intercept/RootInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RootInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/RootInterceptor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- RootInterceptor.java 25 Feb 2007 23:15:06 -0000 1.12
+++ RootInterceptor.java 20 Jun 2007 17:45:56 -0000 1.13
@@ -8,13 +8,15 @@
import java.io.Serializable;
import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
import java.util.List;
import org.jboss.seam.log.LogProvider;
import org.jboss.seam.log.Logging;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptorType;
import org.jboss.seam.Seam;
+import org.jboss.seam.annotations.intercept.BypassInterceptors;
+import org.jboss.seam.annotations.intercept.InterceptorType;
import org.jboss.seam.contexts.Contexts;
import org.jboss.seam.contexts.Lifecycle;
import org.jboss.seam.util.EJB;
@@ -121,7 +123,7 @@
private InvocationContext createInvocationContext(InvocationContext invocation, EventType eventType) throws Exception
{
- if ( isProcessInterceptors() )
+ if ( isProcessInterceptors( invocation.getMethod() ) )
{
if ( log.isTraceEnabled() )
{
@@ -129,7 +131,8 @@
}
return createSeamInvocationContext(invocation, eventType);
}
- else {
+ else
+ {
if ( log.isTraceEnabled() )
{
log.trace( "not intercepted: " + getInterceptionMessage(invocation, eventType) );
@@ -190,9 +193,11 @@
(eventType==EventType.AROUND_INVOKE ? invocation.getMethod().getName() : eventType );
}
- private boolean isProcessInterceptors()
+ private boolean isProcessInterceptors(Method method)
{
- return isSeamComponent && getComponent().getInterceptionType().isActive();
+ return isSeamComponent &&
+ getComponent().isInterceptionEnabled() &&
+ !method.isAnnotationPresent(BypassInterceptors.class);
}
protected Component getComponent()
1.16 +1 -1 jboss-seam/src/main/org/jboss/seam/intercept/SessionBeanInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SessionBeanInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/intercept/SessionBeanInterceptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- SessionBeanInterceptor.java 6 Mar 2007 20:42:42 -0000 1.15
+++ SessionBeanInterceptor.java 20 Jun 2007 17:45:56 -0000 1.16
@@ -18,10 +18,10 @@
import org.jboss.seam.log.Logging;
import org.jboss.seam.persistence.EntityManagerProxy;
import org.jboss.seam.Component;
-import org.jboss.seam.InterceptorType;
import org.jboss.seam.Seam;
import org.jboss.seam.Component.BijectedAttribute;
import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.intercept.InterceptorType;
/**
* Controller interceptor for server-side interceptors of
More information about the jboss-cvs-commits
mailing list