diff --git a/hibernate-validator/src/test/java/org/hibernate/validator/test/util/ValidatorUtil.java b/hibernate-validator/src/test/java/org/hibernate/validator/test/util/ValidatorUtil.java index ab8594bb99..5eec6ac005 100644 --- a/hibernate-validator/src/test/java/org/hibernate/validator/test/util/ValidatorUtil.java +++ b/hibernate-validator/src/test/java/org/hibernate/validator/test/util/ValidatorUtil.java @@ -41,8 +41,15 @@ * @author Gunnar Morling * @author Kevin Pollet - SERLI - (kevin.pollet@serli.com) */ -public class ValidatorUtil { - private static Validator hibernateValidator; +public final class ValidatorUtil { + private final static Validator hibernateValidator; + + // configure instance of validator for validation provider Hibernate Validator. + static { + final Configuration configuration = getConfiguration(); + configuration.traversableResolver( new DummyTraversableResolver() ); + hibernateValidator = configuration.buildValidatorFactory().getValidator(); + } /** * Private constructor in order to avoid instantiation. @@ -57,11 +64,6 @@ private ValidatorUtil() { * @return an instance of {@code Validator}. */ public static Validator getValidator() { - if ( hibernateValidator == null ) { - final Configuration configuration = getConfiguration(); - configuration.traversableResolver( new DummyTraversableResolver() ); - hibernateValidator = configuration.buildValidatorFactory().getValidator(); - } return hibernateValidator; } @@ -194,7 +196,10 @@ public static MethodDescriptor getMethodDescriptor(Class clazz, String method */ public static ParameterDescriptor getParameterDescriptor(Class clazz, String methodName, Class[] parameterTypes, int parameterIndex) { final MethodDescriptor methodDescriptor = getMethodDescriptor( clazz, methodName, parameterTypes ); - assertNotNull( methodDescriptor ); + assertNotNull( + methodDescriptor, + "No method with the given signature is declared in " + clazz + " or its super class" + ); return methodDescriptor.getParameterConstraints().get( parameterIndex ); }