Polishing

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -48,10 +48,11 @@
 public interface MethodMatcher {
 
 	/**
-	 * Perform static checking whether the given method matches. If this
-	 * returns {@code false} or if the {@link #isRuntime()} method
-	 * returns {@code false}, no runtime check (i.e. no.
-	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} call) will be made.
+	 * Perform static checking whether the given method matches.
+	 * <p>If this returns {@code false} or if the {@link #isRuntime()}
+	 * method returns {@code false}, no runtime check (i.e. no
+	 * {@link #matches(java.lang.reflect.Method, Class, Object[])} call)
+	 * will be made.
 	 * @param method the candidate method
 	 * @param targetClass the target class (may be {@code null}, in which case
 	 * the candidate class must be taken to be the method's declaring class)

spring-aop/src/main/java/org/springframework/aop/support/AbstractRegexpMethodPointcut.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -130,8 +130,9 @@ public String[] getExcludedPatterns() {
 	 */
 	@Override
 	public boolean matches(Method method, Class<?> targetClass) {
-		return ((targetClass != null && matchesPattern(ClassUtils.getQualifiedMethodName(method, targetClass))) ||
-				matchesPattern(ClassUtils.getQualifiedMethodName(method)));
+		return ((targetClass != null && targetClass != method.getDeclaringClass() &&
+				matchesPattern(ClassUtils.getQualifiedMethodName(method, targetClass))) ||
+				matchesPattern(ClassUtils.getQualifiedMethodName(method, method.getDeclaringClass())));
 	}
 
 	/**

spring-aop/src/main/java/org/springframework/aop/support/DynamicMethodMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -23,6 +23,8 @@
 /**
  * Convenient abstract superclass for dynamic method matchers,
  * which do care about arguments at runtime.
+ *
+ * @author Rod Johnson
  */
 public abstract class DynamicMethodMatcher implements MethodMatcher {
 

spring-aop/src/main/java/org/springframework/aop/support/RootClassFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -21,7 +21,8 @@
 import org.springframework.aop.ClassFilter;
 
 /**
- * Simple ClassFilter implementation that passes classes (and optionally subclasses)
+ * Simple ClassFilter implementation that passes classes (and optionally subclasses).
+ *
  * @author Rod Johnson
  */
 @SuppressWarnings("serial")
@@ -37,7 +38,7 @@ public RootClassFilter(Class<?> clazz) {
 
 	@Override
 	public boolean matches(Class<?> candidate) {
-		return clazz.isAssignableFrom(candidate);
+		return this.clazz.isAssignableFrom(candidate);
 	}
 
 }

spring-aop/src/main/java/org/springframework/aop/support/StaticMethodMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -23,6 +23,8 @@
 /**
  * Convenient abstract superclass for static method matchers, which don't care
  * about arguments at runtime.
+ *
+ * @author Rod Johnson
  */
 public abstract class StaticMethodMatcher implements MethodMatcher {