Replace use of commons-beanutils with Spring BeanWrapper

Signed-off-by: Roy Clarkson <roy.clarkson@broadcom.com>

Author: royclarkson

build.gradle

@@ -16,9 +16,6 @@
 
 buildscript {
 	ext {
-		// External Dependencies
-		beanUtilsVersion = "1.11.0"
-
 		// Test Dependencies
 		springCloudContractVersion = "5.0.2"
 		equalsVerifierVersion = "4.4.2"

spring-cloud-open-service-broker-core/build.gradle

@@ -34,7 +34,6 @@ dependencies {
 	api 'io.projectreactor:reactor-core'
 	api 'tools.jackson.core:jackson-databind'
 	api 'org.hibernate.validator:hibernate-validator'
-	api "commons-beanutils:commons-beanutils:${beanUtilsVersion}"
 	api 'org.slf4j:slf4j-api'
 	testImplementation 'org.springframework:spring-test'
 	testImplementation 'io.projectreactor:reactor-test'

spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/instance/AsyncParameterizedServiceInstanceRequest.java

@@ -112,6 +112,7 @@ public Map<String, Object> getParameters() {
 	 * @param <T> the type of the object to instantiate and populate
 	 * @return the instantiated and populated object
 	 */
+	@SuppressWarnings("deprecation")
 	public <T> T getParameters(Class<T> cls) {
 		return ParameterBeanMapperUtils.mapParametersToBean(this.parameters, cls);
 	}

spring-cloud-open-service-broker-core/src/main/java/org/springframework/cloud/servicebroker/model/util/ParameterBeanMapperUtils.java

@@ -19,14 +19,18 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Map;
 
-import org.apache.commons.beanutils.BeanUtilsBean;
-import org.apache.commons.beanutils.SuppressPropertiesBeanIntrospector;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.MutablePropertyValues;
 
 /**
  * Utilities for mapping parameter maps to Java beans.
  *
  * @author Scott Frederick
+ * @deprecated since 5.0.0 in favor of using Spring's {@link BeanWrapper} directly
  */
+@Deprecated(since = "5.0.0")
 public final class ParameterBeanMapperUtils {
 
 	private ParameterBeanMapperUtils() {
@@ -45,13 +49,13 @@ public static <T> T mapParametersToBean(Map<String, Object> parameters, Class<T>
 		try {
 			T bean = cls.getDeclaredConstructor().newInstance();
 
-			BeanUtilsBean beanUtils = new BeanUtilsBean();
-			beanUtils.getPropertyUtils().addBeanIntrospector(SuppressPropertiesBeanIntrospector.SUPPRESS_CLASS);
-			beanUtils.populate(bean, parameters);
+			BeanWrapper wrapper = new BeanWrapperImpl(bean);
+			wrapper.setPropertyValues(new MutablePropertyValues(parameters), true);
 
 			return bean;
 		}
-		catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException ex) {
+		catch (NoSuchMethodException | InstantiationException | IllegalAccessException | InvocationTargetException
+				| BeansException ex) {
 			throw new IllegalArgumentException("Error mapping parameters to class of type " + cls.getName(), ex);
 		}
 	}

spring-cloud-open-service-broker-core/src/test/java/org/springframework/cloud/servicebroker/model/util/ParameterBeanMapperUtilsTests.java

@@ -26,6 +26,7 @@
 class ParameterBeanMapperUtilsTests {
 
 	@Test
+	@SuppressWarnings("deprecation")
 	void mapParametersToBean() {
 		Map<String, Object> parameters = new HashMap<>();
 		parameters.put("stringProperty", "value1");