[jboss-cvs] JBossAS SVN: r63467 - in projects/aop/trunk/aop/src: main/org/jboss/aop/instrument and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 12 06:05:50 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-06-12 06:05:50 -0400 (Tue, 12 Jun 2007)
New Revision: 63467
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldInvocation.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java
projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodInvocation.java
projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java
projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/XmlReport.java
projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java
Log:
[JBAOP-373] Rename:
MethodExecution.getAdvisedMethod() -> getMethod()
FieldAccess.getAdvisedField() -> getField()
ConstructorCallByConstructor.getCalling() -> getCallingConstructor()
MethodCallByConstructor.getCalling() -> getCallingConstructor()
The implementing MethodInfo, FieldInfo, ConByConInfo and MethodByConInfo classes now contain both methods, with the "old" one marked as deprecated
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ClassAdvisor.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -797,7 +797,7 @@
while (it.hasNext())
{
AdviceBinding binding = (AdviceBinding) it.next();
- pointcutResolved(info, binding, new ConstructorCalledByConstructorJoinpoint(info.getCalling(), info.getConstructor()));
+ pointcutResolved(info, binding, new ConstructorCalledByConstructorJoinpoint(info.getCallingConstructor(), info.getConstructor()));
}
finalizeConCalledByConInterceptorChain(info);
}
@@ -821,7 +821,7 @@
while (it.hasNext())
{
AdviceBinding binding = (AdviceBinding) it.next();
- pointcutResolved(info, binding, new MethodCalledByConstructorJoinpoint(info.getCalling(), info.getMethod()));
+ pointcutResolved(info, binding, new MethodCalledByConstructorJoinpoint(info.getCallingConstructor(), info.getMethod()));
}
finalizeMethodCalledByConInterceptorChain(info);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/ConByConInfo.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -53,12 +53,12 @@
{
super(other);
this.callingIndex = other.callingIndex;
- this.calling = other.getCalling();
+ this.calling = other.getCallingConstructor();
}
protected Joinpoint internalGetJoinpoint()
{
- return new ConstructorCalledByConstructorJoinpoint(getCalling(), getConstructor());
+ return new ConstructorCalledByConstructorJoinpoint(getCallingConstructor(), getConstructor());
}
public JoinPointInfo copy()
@@ -70,7 +70,7 @@
{
StringBuffer sb = new StringBuffer("Constructor called by Constructor");
sb.append("[");
- sb.append("calling=" + getCalling());
+ sb.append("calling=" + getCallingConstructor());
sb.append(",called=" + getConstructor());
sb.append("]");
return sb.toString();
@@ -81,8 +81,15 @@
return callingIndex;
}
+ //Use getCallingConstructor instead
+ @Deprecated()
public Constructor getCalling()
{
return calling;
}
+
+ public Constructor getCallingConstructor()
+ {
+ return calling;
+ }
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/FieldInfo.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -123,10 +123,17 @@
this.advisedField = advisedField;
}
+ //Use getField instead
+ @Deprecated
public Field getAdvisedField()
{
return advisedField;
}
+
+ public Field getField()
+ {
+ return advisedField;
+ }
public void setWrapper(Method wrapper)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/GeneratedClassAdvisor.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -243,7 +243,7 @@
for (Iterator it = overriddenMethods.iterator() ; it.hasNext() ; )
{
MethodInfo info = (MethodInfo)it.next();
- Method method = info.getAdvisedMethod();
+ Method method = info.getMethod();
PointcutMethodMatch match = binding.getPointcut().matchesExecution(this, method);
if (match != null && match.isMatch())
@@ -1315,13 +1315,13 @@
public void makeAccessibleField(FieldInfo fi)
{
//If we do dynamic invokes the field will need to be accessible via reflection
- SecurityActions.setAccessible(fi.getAdvisedField());
+ SecurityActions.setAccessible(fi.getField());
}
public void makeAccessibleMethod(MethodInfo mi)
{
//If we do dynamic invokes the method will need to be accessible via reflection if private/protected
- SecurityActions.setAccessible(mi.getAdvisedMethod());
+ SecurityActions.setAccessible(mi.getMethod());
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodByConInfo.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -83,8 +83,14 @@
return callingIndex;
}
+ @Deprecated
public Constructor getCalling()
{
return calling;
}
+
+ public Constructor getCallingConstructor()
+ {
+ return calling;
+ }
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodInfo.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -80,11 +80,17 @@
return new MethodInfo(this);
}
+ @Deprecated
public Method getAdvisedMethod()
{
return advisedMethod;
}
+ public Method getMethod()
+ {
+ return advisedMethod;
+ }
+
public void setAdvisedMethod(Method advisedMethod)
{
this.advisedMethod = advisedMethod;
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/MethodMatchInfo.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -107,7 +107,7 @@
private void overridePopulateBindings(ArrayList applicableBindings)
{
- if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("populate bindings for " + info.getAdvisedMethod() + " all bindings");
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("populate bindings for " + info.getMethod() + " all bindings");
int size = bindings.size();
int minMatchLevel = 1000000;
for (int i = 0 ; i < size ; i++)
@@ -122,7 +122,7 @@
}
}
- if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("populate bindings for " + info.getAdvisedMethod() + " actual bindings");
+ if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("populate bindings for " + info.getMethod() + " actual bindings");
for (int i = 0 ; i < size ; i++)
{
AdviceBinding binding = (AdviceBinding)bindings.get(i);
@@ -140,7 +140,7 @@
{
applicableBindings.add(binding);
binding.addAdvisor(advisor);
- advisor.pointcutResolved(info, binding, new MethodJoinpoint(info.getAdvisedMethod()));
+ advisor.pointcutResolved(info, binding, new MethodJoinpoint(info.getMethod()));
}
public void clear()
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -86,14 +86,14 @@
if (((FieldInfo)info).isRead())
{
read = true;
- returnType = new WeakReference(((FieldInfo)info).getAdvisedField().getType());
+ returnType = new WeakReference(((FieldInfo)info).getField().getType());
}
- hasTargetObject = !Modifier.isStatic(((FieldInfo)info).getAdvisedField().getModifiers());
+ hasTargetObject = !Modifier.isStatic(((FieldInfo)info).getField().getModifiers());
}
private static JoinPointParameters getParameters(FieldInfo info)
{
- if (Modifier.isStatic(info.getAdvisedField().getModifiers()))
+ if (Modifier.isStatic(info.getField().getModifiers()))
{
return JoinPointParameters.ONLY_ARGS;
}
@@ -112,7 +112,7 @@
private String fieldName(FieldInfo info)
{
- return info.getAdvisedField().getName();
+ return info.getField().getName();
}
protected boolean isVoid()
@@ -132,7 +132,7 @@
protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
{
FieldAccess fieldAccess = (FieldAccess)joinPoint;
- Field field = fieldAccess.getAdvisedField();
+ Field field = fieldAccess.getField();
return new AdviceMethodProperties(
setup.getAspectClass(),
setup.getAdviceName(),
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodExecutionTransformer.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -161,7 +161,7 @@
for (Iterator iterator = methodInfos.iterator(); iterator.hasNext();)
{
org.jboss.aop.MethodInfo methodInfo = (org.jboss.aop.MethodInfo) iterator.next();
- Method method = methodInfo.getAdvisedMethod();
+ Method method = methodInfo.getMethod();
AOPClassPool classPool = (AOPClassPool) clazz.getClassPool();
Class[] parameterTypes = method.getParameterTypes();
CtClass[] javassistParameterTypes = new CtClass[parameterTypes.length];
@@ -208,7 +208,7 @@
for (Iterator iterator = methodInfos.iterator(); iterator.hasNext();)
{
org.jboss.aop.MethodInfo methodInfo = (org.jboss.aop.MethodInfo) iterator.next();
- Method method = methodInfo.getAdvisedMethod();
+ Method method = methodInfo.getMethod();
AOPClassPool classPool = (AOPClassPool) clazz.getClassPool();
Class[] parameterTypes = method.getParameterTypes();
CtClass[] javassistParameterTypes = new CtClass[parameterTypes.length];
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/MethodJoinPointGenerator.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -72,17 +72,17 @@
public MethodJoinPointGenerator(GeneratedClassAdvisor advisor, MethodInfo info)
{
super(advisor, info, getParameters(info),
- info.getAdvisedMethod().getParameterTypes().length);
+ info.getMethod().getParameterTypes().length);
if (!info.getUnadvisedMethod().getReturnType().equals(Void.TYPE))
{
returnType = new WeakReference(info.getUnadvisedMethod().getReturnType());
}
- hasTargetObject = !Modifier.isStatic(info.getAdvisedMethod().getModifiers());
+ hasTargetObject = !Modifier.isStatic(info.getMethod().getModifiers());
}
private static JoinPointParameters getParameters(MethodInfo info)
{
- if (Modifier.isStatic(info.getAdvisedMethod().getModifiers()))
+ if (Modifier.isStatic(info.getMethod().getModifiers()))
{
return JoinPointParameters.ONLY_ARGS;
}
@@ -103,7 +103,7 @@
private String advisedMethodName(MethodInfo info)
{
- return info.getAdvisedMethod().getName();
+ return info.getMethod().getName();
}
private long methodHash(MethodInfo info)
@@ -127,7 +127,7 @@
protected AdviceMethodProperties getAdviceMethodProperties(JoinPointBean joinPoint, AdviceSetup setup)
{
- Method method = ((MethodExecution)joinPoint).getAdvisedMethod();
+ Method method = ((MethodExecution)joinPoint).getMethod();
return new AdviceMethodProperties(
setup.getAspectClass(),
setup.getAdviceName(),
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCallByConstructor.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -34,6 +34,6 @@
/**
* Gets the calling constructor
*/
- Constructor getCalling();
+ Constructor getCallingConstructor();
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/ConstructorCalledByConstructorInvocation.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -49,12 +49,12 @@
public ConstructorCalledByConstructorInvocation(ConByConInfo info, Object callingObject, Object[] args, Interceptor[] interceptors)
{
- this(info.getAdvisor(), info.getCalling(), info.getConstructor(), info.getWrappingMethod(), callingObject, args, interceptors);
+ this(info.getAdvisor(), info.getCallingConstructor(), info.getConstructor(), info.getWrappingMethod(), callingObject, args, interceptors);
}
public ConstructorCalledByConstructorInvocation(ConByConInfo info, Object callingObject, Interceptor[] interceptors)
{
- this(info.getAdvisor(), info.getCalling(), info.getConstructor(), info.getWrappingMethod(), callingObject, null, interceptors);
+ this(info.getAdvisor(), info.getCallingConstructor(), info.getConstructor(), info.getWrappingMethod(), callingObject, null, interceptors);
}
public ConstructorCalledByConstructorInvocation(Advisor advisor, Constructor calling, Constructor constructor, Method wrappingMethod, Object callingObject, Object[] args, Interceptor[] interceptors)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldAccess.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -34,7 +34,7 @@
/**
* Gets the field being read or written
*/
- Field getAdvisedField();
+ Field getField();
/**
* Gets whether we are reading the field
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldInvocation.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/FieldInvocation.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -55,7 +55,7 @@
protected FieldInvocation(FieldInfo info, Interceptor[] interceptors)
{
- this(info.getAdvisedField(), info.getIndex(), interceptors);
+ this(info.getField(), info.getIndex(), interceptors);
this.advisor = info.getAdvisor();
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCallByConstructor.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -34,6 +34,6 @@
/**
* Gets the constructor making the call
*/
- Constructor getCalling();
+ Constructor getCallingConstructor();
}
\ No newline at end of file
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodCalledByConstructorInvocation.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -48,12 +48,12 @@
public MethodCalledByConstructorInvocation(MethodByConInfo info, Object callingObject, Object target, Object[] args, Interceptor[] interceptors)
{
- this(info.getAdvisor(), info.getCalling(), info.getMethod(), callingObject, target, args, interceptors);
+ this(info.getAdvisor(), info.getCallingConstructor(), info.getMethod(), callingObject, target, args, interceptors);
}
public MethodCalledByConstructorInvocation(MethodByConInfo info, Object callingObject, Object target, Interceptor[] interceptors)
{
- this(info.getAdvisor(), info.getCalling(), info.getMethod(), callingObject, target, null, interceptors);
+ this(info.getAdvisor(), info.getCallingConstructor(), info.getMethod(), callingObject, target, null, interceptors);
}
public MethodCalledByConstructorInvocation(Advisor advisor, Constructor calling, Method method, Object callingObject, Object target, Object[] args, Interceptor[] interceptors)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodExecution.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -35,7 +35,7 @@
/**
* Gets the method being called
*/
- Method getAdvisedMethod();
+ Method getMethod();
/**
* Gets the hash of the method being called
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodInvocation.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodInvocation.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/joinpoint/MethodInvocation.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -66,7 +66,7 @@
public MethodInvocation(MethodInfo info, org.jboss.aop.advice.Interceptor[] interceptors)
{
- this(interceptors, info.getHash(), info.getAdvisedMethod(), info.getUnadvisedMethod(), info.getAdvisor());
+ this(interceptors, info.getHash(), info.getMethod(), info.getUnadvisedMethod(), info.getAdvisor());
}
public MethodInvocation(Interceptor[] interceptors, long methodHash, Method advisedMethod, Method unadvisedMethod, Advisor advisor)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/InstanceProxyContainer.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -206,7 +206,7 @@
public MethodInfo getMethodInfo(long hash)
{
MethodInfo info = super.getMethodInfo(hash);
- if (classAdvisor instanceof ClassAdvisor && info.getAdvisedMethod().equals(info.getUnadvisedMethod()))
+ if (classAdvisor instanceof ClassAdvisor && info.getMethod().equals(info.getUnadvisedMethod()))
{
MethodInfo superInfo = classAdvisor.getMethodInfo(hash);
if (superInfo != null)
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/XmlReport.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/XmlReport.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/standalone/XmlReport.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -280,7 +280,7 @@
if (method == null && methodCallers == null) continue;
if (method != null && methodCallers == null && (method.getInterceptors() == null || method.getInterceptors().length < 1)) continue;
indenter(pw, indent);
- pw.println("<method signature=\"" + method.getAdvisedMethod().toString() + "\">");
+ pw.println("<method signature=\"" + method.getMethod().toString() + "\">");
if (method != null)
{
Interceptor[] chain = method.getInterceptors();
Modified: projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java
===================================================================
--- projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java 2007-06-12 09:56:40 UTC (rev 63466)
+++ projects/aop/trunk/aop/src/test/org/jboss/test/aop/beforeafterArgs/JoinPointTestCase.java 2007-06-12 10:05:50 UTC (rev 63467)
@@ -110,7 +110,7 @@
assertTrue(JoinPointAspect.afterJoinPoint instanceof FieldAccess);
FieldAccess fieldAccess = (FieldAccess) JoinPointAspect.afterJoinPoint;
- assertEquals("number", fieldAccess.getAdvisedField().getName());
+ assertEquals("number", fieldAccess.getField().getName());
assertFalse(fieldAccess.isRead());
}
@@ -130,7 +130,7 @@
JoinPointAspect.finallyJoinPoint);
assertTrue(JoinPointAspect.beforeJoinPoint instanceof FieldAccess);
FieldAccess fieldAccess = (FieldAccess) JoinPointAspect.beforeJoinPoint;
- assertEquals("text", fieldAccess.getAdvisedField().getName());
+ assertEquals("text", fieldAccess.getField().getName());
assertFalse(fieldAccess.isRead());
}
@@ -148,7 +148,7 @@
assertTrue(JoinPointAspect.afterJoinPoint instanceof FieldAccess);
FieldAccess fieldAccess = (FieldAccess) JoinPointAspect.afterJoinPoint;
- assertEquals("text", fieldAccess.getAdvisedField().getName());
+ assertEquals("text", fieldAccess.getField().getName());
assertTrue(fieldAccess.isRead());
}
@@ -166,8 +166,8 @@
assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
MethodExecution joinPoint = (MethodExecution)JoinPointAspect.beforeJoinPoint;
- assertEquals("method1", joinPoint.getAdvisedMethod().getName());
- assertEquals(MethodHashing.methodHash(joinPoint.getAdvisedMethod()),
+ assertEquals("method1", joinPoint.getMethod().getName());
+ assertEquals(MethodHashing.methodHash(joinPoint.getMethod()),
joinPoint.getHash());
}
@@ -186,8 +186,8 @@
assertSame(JoinPointAspect.beforeJoinPoint, JoinPointAspect.afterJoinPoint);
assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
MethodExecution joinPoint = (MethodExecution) JoinPointAspect.beforeJoinPoint;
- assertEquals("method2", joinPoint.getAdvisedMethod().getName());
- assertEquals(MethodHashing.methodHash(joinPoint.getAdvisedMethod()),
+ assertEquals("method2", joinPoint.getMethod().getName());
+ assertEquals(MethodHashing.methodHash(joinPoint.getMethod()),
joinPoint.getHash());
}
@@ -217,8 +217,8 @@
JoinPointAspect.throwingJoinPoint);
assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
MethodExecution joinPoint = (MethodExecution) JoinPointAspect.beforeJoinPoint;
- assertEquals("method2", joinPoint.getAdvisedMethod().getName());
- assertEquals(MethodHashing.methodHash(joinPoint.getAdvisedMethod()),
+ assertEquals("method2", joinPoint.getMethod().getName());
+ assertEquals(MethodHashing.methodHash(joinPoint.getMethod()),
joinPoint.getHash());
}
@@ -246,8 +246,8 @@
assertTrue(JoinPointAspect.beforeJoinPoint instanceof MethodExecution);
MethodExecution joinPoint = (MethodExecution) JoinPointAspect.beforeJoinPoint;
- assertEquals("method3", joinPoint.getAdvisedMethod().getName());
- assertEquals(MethodHashing.methodHash(joinPoint.getAdvisedMethod()),
+ assertEquals("method3", joinPoint.getMethod().getName());
+ assertEquals(MethodHashing.methodHash(joinPoint.getMethod()),
joinPoint.getHash());
}
@@ -277,8 +277,8 @@
JoinPointAspect.finallyJoinPoint);
assertTrue(JoinPointAspect.throwingJoinPoint instanceof MethodExecution);
MethodExecution joinPoint = (MethodExecution) JoinPointAspect.throwingJoinPoint;
- assertEquals("method4", joinPoint.getAdvisedMethod().getName());
- assertEquals(MethodHashing.methodHash(joinPoint.getAdvisedMethod()),
+ assertEquals("method4", joinPoint.getMethod().getName());
+ assertEquals(MethodHashing.methodHash(joinPoint.getMethod()),
joinPoint.getHash());
}
@@ -329,8 +329,8 @@
assertTrue(JoinPointAspect.throwingJoinPoint instanceof MethodExecution);
MethodExecution joinPoint = (MethodExecution) JoinPointAspect.throwingJoinPoint;
- assertEquals("method6", joinPoint.getAdvisedMethod().getName());
- assertEquals(MethodHashing.methodHash(joinPoint.getAdvisedMethod()),
+ assertEquals("method6", joinPoint.getMethod().getName());
+ assertEquals(MethodHashing.methodHash(joinPoint.getMethod()),
joinPoint.getHash());
}
@@ -350,8 +350,8 @@
assertSame(JoinPointPOJO.class, joinPoint.getConstructor().getDeclaringClass());
assertSame(JoinPointPOJO.class, joinPoint.getCalledClass());
assertSame(JoinPointPOJO.class, joinPoint.getCallingClass());
- assertSame(JoinPointPOJO.class, joinPoint.getCalling().getDeclaringClass());
- Class[] callerParameters = joinPoint.getCalling().getParameterTypes();
+ assertSame(JoinPointPOJO.class, joinPoint.getCallingConstructor().getDeclaringClass());
+ Class[] callerParameters = joinPoint.getCallingConstructor().getParameterTypes();
assertEquals(2, callerParameters.length);
assertSame(int.class, callerParameters[0]);
assertSame(boolean.class, callerParameters[1]);
@@ -381,8 +381,8 @@
assertSame(JoinPointPOJO.class, joinPoint.getConstructor().getDeclaringClass());
assertSame(JoinPointPOJO.class, joinPoint.getCalledClass());
assertSame(JoinPointPOJO.class, joinPoint.getCallingClass());
- assertSame(JoinPointPOJO.class, joinPoint.getCalling().getDeclaringClass());
- Class[] callerParameters = joinPoint.getCalling().getParameterTypes();
+ assertSame(JoinPointPOJO.class, joinPoint.getCallingConstructor().getDeclaringClass());
+ Class[] callerParameters = joinPoint.getCallingConstructor().getParameterTypes();
assertEquals(2, callerParameters.length);
assertSame(int.class, callerParameters[0]);
assertSame(boolean.class, callerParameters[1]);
@@ -516,8 +516,8 @@
assertSame(JoinPointPOJO.class, joinPoint.getMethod().getDeclaringClass());
assertSame(JoinPointPOJO.class, joinPoint.getCalledClass());
assertSame(JoinPointPOJO.class, joinPoint.getCallingClass());
- assertSame(JoinPointPOJO.class, joinPoint.getCalling().getDeclaringClass());
- Class[] callerParameters = joinPoint.getCalling().getParameterTypes();
+ assertSame(JoinPointPOJO.class, joinPoint.getCallingConstructor().getDeclaringClass());
+ Class[] callerParameters = joinPoint.getCallingConstructor().getParameterTypes();
assertEquals(2, callerParameters.length);
assertSame(boolean.class, callerParameters[0]);
assertSame(boolean.class, callerParameters[1]);
@@ -550,8 +550,8 @@
assertSame(JoinPointPOJO.class, joinPoint.getMethod().getDeclaringClass());
assertSame(JoinPointPOJO.class, joinPoint.getCalledClass());
assertSame(JoinPointPOJO.class, joinPoint.getCallingClass());
- assertSame(JoinPointPOJO.class, joinPoint.getCalling().getDeclaringClass());
- Class[] callerParameters = joinPoint.getCalling().getParameterTypes();
+ assertSame(JoinPointPOJO.class, joinPoint.getCallingConstructor().getDeclaringClass());
+ Class[] callerParameters = joinPoint.getCallingConstructor().getParameterTypes();
assertEquals(2, callerParameters.length);
assertSame(boolean.class, callerParameters[0]);
assertSame(boolean.class, callerParameters[1]);
@@ -701,8 +701,8 @@
assertSame(JoinPointPOJO.class, joinPoint.getMethod().getDeclaringClass());
assertSame(JoinPointPOJO.class, joinPoint.getCalledClass());
assertSame(JoinPointPOJO.class, joinPoint.getCallingClass());
- assertSame(JoinPointPOJO.class, joinPoint.getCalling().getDeclaringClass());
- Class[] callerParameters = joinPoint.getCalling().getParameterTypes();
+ assertSame(JoinPointPOJO.class, joinPoint.getCallingConstructor().getDeclaringClass());
+ Class[] callerParameters = joinPoint.getCallingConstructor().getParameterTypes();
assertEquals(2, callerParameters.length);
assertSame(char.class, callerParameters[0]);
assertSame(boolean.class, callerParameters[1]);
@@ -735,8 +735,8 @@
assertSame(JoinPointPOJO.class, joinPoint.getMethod().getDeclaringClass());
assertSame(JoinPointPOJO.class, joinPoint.getCalledClass());
assertSame(JoinPointPOJO.class, joinPoint.getCallingClass());
- assertSame(JoinPointPOJO.class, joinPoint.getCalling().getDeclaringClass());
- Class[] callerParameters = joinPoint.getCalling().getParameterTypes();
+ assertSame(JoinPointPOJO.class, joinPoint.getCallingConstructor().getDeclaringClass());
+ Class[] callerParameters = joinPoint.getCallingConstructor().getParameterTypes();
assertEquals(2, callerParameters.length);
assertSame(char.class, callerParameters[0]);
assertSame(boolean.class, callerParameters[1]);
More information about the jboss-cvs-commits
mailing list