/*
 * Copyright 2002-2006 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.springframework.aop.support.annotation;

import java.lang.annotation.Annotation;
import java.lang.reflect.Method;

import org.springframework.aop.support.StaticMethodMatcher;
import org.springframework.util.Assert;

/**
 * Simple MethodMatcher that looks for a specific Java 5 annotation
 * being present on a method.
 *
 * @author Juergen Hoeller
 * @since 2.0
 */
public class AnnotationMethodMatcher extends StaticMethodMatcher {

	private final Class<? extends Annotation> annotationType;


	/**
	 * Create a new AnnotationClassFilter for the given annotation type.
	 * @param annotationType the annotation type to look for
	 */
	public AnnotationMethodMatcher(Class<? extends Annotation> annotationType) {
		Assert.notNull(annotationType, "Annotation type must not be null");
		this.annotationType = annotationType;
	}


	public boolean matches(Method method, Class targetClass) {
		return method.isAnnotationPresent(this.annotationType);
	}

}

@@ -21,9 +21,9 @@
 -200
-6
+7
  the
@@ -742,16 +742,65 @@
 ethod;%0A%0A
+import org.springframework.aop.support.AopUtils;%0A
 import o
@@ -992,16 +992,129 @@
 a method
+ (checking both the method on the invoked%0A * interface, if any, and the corresponding method on the target class)
 .%0A *%0A * 
@@ -1151,16 +1151,51 @@
 nce 2.0%0A
+ * @see AnnotationMatchingPointcut%0A
  */%0Apubl
@@ -1716,16 +1716,293 @@
 %7B%0A%09%09
-return m
+if (method.isAnnotationPresent(this.annotationType)) %7B%0A%09%09%09return true;%0A%09%09%7D%0A%09%09// The method may be on an interface, so let's check on the target class as well.%0A%09%09Method specificMethod = AopUtils.getMostSpecificMethod(method, targetClass);%0A%09%09return (specificMethod != method && specificM
 etho
@@ -2043,16 +2043,17 @@
 ionType)
+)
 ;%0A%09%7D%0A%0A%7D%0A

check for an annotation on the target method as well