[jboss-cvs] JBossAS SVN: r107118 - in projects/interceptors/trunk: jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/javassist and 2 other directories.

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

Author: marius.bogoevici
Date: 2010-07-27 12:14:42 -0400 (Tue, 27 Jul 2010)
New Revision: 107118

Modified:
   projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/metadata/InterceptorMetadata.java
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/MethodReference.java
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/javassist/CompositeHandler.java
   projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/SimpleInterceptorMetadata.java
Log:
fixes


Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java	2010-07-27 15:56:49 UTC (rev 107117)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/BuildableInterceptionModel.java	2010-07-27 16:14:42 UTC (rev 107118)
@@ -6,11 +6,15 @@
 import org.jboss.interceptor.spi.model.InterceptionType;
 
 /**
- * An interception model that can be manipulated by the builder
+ * An interception model that can be manipulated by the builder.
+ * 
  * @author Marius Bogoevici
  */
 public interface BuildableInterceptionModel<T,I> extends InterceptionModel<T, I>
 {
+
    void setIgnoresGlobals(Method m, boolean b);
+
    void appendInterceptors(InterceptionType interceptionType, Method method, I[] interceptors);
+
 }

Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/MethodReference.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/MethodReference.java	2010-07-27 15:56:49 UTC (rev 107117)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/builder/MethodReference.java	2010-07-27 16:14:42 UTC (rev 107118)
@@ -27,6 +27,8 @@
 
 
 /**
+ * Wrapper for a method. Allows serializing references to methods.
+ * 
  * @author <a href="mailto:mariusb at redhat.com">Marius Bogoevici</a>
  */
 public class MethodReference implements Serializable

Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/javassist/CompositeHandler.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/javassist/CompositeHandler.java	2010-07-27 15:56:49 UTC (rev 107117)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/proxy/javassist/CompositeHandler.java	2010-07-27 16:14:42 UTC (rev 107118)
@@ -8,17 +8,17 @@
 import javassist.util.proxy.MethodHandler;
 
 /**
+ * A wrapper for multiple Javassist method handlers.
+ * 
  * @author Marius Bogoevici
  */
 public class CompositeHandler implements MethodHandler, Serializable
 {
 
+   protected static final String OBJECT_CLASS_NAME = Object.class.getName();
+
    private List<MethodHandler> methodHandlers;
 
-   private Class<?> ignoredSuperclass = Object.class;
-
-   private boolean enabled = false;
-
    public CompositeHandler(List<MethodHandler> methodHandlers)
    {
       this.methodHandlers = new ArrayList<MethodHandler>();
@@ -27,19 +27,9 @@
 
    private static ThreadLocal<Integer> currentHandlerIndex = new ThreadLocal<Integer>();
 
-   public void setIgnoredSuperclass(Class<?> ignoredSuperclass)
-   {
-      this.ignoredSuperclass = ignoredSuperclass;
-   }
-
-   private void setEnabled(boolean enabled)
-   {
-
-   }
-
    public Object invoke(Object self, Method thisMethod, Method proceed, Object[] args) throws Throwable
    {
-      if (thisMethod.getDeclaringClass().equals(Object.class))
+      if (thisMethod.getDeclaringClass().getName().equals(OBJECT_CLASS_NAME))
          return proceed.invoke(self);
       boolean isOuter = false;
       if (currentHandlerIndex.get() == null)

Modified: projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/SimpleInterceptorMetadata.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/SimpleInterceptorMetadata.java	2010-07-27 15:56:49 UTC (rev 107117)
+++ projects/interceptors/trunk/jboss-interceptor/src/main/java/org/jboss/interceptor/reader/SimpleInterceptorMetadata.java	2010-07-27 16:14:42 UTC (rev 107118)
@@ -47,11 +47,6 @@
       this.interceptorMethodMap = interceptorMethodMap;
    }
 
-   public ClassMetadata getInterceptorClass()
-   {
-      return interceptorClass;
-   }
-
    public List<MethodMetadata> getInterceptorMethods(InterceptionType interceptionType)
    {
       if (interceptorMethodMap != null)

Modified: projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/metadata/InterceptorMetadata.java
===================================================================
--- projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/metadata/InterceptorMetadata.java	2010-07-27 15:56:49 UTC (rev 107117)
+++ projects/interceptors/trunk/jboss-interceptor-api/src/main/java/org/jboss/interceptor/spi/metadata/InterceptorMetadata.java	2010-07-27 16:14:42 UTC (rev 107118)
@@ -26,8 +26,6 @@
  */
 public interface InterceptorMetadata
 {
-   ClassMetadata getInterceptorClass();
-
    /**
     * Returns the list of interceptor methods of this class for a given 
     * interception type.