Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source
This commit is contained in:
Juergen Hoeller
2018-08-09 01:41:45 +02:00
parent f3184a0878
commit d8d04d82c1
3 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactory.java
View File

@@ -60,6 +60,9 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
private static final String AJC_MAGIC = "ajc$"; private static final String AJC_MAGIC = "ajc$";
private static final Class<?>[] ASPECTJ_ANNOTATION_CLASSES = new Class<?>[] {
Pointcut.class, Before.class, Around.class, After.class, AfterReturning.class, AfterThrowing.class};
/** Logger available to subclasses */ /** Logger available to subclasses */
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
@@ -128,9 +131,7 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Nullable @Nullable
protected static AspectJAnnotation<?> findAspectJAnnotationOnMethod(Method method) { protected static AspectJAnnotation<?> findAspectJAnnotationOnMethod(Method method) {
Class<?>[] classesToLookFor = new Class<?>[] { for (Class<?> clazz : ASPECTJ_ANNOTATION_CLASSES) {
Before.class, Around.class, After.class, AfterReturning.class, AfterThrowing.class, Pointcut.class};
for (Class<?> clazz : classesToLookFor) {
AspectJAnnotation<?> foundAnnotation = findAnnotation(method, (Class<Annotation>) clazz); AspectJAnnotation<?> foundAnnotation = findAnnotation(method, (Class<Annotation>) clazz);
if (foundAnnotation != null) { if (foundAnnotation != null) {
return foundAnnotation; return foundAnnotation;
@@ -171,17 +172,17 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
*/ */
protected static class AspectJAnnotation<A extends Annotation> { protected static class AspectJAnnotation<A extends Annotation> {
private static final String[] EXPRESSION_PROPERTIES = new String[] {"value", "pointcut"}; private static final String[] EXPRESSION_ATTRIBUTES = new String[] {"pointcut", "value"};
private static Map<Class<?>, AspectJAnnotationType> annotationTypes = new HashMap<>(); private static Map<Class<?>, AspectJAnnotationType> annotationTypeMap = new HashMap<>(8);
static { static {
annotationTypes.put(Pointcut.class,AspectJAnnotationType.AtPointcut); annotationTypeMap.put(Pointcut.class, AspectJAnnotationType.AtPointcut);
annotationTypes.put(After.class,AspectJAnnotationType.AtAfter); annotationTypeMap.put(Before.class, AspectJAnnotationType.AtBefore);
annotationTypes.put(AfterReturning.class,AspectJAnnotationType.AtAfterReturning); annotationTypeMap.put(After.class, AspectJAnnotationType.AtAfter);
annotationTypes.put(AfterThrowing.class,AspectJAnnotationType.AtAfterThrowing); annotationTypeMap.put(AfterReturning.class, AspectJAnnotationType.AtAfterReturning);
annotationTypes.put(Around.class,AspectJAnnotationType.AtAround); annotationTypeMap.put(AfterThrowing.class, AspectJAnnotationType.AtAfterThrowing);
annotationTypes.put(Before.class,AspectJAnnotationType.AtBefore); annotationTypeMap.put(Around.class, AspectJAnnotationType.AtAround);
} }
private final A annotation; private final A annotation;
@@ -202,33 +203,23 @@ public abstract class AbstractAspectJAdvisorFactory implements AspectJAdvisorFac
this.argumentNames = (String) annotation.getClass().getMethod("argNames").invoke(annotation); this.argumentNames = (String) annotation.getClass().getMethod("argNames").invoke(annotation);
} }
catch (Exception ex) { catch (Exception ex) {
throw new IllegalArgumentException(annotation + " cannot be an AspectJ annotation", ex); throw new IllegalArgumentException(annotation + " is not a valid AspectJ annotation", ex);
} }
} }
private AspectJAnnotationType determineAnnotationType(A annotation) { private AspectJAnnotationType determineAnnotationType(A annotation) {
for (Class<?> type : annotationTypes.keySet()) { AspectJAnnotationType type = annotationTypeMap.get(annotation.annotationType());
if (type.isInstance(annotation)) { if (type != null) {
return annotationTypes.get(type); return type;
}
} }
throw new IllegalStateException("Unknown annotation type: " + annotation.toString()); throw new IllegalStateException("Unknown annotation type: " + annotation);
} }
private String resolveExpression(A annotation) throws Exception { private String resolveExpression(A annotation) {
for (String methodName : EXPRESSION_PROPERTIES) { for (String attributeName : EXPRESSION_ATTRIBUTES) {
Method method; String candidate = (String) AnnotationUtils.getValue(annotation, attributeName);
try { if (StringUtils.hasText(candidate)) {
method = annotation.getClass().getDeclaredMethod(methodName); return candidate;
}
catch (NoSuchMethodException ex) {
method = null;
}
if (method != null) {
String candidate = (String) method.invoke(annotation);
if (StringUtils.hasText(candidate)) {
return candidate;
}
} }
} }
throw new IllegalStateException("Failed to resolve expression: " + annotation); throw new IllegalStateException("Failed to resolve expression: " + annotation);

4
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ControllerMethodResolver.java
View File

@@ -78,8 +78,8 @@ class ControllerMethodResolver {
* MethodFilter that matches {@link ModelAttribute @ModelAttribute} methods. * MethodFilter that matches {@link ModelAttribute @ModelAttribute} methods.
*/ */
private static final MethodFilter MODEL_ATTRIBUTE_METHODS = method -> private static final MethodFilter MODEL_ATTRIBUTE_METHODS = method ->
(AnnotationUtils.findAnnotation(method, RequestMapping.class) == null) && (AnnotationUtils.findAnnotation(method, RequestMapping.class) == null &&
(AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null); AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null);
private static Log logger = LogFactory.getLog(ControllerMethodResolver.class); private static Log logger = LogFactory.getLog(ControllerMethodResolver.class);

4
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java
View File

@@ -124,8 +124,8 @@ public class RequestMappingHandlerAdapter extends AbstractHandlerMethodAdapter
* MethodFilter that matches {@link ModelAttribute @ModelAttribute} methods. * MethodFilter that matches {@link ModelAttribute @ModelAttribute} methods.
*/ */
public static final MethodFilter MODEL_ATTRIBUTE_METHODS = method -> public static final MethodFilter MODEL_ATTRIBUTE_METHODS = method ->
((AnnotationUtils.findAnnotation(method, RequestMapping.class) == null) && (AnnotationUtils.findAnnotation(method, RequestMapping.class) == null &&
(AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null)); AnnotationUtils.findAnnotation(method, ModelAttribute.class) != null);
@Nullable @Nullable