[jboss-cvs] JBossAS SVN: r70750 - in projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop: joinpoint/graph and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 11 16:22:44 EDT 2008


Author: flavia.rainone at jboss.com
Date: 2008-03-11 16:22:44 -0400 (Tue, 11 Mar 2008)
New Revision: 70750

Modified:
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByConInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByMethodInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructionInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructorInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/FieldInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/JoinPointInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByConInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByMethodInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodInfo.java
   projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/PointcutDelegateSearchKey.java
Log:
[JBAOP-502] Removed matches method from JoinPointInfo classes.

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByConInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByConInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByConInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -98,9 +98,4 @@
    {
       return calling;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesCall(getAdvisor(), calling, getCalledClass(), getConstructor());
-   }
 }

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByMethodInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByMethodInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConByMethodInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -93,9 +93,4 @@
    {
       return callingMethod;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesCall(getAdvisor(), callingMethod, getCalledClass(), getConstructor());
-   }
 }

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructionInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructionInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructionInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -122,9 +122,4 @@
 
       return null;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesConstruction(getAdvisor(), constructor);
-   }
 }
\ No newline at end of file

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructorInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructorInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/ConstructorInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -133,9 +133,4 @@
 
       return null;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesExecution(getAdvisor(), constructor);
-   }
 }
\ No newline at end of file

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/FieldInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/FieldInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/FieldInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -233,13 +233,4 @@
          }
       };
    }
-
-   public boolean matches(Pointcut pointcut)
-   {
-      if (this.read)
-      {
-         return pointcut.matchesGet(getAdvisor(), advisedField);
-      }
-      return pointcut.matchesSet(getAdvisor(), advisedField);
-   }
 }
\ No newline at end of file

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/JoinPointInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/JoinPointInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/JoinPointInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -246,8 +246,6 @@
       return adviceString; 
    }
    
-   public abstract boolean  matches(Pointcut pointcut);
-   
    public final ReentrantReadWriteLock getInterceptorChainReadWriteLock()
    {
       return this.interceptorChainLock;

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByConInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByConInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByConInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -99,9 +99,4 @@
    {
       return calling;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesCall(getAdvisor(), calling, getCalledClass(), getMethod());
-   }
 }

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByMethodInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByMethodInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodByMethodInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -85,9 +85,4 @@
    {
       return callingMethod;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesCall(getAdvisor(), callingMethod, getCalledClass(), getMethod());
-   }
 }

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodInfo.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodInfo.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/MethodInfo.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -138,9 +138,4 @@
       }
       return null;
    }
-   
-   public boolean matches(Pointcut pointcut)
-   {
-      return pointcut.matchesExecution(getAdvisor(), advisedMethod).isMatch();
-   }
 }
\ No newline at end of file

Modified: projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/PointcutDelegateSearchKey.java
===================================================================
--- projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/PointcutDelegateSearchKey.java	2008-03-11 20:09:45 UTC (rev 70749)
+++ projects/aop/branches/joinpoint_graph/aop/src/main/org/jboss/aop/joinpoint/graph/PointcutDelegateSearchKey.java	2008-03-11 20:22:44 UTC (rev 70750)
@@ -24,13 +24,20 @@
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.jboss.aop.ConByConInfo;
+import org.jboss.aop.ConByMethodInfo;
+import org.jboss.aop.ConstructorInfo;
 import org.jboss.aop.JoinPointInfo;
+import org.jboss.aop.MethodByConInfo;
+import org.jboss.aop.MethodByMethodInfo;
+import org.jboss.aop.MethodInfo;
+import org.jboss.aop.joinpoint.MethodCall;
 import org.jboss.aop.joinpoint.graph.tree.Tree;
 import org.jboss.aop.pointcut.Pointcut;
 
 /**
+ * 
  * @author  <a href="flavia.rainone at jboss.com">Flavia Rainone</a>
- *
  */
 public class PointcutDelegateSearchKey extends SimpleSearchKey
 {
@@ -90,24 +97,75 @@
          for (BehaviourNode behaviourNode: behaviourNodes)
          {
             if (behaviourNode.hasConstruction() &&
-                  behaviourNode.getConstruction().matches(pointcut))
+                  pointcut.matchesConstruction(
+                        behaviourNode.getConstruction().getAdvisor(),
+                        behaviourNode.getConstruction().getConstructor()))
             {
                result.add(behaviourNode.getConstruction());
             }
             if (behaviourNode.hasExecution())
             {
                JoinPointInfo executionInfo = behaviourNode.getExecution();
-               if (executionInfo.matches(pointcut))
+               if (executionInfo instanceof MethodInfo)
                {
-                  result.add(executionInfo);
+                  MethodInfo methodInfo = (MethodInfo) executionInfo;
+                  if (pointcut.matchesExecution(methodInfo.getAdvisor(),
+                        methodInfo.getMethod()).isMatch())
+                  {
+                     result.add(executionInfo);
+                  }
                }
+               else
+               {
+                  ConstructorInfo constructorInfo = (ConstructorInfo) executionInfo;
+                  if (pointcut.matchesExecution(constructorInfo.getAdvisor(),
+                        constructorInfo.getConstructor()))
+                  {
+                     result.add(executionInfo);
+                  }
+               }
             }
             Collection<JoinPointInfo> callers = new ArrayList<JoinPointInfo> ();
             behaviourNode.searchCallers("*", callers);
             for (JoinPointInfo caller: callers)
             {
-               if (caller.matches(pointcut))
+               boolean matches = false;
+               if (caller instanceof MethodCall)
                {
+                  if (caller instanceof MethodByMethodInfo)
+                  {
+                     MethodByMethodInfo info = (MethodByMethodInfo) caller;
+                     matches = pointcut.matchesCall(info.getAdvisor(),
+                           info.getCallingMethod(), info.getCalledClass(),
+                           info.getMethod());
+                  }
+                  else
+                  {
+                     MethodByConInfo info = (MethodByConInfo) caller;
+                     matches = pointcut.matchesCall(info.getAdvisor(),
+                           info.getCallingConstructor(), info.getCalledClass(),
+                           info.getMethod());
+                  }
+               }
+               else
+               {
+                  if (caller instanceof ConByMethodInfo)
+                  {
+                     ConByMethodInfo info = (ConByMethodInfo) caller;
+                     matches = pointcut.matchesCall(info.getAdvisor(),
+                           info.getCallingMethod(), info.getCalledClass(),
+                           info.getConstructor());
+                  }
+                  else
+                  {
+                     ConByConInfo info = (ConByConInfo) caller;
+                     matches = pointcut.matchesCall(info.getAdvisor(),
+                           info.getCallingConstructor(), info.getCalledClass(),
+                           info.getConstructor());
+                  }
+               }
+               if (matches)
+               {
                   result.add(caller);
                }
             }
@@ -115,11 +173,13 @@
          Collection<FieldNode> fieldNodes = classNode.searchFields("*");
          for (FieldNode fieldNode: fieldNodes)
          {
-            if (fieldNode.hasFieldRead() && fieldNode.getFieldRead().matches(pointcut))
+            if (fieldNode.hasFieldRead() && pointcut.matchesGet(
+                  fieldNode.getFieldRead().getAdvisor(), fieldNode.getField()))
             {
                result.add(fieldNode.getFieldRead());
             }
-            if (fieldNode.hasFieldWrite() && fieldNode.getFieldWrite().matches(pointcut))
+            if (fieldNode.hasFieldWrite() && pointcut.matchesSet(
+                  fieldNode.getFieldWrite().getAdvisor(), fieldNode.getField()))
             {
                result.add(fieldNode.getFieldWrite());
             }




More information about the jboss-cvs-commits mailing list