Cleanup of remaining direct BeanWrapper usage

Issue: SPR-14121
(cherry picked from commit 157dcab)

Author: jhoeller

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -87,10 +87,10 @@ public abstract class AbstractNestablePropertyAccessor extends AbstractPropertyA
 		}
 	}
 
+
 	private int autoGrowCollectionLimit = Integer.MAX_VALUE;
 
-	/** The wrapped object */
-	private Object object;
+	private Object wrappedObject;
 
 	private String nestedPath = "";
 
@@ -204,23 +204,23 @@ public void setWrappedInstance(Object object) {
 	public void setWrappedInstance(Object object, String nestedPath, Object rootObject) {
 		Assert.notNull(object, "Target object must not be null");
 		if (object.getClass() == javaUtilOptionalClass) {
-			this.object = OptionalUnwrapper.unwrap(object);
+			this.wrappedObject = OptionalUnwrapper.unwrap(object);
 		}
 		else {
-			this.object = object;
+			this.wrappedObject = object;
 		}
 		this.nestedPath = (nestedPath != null ? nestedPath : "");
-		this.rootObject = (!"".equals(this.nestedPath) ? rootObject : this.object);
+		this.rootObject = (!"".equals(this.nestedPath) ? rootObject : this.wrappedObject);
 		this.nestedPropertyAccessors = null;
-		this.typeConverterDelegate = new TypeConverterDelegate(this, this.object);
+		this.typeConverterDelegate = new TypeConverterDelegate(this, this.wrappedObject);
 	}
 
 	public final Object getWrappedInstance() {
-		return this.object;
+		return this.wrappedObject;
 	}
 
 	public final Class<?> getWrappedClass() {
-		return (this.object != null ? this.object.getClass() : null);
+		return (this.wrappedObject != null ? this.wrappedObject.getClass() : null);
 	}
 
 	/**
@@ -303,7 +303,7 @@ protected void setPropertyValue(PropertyTokenHolder tokens, PropertyValue pv) th
 			catch (NotReadablePropertyException ex) {
 				throw new NotWritablePropertyException(getRootClass(), this.nestedPath + propertyName,
 						"Cannot access indexed value in property referenced " +
-								"in indexed property path '" + propertyName + "'", ex);
+						"in indexed property path '" + propertyName + "'", ex);
 			}
 			// Set value for last key.
 			String key = tokens.keys[tokens.keys.length - 1];
@@ -318,7 +318,7 @@ protected void setPropertyValue(PropertyTokenHolder tokens, PropertyValue pv) th
 				else {
 					throw new NullValueInNestedPathException(getRootClass(), this.nestedPath + propertyName,
 							"Cannot access indexed value in property referenced " +
-									"in indexed property path '" + propertyName + "': returned null");
+							"in indexed property path '" + propertyName + "': returned null");
 				}
 			}
 			if (propValue.getClass().isArray()) {
@@ -367,8 +367,8 @@ else if (propValue instanceof List) {
 						catch (NullPointerException ex) {
 							throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 									"Cannot set element with index " + index + " in List of size " +
-											size + ", accessed using property path '" + propertyName +
-											"': List does not support filling up gaps with null elements");
+									size + ", accessed using property path '" + propertyName +
+									"': List does not support filling up gaps with null elements");
 						}
 					}
 					list.add(convertedValue);
@@ -405,7 +405,7 @@ else if (propValue instanceof Map) {
 			else {
 				throw new InvalidPropertyException(getRootClass(), this.nestedPath + propertyName,
 						"Property referenced in indexed property path '" + propertyName +
-								"' is neither an array nor a List nor a Map; returned value was [" + propValue + "]");
+						"' is neither an array nor a List nor a Map; returned value was [" + propValue + "]");
 			}
 		}
 
@@ -451,7 +451,7 @@ else if (propValue instanceof Map) {
 					}
 					pv.getOriginalPropertyValue().conversionNecessary = (valueToApply != originalValue);
 				}
-				ph.setValue(object, valueToApply);
+				ph.setValue(this.wrappedObject, valueToApply);
 			}
 			catch (TypeMismatchException ex) {
 				throw ex;
@@ -953,10 +953,9 @@ private PropertyTokenHolder getPropertyNameTokens(String propertyName) {
 		tokens.actualName = (actualName != null ? actualName : propertyName);
 		tokens.canonicalName = tokens.actualName;
 		if (!keys.isEmpty()) {
-			tokens.canonicalName +=
-					PROPERTY_KEY_PREFIX +
-							StringUtils.collectionToDelimitedString(keys, PROPERTY_KEY_SUFFIX + PROPERTY_KEY_PREFIX) +
-							PROPERTY_KEY_SUFFIX;
+			tokens.canonicalName += PROPERTY_KEY_PREFIX +
+					StringUtils.collectionToDelimitedString(keys, PROPERTY_KEY_SUFFIX + PROPERTY_KEY_PREFIX) +
+					PROPERTY_KEY_SUFFIX;
 			tokens.keys = StringUtils.toStringArray(keys);
 		}
 		return tokens;
@@ -965,8 +964,8 @@ private PropertyTokenHolder getPropertyNameTokens(String propertyName) {
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder(getClass().getName());
-		if (this.object != null) {
-			sb.append(": wrapping object [").append(ObjectUtils.identityToString(this.object)).append("]");
+		if (this.wrappedObject != null) {
+			sb.append(": wrapping object [").append(ObjectUtils.identityToString(this.wrappedObject)).append("]");
 		}
 		else {
 			sb.append(": no wrapped object set");

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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,6 +48,19 @@
  */
 public interface BeanWrapper extends ConfigurablePropertyAccessor {
 
+	/**
+	 * Specify a limit for array and collection auto-growing.
+	 * <p>Default is unlimited on a plain BeanWrapper.
+	 * @since 4.1
+	 */
+	void setAutoGrowCollectionLimit(int autoGrowCollectionLimit);
+
+	/**
+	 * Return the limit for array and collection auto-growing.
+	 * @since 4.1
+	 */
+	int getAutoGrowCollectionLimit();
+
 	/**
 	 * Return the bean instance wrapped by this object, if any.
 	 * @return the bean instance, or {@code null} if none set
@@ -78,15 +91,4 @@ public interface BeanWrapper extends ConfigurablePropertyAccessor {
 	 */
 	PropertyDescriptor getPropertyDescriptor(String propertyName) throws InvalidPropertyException;
 
-	/**
-	 * Specify a limit for array and collection auto-growing.
-	 * <p>Default is unlimited on a plain BeanWrapper.
-	 */
-	void setAutoGrowCollectionLimit(int autoGrowCollectionLimit);
-
-	/**
-	 * Return the limit for array and collection auto-growing.
-	 */
-	int getAutoGrowCollectionLimit();
-
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -136,23 +136,7 @@ private BeanWrapperImpl(Object object, String nestedPath, BeanWrapperImpl parent
 	@Override
 	public void setWrappedInstance(Object object, String nestedPath, Object rootObject) {
 		super.setWrappedInstance(object, nestedPath, rootObject);
-		setIntrospectionClass(getWrappedInstance().getClass());
-	}
-
-	/**
-	 * Set the security context used during the invocation of the wrapped instance methods.
-	 * Can be null.
-	 */
-	public void setSecurityContext(AccessControlContext acc) {
-		this.acc = acc;
-	}
-
-	/**
-	 * Return the security context used during the invocation of the wrapped instance methods.
-	 * Can be null.
-	 */
-	public AccessControlContext getSecurityContext() {
-		return this.acc;
+		setIntrospectionClass(getWrappedClass());
 	}
 
 	/**
@@ -161,8 +145,7 @@ public AccessControlContext getSecurityContext() {
 	 * @param clazz the class to introspect
 	 */
 	protected void setIntrospectionClass(Class<?> clazz) {
-		if (this.cachedIntrospectionResults != null &&
-				!clazz.equals(this.cachedIntrospectionResults.getBeanClass())) {
+		if (this.cachedIntrospectionResults != null && this.cachedIntrospectionResults.getBeanClass() != clazz) {
 			this.cachedIntrospectionResults = null;
 		}
 	}
@@ -179,6 +162,22 @@ private CachedIntrospectionResults getCachedIntrospectionResults() {
 		return this.cachedIntrospectionResults;
 	}
 
+	/**
+	 * Set the security context used during the invocation of the wrapped instance methods.
+	 * Can be null.
+	 */
+	public void setSecurityContext(AccessControlContext acc) {
+		this.acc = acc;
+	}
+
+	/**
+	 * Return the security context used during the invocation of the wrapped instance methods.
+	 * Can be null.
+	 */
+	public AccessControlContext getSecurityContext() {
+		return this.acc;
+	}
+
 
 	/**
 	 * Convert the given value for the specified property to the latter's type.

spring-context-support/src/main/java/org/springframework/scheduling/quartz/SpringBeanJobFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -72,8 +72,8 @@ public void setSchedulerContext(SchedulerContext schedulerContext) {
 	@Override
 	protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception {
 		Object job = super.createJobInstance(bundle);
-		BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(job);
-		if (isEligibleForPropertyPopulation(bw.getWrappedInstance())) {
+		if (isEligibleForPropertyPopulation(job)) {
+			BeanWrapper bw = PropertyAccessorFactory.forBeanPropertyAccess(job);
 			MutablePropertyValues pvs = new MutablePropertyValues();
 			if (this.schedulerContext != null) {
 				pvs.addPropertyValues(this.schedulerContext);

spring-context/src/main/java/org/springframework/scheduling/config/ExecutorBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2009 the original author or authors.
+ * Copyright 2002-2016 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.
@@ -61,9 +61,6 @@ private void configureRejectionPolicy(Element element, BeanDefinitionBuilder bui
 			return;
 		}
 		String prefix = "java.util.concurrent.ThreadPoolExecutor.";
-		if (builder.getRawBeanDefinition().getBeanClassName().contains("backport")) {
-			prefix = "edu.emory.mathcs.backport." + prefix;
-		}
 		String policyClassName;
 		if (rejectionPolicy.equals("ABORT")) {
 			policyClassName = prefix + "AbortPolicy";