root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

relaxed @AspectJ detection check (for CGLIB subclasses to still be recognized as an aspect)

This commit is contained in:
Juergen Hoeller 2009-04-17 17:32:29 +00:00
parent 56a48272e6
commit 3e63951a57
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
View File

@ -112,12 +112,11 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
* when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP. * when compiled by ajc with the -1.5 flag, yet they cannot be consumed by Spring AOP.
*/ */
public boolean isAspect(Class<?> clazz) { public boolean isAspect(Class<?> clazz) {
return (AjTypeSystem.getAjType(clazz).isAspect() && return (hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
hasAspectAnnotation(clazz) && !compiledByAjc(clazz));
} }
private boolean hasAspectAnnotation(Class<?> clazz) { private boolean hasAspectAnnotation(Class<?> clazz) {
return clazz.isAnnotationPresent(Aspect.class); return (AnnotationUtils.findAnnotation(clazz, Aspect.class) != null);
} }
/** /**

18
org.springframework.aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2006 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -67,13 +67,23 @@ public class AspectMetadata {
* @param aspectClass the aspect class * @param aspectClass the aspect class
* @param aspectName the name of the aspect * @param aspectName the name of the aspect
*/ */
public AspectMetadata(Class aspectClass, String aspectName) { public AspectMetadata(Class<?> aspectClass, String aspectName) {
this.aspectName = aspectName; this.aspectName = aspectName;
this.ajType = AjTypeSystem.getAjType(aspectClass);
if (!this.ajType.isAspect()) { Class<?> currClass = aspectClass;
AjType ajType = null;
while (!currClass.equals(Object.class)) {
AjType ajTypeToCheck = AjTypeSystem.getAjType(currClass);
if (ajTypeToCheck.isAspect()) {
ajType = ajTypeToCheck;
break;
}
currClass = currClass.getSuperclass();
}
if (ajType == null) {
throw new IllegalArgumentException("Class '" + aspectClass.getName() + "' is not an @AspectJ aspect"); throw new IllegalArgumentException("Class '" + aspectClass.getName() + "' is not an @AspectJ aspect");
} }
this.ajType = ajType;
if (this.ajType.getDeclarePrecedence().length > 0) { if (this.ajType.getDeclarePrecedence().length > 0) {
throw new IllegalArgumentException("DeclarePrecendence not presently supported in Spring AOP"); throw new IllegalArgumentException("DeclarePrecendence not presently supported in Spring AOP");
} }