Consistent equals/hashCode/toString implementations in AnnotationMatchingPointcut/ClassFilter/MethodMatcher

Issue: SPR-11275
Issue: SPR-11276

Author: jhoeller

spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationClassFilter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -66,4 +66,26 @@ public boolean matches(Class<?> clazz) {
 				clazz.isAnnotationPresent(this.annotationType));
 	}
 
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof AnnotationClassFilter)) {
+			return false;
+		}
+		AnnotationClassFilter otherCf = (AnnotationClassFilter) other;
+		return (this.annotationType.equals(otherCf.annotationType) && this.checkInherited == otherCf.checkInherited);
+	}
+
+	@Override
+	public int hashCode() {
+		return this.annotationType.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getName() + ": " + this.annotationType;
+	}
+
 }

spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMatchingPointcut.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -22,6 +22,7 @@
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Simple Pointcut that looks for a specific Java 5 annotation
@@ -100,6 +101,36 @@ public MethodMatcher getMethodMatcher() {
 		return this.methodMatcher;
 	}
 
+	@Override
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (!(other instanceof AnnotationMatchingPointcut)) {
+			return false;
+		}
+		AnnotationMatchingPointcut that = (AnnotationMatchingPointcut) other;
+		return ObjectUtils.nullSafeEquals(that.classFilter, this.classFilter) &&
+				ObjectUtils.nullSafeEquals(that.methodMatcher, this.methodMatcher);
+	}
+
+	@Override
+	public int hashCode() {
+		int code = 17;
+		if (this.classFilter != null) {
+			code = 37 * code + this.classFilter.hashCode();
+		}
+		if (this.methodMatcher != null) {
+			code = 37 * code + this.methodMatcher.hashCode();
+		}
+		return code;
+	}
+
+	@Override
+	public String toString() {
+		return "AnnotationMatchingPointcut: " + this.classFilter + ", " +this.methodMatcher;
+	}
+
 
 	/**
 	 * Factory method for an AnnotationMatchingPointcut that matches

spring-aop/src/main/java/org/springframework/aop/support/annotation/AnnotationMethodMatcher.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -74,4 +74,9 @@ public int hashCode() {
 		return this.annotationType.hashCode();
 	}
 
+	@Override
+	public String toString() {
+		return getClass().getName() + ": " + this.annotationType;
+	}
+
 }

spring-context/src/main/java/org/springframework/scheduling/annotation/AsyncAnnotationAdvisor.java

@@ -143,7 +143,7 @@ protected Pointcut buildPointcut(Set<Class<? extends Annotation>> asyncAnnotatio
 		ComposablePointcut result = null;
 		for (Class<? extends Annotation> asyncAnnotationType : asyncAnnotationTypes) {
 			Pointcut cpc = new AnnotationMatchingPointcut(asyncAnnotationType, true);
-			Pointcut mpc = new AnnotationMatchingPointcut(null, asyncAnnotationType);
+			Pointcut mpc = AnnotationMatchingPointcut.forMethodAnnotation(asyncAnnotationType);
 			if (result == null) {
 				result = new ComposablePointcut(cpc).union(mpc);
 			}