Replace BeanUtils.getProperty() by BeanWrapperImpl from Spring Framework.

php-coder · php-coder · commit fcbc2bc3444f · 2016-07-29T20:17:51.000+02:00
@see http://docs.spring.io/spring/docs/4.2.x/spring-framework-reference/html/validation.html#beans-beans No functional changes.
diff --git a/pom.xml b/pom.xml
@@ -16,12 +16,6 @@
 			<version>${thymeleaf.togglz.version}</version>
 		</dependency>
 		
-		<dependency>
-			<groupId>commons-beanutils</groupId>
-			<artifactId>commons-beanutils</artifactId>
-			<version>${commons-beanutils.version}</version>
-		</dependency>
-		
 		<!-- Needed for IOUtils -->
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -358,9 +352,6 @@
 		<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
 		<clean.plugin.version>3.0.0</clean.plugin.version>
 		
-		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
-		<commons-beanutils.version>1.9.2</commons-beanutils.version>
-		
 		<!-- Redefine default value from spring-boot-dependencies (https://git.io/vKAiK) -->
 		<commons-dbcp.version>1.4</commons-dbcp.version>
 		
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatchValidator.java b/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMatchValidator.java
@@ -17,14 +17,16 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.PropertyAccessor;
+
 public class FieldsMatchValidator implements ConstraintValidator<FieldsMatch, Object> {
 	
 	private String firstFieldName;
@@ -43,31 +45,30 @@ public boolean isValid(Object value, ConstraintValidatorContext ctx) {
 			return true;
 		}
 		
-		try {
-			String firstFieldValue  = BeanUtils.getProperty(value, firstFieldName);
-			if (StringUtils.isEmpty(firstFieldValue)) {
-				return true;
-			}
-			
-			String secondFieldValue = BeanUtils.getProperty(value, secondFieldName);
-			if (StringUtils.isEmpty(secondFieldValue)) {
-				return true;
-			}
-			
-			// TODO: check fields only when both fields are equals
-			
-			if (!firstFieldValue.equals(secondFieldValue)) {
-				// bind error message to 2nd field
-				ConstraintViolationUtils.recreate(
-					ctx,
-					secondFieldName,
-					ctx.getDefaultConstraintMessageTemplate()
-				);
-				return false;
-			}
+		PropertyAccessor bean = new BeanWrapperImpl(value);
+		
+		Object firstField      = bean.getPropertyValue(firstFieldName);
+		String firstFieldValue = Objects.toString(firstField, "");
+		if (StringUtils.isEmpty(firstFieldValue)) {
+			return true;
+		}
+		
+		Object secondField      = bean.getPropertyValue(secondFieldName);
+		String secondFieldValue = Objects.toString(secondField, "");
+		if (StringUtils.isEmpty(secondFieldValue)) {
+			return true;
+		}
+		
+		// TODO: check fields only when both fields are equals
 		
-		} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
-			throw new RuntimeException(ex); // NOPMD
+		if (!firstFieldValue.equals(secondFieldValue)) {
+			// bind error message to 2nd field
+			ConstraintViolationUtils.recreate(
+				ctx,
+				secondFieldName,
+				ctx.getDefaultConstraintMessageTemplate()
+			);
+			return false;
 		}
 		
 		return true;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatchValidator.java b/src/main/java/ru/mystamps/web/validation/jsr303/FieldsMismatchValidator.java
@@ -17,14 +17,16 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.PropertyAccessor;
+
 public class FieldsMismatchValidator implements ConstraintValidator<FieldsMismatch, Object> {
 	
 	private String firstFieldName;
@@ -43,31 +45,30 @@ public boolean isValid(Object value, ConstraintValidatorContext ctx) {
 			return true;
 		}
 		
-		try {
-			String firstFieldValue  = BeanUtils.getProperty(value, firstFieldName);
-			if (StringUtils.isEmpty(firstFieldValue)) {
-				return true;
-			}
-			
-			String secondFieldValue = BeanUtils.getProperty(value, secondFieldName);
-			if (StringUtils.isEmpty(secondFieldValue)) {
-				return true;
-			}
-			
-			// TODO: check fields only when both fields are equals
-			
-			if (firstFieldValue.equals(secondFieldValue)) {
-				// bind error message to 2nd field
-				ConstraintViolationUtils.recreate(
-					ctx,
-					secondFieldName,
-					ctx.getDefaultConstraintMessageTemplate()
-				);
-				return false;
-			}
+		PropertyAccessor bean = new BeanWrapperImpl(value);
+		
+		Object firstField      = bean.getPropertyValue(firstFieldName);
+		String firstFieldValue = Objects.toString(firstField, "");
+		if (StringUtils.isEmpty(firstFieldValue)) {
+			return true;
+		}
+		
+		Object secondField      = bean.getPropertyValue(secondFieldName);
+		String secondFieldValue = Objects.toString(secondField, "");
+		if (StringUtils.isEmpty(secondFieldValue)) {
+			return true;
+		}
+		
+		// TODO: check fields only when both fields are equals
 		
-		} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
-			throw new RuntimeException(ex); // NOPMD
+		if (firstFieldValue.equals(secondFieldValue)) {
+			// bind error message to 2nd field
+			ConstraintViolationUtils.recreate(
+				ctx,
+				secondFieldName,
+				ctx.getDefaultConstraintMessageTemplate()
+			);
+			return false;
 		}
 		
 		return true;
diff --git a/src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstFieldValidator.java b/src/main/java/ru/mystamps/web/validation/jsr303/NotNullIfFirstFieldValidator.java
@@ -17,14 +17,16 @@
  */
 package ru.mystamps.web.validation.jsr303;
 
-import java.lang.reflect.InvocationTargetException;
+import java.util.Objects;
 
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import org.springframework.beans.BeanWrapperImpl;
+import org.springframework.beans.PropertyAccessor;
+
 public class NotNullIfFirstFieldValidator
 	implements ConstraintValidator<NotNullIfFirstField, Object> {
 	
@@ -44,29 +46,28 @@ public boolean isValid(Object value, ConstraintValidatorContext ctx) {
 			return true;
 		}
 		
-		try {
-			String firstFieldValue  = BeanUtils.getProperty(value, firstFieldName);
-			if (StringUtils.isEmpty(firstFieldValue)) {
-				return true;
-			}
-			
-			String secondFieldValue = BeanUtils.getProperty(value, secondFieldName);
-			if (StringUtils.isNotEmpty(secondFieldValue)) {
-				return true;
-			}
-			
-			// bind error message to 2nd field
-			ConstraintViolationUtils.recreate(
-				ctx,
-				secondFieldName,
-				ctx.getDefaultConstraintMessageTemplate()
-			);
-			
-			return false;
+		PropertyAccessor bean = new BeanWrapperImpl(value);
 		
-		} catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ex) {
-			throw new RuntimeException(ex); // NOPMD: AvoidThrowingRawExceptionTypes
+		Object firstField      = bean.getPropertyValue(firstFieldName);
+		String firstFieldValue = Objects.toString(firstField, "");
+		if (StringUtils.isEmpty(firstFieldValue)) {
+			return true;
 		}
+		
+		Object secondField      = bean.getPropertyValue(secondFieldName);
+		String secondFieldValue = Objects.toString(secondField, "");
+		if (StringUtils.isNotEmpty(secondFieldValue)) {
+			return true;
+		}
+		
+		// bind error message to 2nd field
+		ConstraintViolationUtils.recreate(
+			ctx,
+			secondFieldName,
+			ctx.getDefaultConstraintMessageTemplate()
+		);
+		
+		return false;
 	}
 	
 }
