Fix to avoid instantiating Validator if conditional expression returns false

Author: salvadormarcos

validator-core/src/main/java/com/github/microtweak/validator/conditional/core/internal/ConditinalDescriptor.java

@@ -21,7 +21,7 @@ public class ConditinalDescriptor {
  private final Annotation actualConstraint;
  private final String constraintMessage;
  private final String expression;
- private final ConstraintValidator validator;
+ private final Class<? extends ConstraintValidator> validatorClass;
 
  public ConditinalDescriptor(ConstraintTarget constraintTarget, Annotation conditionalConstraint) {
  this.constraintTarget = constraintTarget;
@@ -40,7 +40,7 @@ public ConditinalDescriptor(ConstraintTarget constraintTarget, Annotation condit
  throw new IllegalArgumentException("The conditional constraint " + conditionalConstraint.annotationType() + " does not have the attribute \"expression\"!");
  }
 
- this.validator = BeanValidationHelper.getConstraintValidatorOf(actualConstraint, (Class<?>) constraintTarget.getType());
+ this.validatorClass = BeanValidationHelper.findConstraintValidatorClass(actualConstraint.annotationType(), constraintTarget.getType());
  }
 
  public String getName() {

validator-core/src/main/java/com/github/microtweak/validator/conditional/core/internal/annotated/ConstraintTarget.java

@@ -18,7 +18,7 @@ public interface ConstraintTarget {
 
  Class<?> getDeclaringClass();
 
- Type getType();
+ Class<?> getType();
 
  List<Annotation> getConstraints();
 

validator-core/src/main/java/com/github/microtweak/validator/conditional/core/internal/annotated/FieldConstraintTarget.java

@@ -36,7 +36,7 @@ public Class<?> getDeclaringClass() {
  }
 
  @Override
- public Type getType() {
+ public Class<?> getType() {
  return field.getType();
  }
 

validator-core/src/main/java/com/github/microtweak/validator/conditional/core/internal/helper/BeanValidationHelper.java

@@ -86,22 +86,17 @@ public static Annotation getActualBeanValidationContraintOf(Annotation condition
  return AnnotationHelper.createAnnotation(actualConstraintType, attributes);
  }
 
- @SuppressWarnings("unchecked")
- public static <A extends Annotation, CV extends ConstraintValidator<A, ?>> CV getConstraintValidatorOf(A constraint, Class<?> validatedType) {
- final Class<CV> constraintValidatorClass = (Class<CV>) findConstraintValidatorClass(constraint.annotationType(), validatedType);
-
- final CV validatorInstance = platformHelper.getConstraintValidatorInstance(constraintValidatorClass);
- validatorInstance.initialize(constraint);
- return validatorInstance;
- }
-
  @SuppressWarnings("unchecked")
  public static boolean invokeConstraintValidator(Object validatedBean, ConditinalDescriptor descriptor, ConstraintValidatorContext context) {
  final Object value = descriptor.getConstraintTarget().getTargetValue(validatedBean);
- return descriptor.getValidator().isValid(value, context);
+
+ final ConstraintValidator<Annotation, Object> validator = platformHelper.getConstraintValidatorInstance(descriptor.getValidatorClass());
+ validator.initialize(descriptor.getActualConstraint());
+
+ return validator.isValid(value, context);
  }
 
- private static Class<? extends ConstraintValidator> findConstraintValidatorClass(Class<? extends Annotation> constraintClass, Class<?> validatedType) {
+ public static Class<? extends ConstraintValidator> findConstraintValidatorClass(Class<? extends Annotation> constraintClass, Class<?> validatedType) {
  Set<ConstraintValidatorDescriptor> availableValidators = getValidatorAnnotatedInConstraint(constraintClass);
 
  if (ObjectUtils.isEmpty(availableValidators)) {