Remove outdated abstractions/delegates from core/util

Issue: SPR-15159

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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,8 +22,6 @@
 import org.springframework.aop.ClassFilter;
 import org.springframework.aop.MethodMatcher;
 import org.springframework.aop.Pointcut;
-import org.springframework.core.ControlFlow;
-import org.springframework.core.ControlFlowFactory;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -34,7 +32,7 @@
  *
  * @author Rod Johnson
  * @author Rob Harrop
- * @see org.springframework.core.ControlFlow
+ * @author Juergen Hoeller
  */
 @SuppressWarnings("serial")
 public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher, Serializable {
@@ -43,7 +41,7 @@ public class ControlFlowPointcut implements Pointcut, ClassFilter, MethodMatcher
 
 	private String methodName;
 
-	private int evaluations;
+	private volatile int evaluations;
 
 
 	/**
@@ -55,11 +53,11 @@ public ControlFlowPointcut(Class<?> clazz) {
 	}
 
 	/**
-	 * Construct a new pointcut that matches all calls below the
-	 * given method in the given class. If the method name is null,
-	 * matches all control flows below that class.
+	 * Construct a new pointcut that matches all calls below the given method
+	 * in the given class. If no method name is given, matches all control flows
+	 * below the given class.
 	 * @param clazz the clazz
-	 * @param methodName the name of the method
+	 * @param methodName the name of the method (may be {@code null})
 	 */
 	public ControlFlowPointcut(Class<?> clazz, String methodName) {
 		Assert.notNull(clazz, "Class must not be null");
@@ -93,8 +91,14 @@ public boolean isRuntime() {
 	@Override
 	public boolean matches(Method method, Class<?> targetClass, Object... args) {
 		this.evaluations++;
-		ControlFlow cflow = ControlFlowFactory.createControlFlow();
-		return (this.methodName != null ? cflow.under(this.clazz, this.methodName) : cflow.under(this.clazz));
+
+		for (StackTraceElement element : new Throwable().getStackTrace()) {
+			if (element.getClassName().equals(this.clazz.getName()) &&
+					(this.methodName == null || element.getMethodName().equals(this.methodName))) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	/**
@@ -130,8 +134,7 @@ public boolean equals(Object other) {
 
 	@Override
 	public int hashCode() {
-		int code = 17;
-		code = 37 * code + this.clazz.hashCode();
+		int code = this.clazz.hashCode();
 		if (this.methodName != null) {
 			code = 37 * code + this.methodName.hashCode();
 		}

spring-beans/src/main/java/org/springframework/beans/PropertyAccessException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -18,8 +18,6 @@
 
 import java.beans.PropertyChangeEvent;
 
-import org.springframework.core.ErrorCoded;
-
 /**
  * Superclass for exceptions related to a property access,
  * such as type mismatch or invocation target exception.
@@ -28,7 +26,7 @@
  * @author Juergen Hoeller
  */
 @SuppressWarnings("serial")
-public abstract class PropertyAccessException extends BeansException implements ErrorCoded {
+public abstract class PropertyAccessException extends BeansException {
 
 	private transient PropertyChangeEvent propertyChangeEvent;
 
@@ -77,4 +75,9 @@ public Object getValue() {
 		return (this.propertyChangeEvent != null ? this.propertyChangeEvent.getNewValue() : null);
 	}
 
+	/**
+	 * Return a corresponding error code for this type of exception.
+	 */
+	public abstract String getErrorCode();
+
 }

spring-core/src/main/java/org/springframework/core/ConstantException.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -333,4 +333,33 @@ public String propertyToConstantNamePrefix(String propertyName) {
 		return parsedPrefix.toString();
 	}
 
+
+	/**
+	 * Exception thrown when the {@link Constants} class is asked for
+	 * an invalid constant name.
+	 */
+	@SuppressWarnings("serial")
+	public static class ConstantException extends IllegalArgumentException {
+
+		/**
+		 * Thrown when an invalid constant name is requested.
+		 * @param className name of the class containing the constant definitions
+		 * @param field invalid constant name
+		 * @param message description of the problem
+		 */
+		public ConstantException(String className, String field, String message) {
+			super("Field '" + field + "' " + message + " in class [" + className + "]");
+		}
+
+		/**
+		 * Thrown when an invalid constant value is looked up.
+		 * @param className name of the class containing the constant definitions
+		 * @param namePrefix prefix of the searched constant names
+		 * @param value the looked up constant value
+		 */
+		public ConstantException(String className, String namePrefix, Object value) {
+			super("No '" + namePrefix + "' field with value '" + value + "' found in class [" + className + "]");
+		}
+	}
+
 }