From 7518e809ddd290e3a80b0133b19a1bdfe7738dbb Mon Sep 17 00:00:00 2001 From: Hedju Hor Date: Fri, 12 Jan 2018 18:36:08 +0100 Subject: [PATCH] fixed getValidationGroups get called if not skipped Validation removed unnecessary LOG.isDebugEnabled() --- .../interceptor/BeanValidationInterceptor.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java index f2b2e9b0b..1545b4870 100644 --- a/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java +++ b/plugins/bean-validation/src/main/java/org/apache/struts/beanvalidation/validation/interceptor/BeanValidationInterceptor.java @@ -94,13 +94,11 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { ActionProxy actionProxy = invocation.getProxy(); String methodName = actionProxy.getMethod(); - if (LOG.isDebugEnabled()) { - LOG.debug("Validating [{}/{}] with method [{}]", invocation.getProxy().getNamespace(), invocation.getProxy().getActionName(), methodName); - } - Class[] validationGroup = getValidationGroups(action, methodName); + LOG.debug("Validating [{}/{}] with method [{}]", invocation.getProxy().getNamespace(), invocation.getProxy().getActionName(), methodName); if (null == MethodUtils.getAnnotation(getActionMethod(action.getClass(), methodName), SkipValidation.class, true, true)) { + Class[] validationGroup = getValidationGroups(action, methodName); // performing bean validation on action performBeanValidation(action, validator, validationGroup); } @@ -156,9 +154,7 @@ public class BeanValidationInterceptor extends MethodFilterInterceptor { if (action instanceof ModelDriven && fieldName.startsWith(ValidatorConstants.MODELDRIVEN_PREFIX)) { fieldName = fieldName.replace("model.", ValidatorConstants.EMPTY_SPACE); } - if (LOG.isDebugEnabled()) { - LOG.debug("Adding field error [{}] with message [{}]", fieldName, validationError.getMessage()); - } + LOG.debug("Adding field error [{}] with message [{}]", fieldName, validationError.getMessage()); validatorContext.addFieldError(fieldName, validationError.getMessage()); } }