HV-1363 Remove ConstrainableFormatter and push the logic to toString implementations

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanExecutable.java

@@ -176,6 +176,14 @@ public int hashCode() {
 		return result;
 	}
 
+	@Override
+	public String toString() {
+		return ExecutableHelper.getExecutableAsString(
+				getDeclaringClass().getSimpleName() + "#" + name,
+				getParameterTypes()
+		);
+	}
+
 	private boolean hasReturnValue(Executable executable) {
 		if ( executable instanceof Constructor ) {
 			return true;

engine/src/main/java/org/hibernate/validator/internal/properties/javabean/JavaBeanField.java

@@ -95,6 +95,11 @@ public int hashCode() {
 		return result;
 	}
 
+	@Override
+	public String toString() {
+		return getName();
+	}
+
 	/**
 	 * Returns an accessible version of the given member. Will be the given member itself in case it is accessible,
 	 * otherwise a copy which is set accessible.

engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java

@@ -54,7 +54,6 @@
 import org.hibernate.validator.internal.util.logging.formatter.ClassObjectFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.CollectionOfClassesObjectFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.CollectionOfObjectsToStringFormatter;
-import org.hibernate.validator.internal.util.logging.formatter.ConstrainableFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.DurationFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.ExecutableFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.ObjectArrayFormatter;
@@ -252,13 +251,13 @@ GroupDefinitionException getUnableToExpandDefaultGroupListException(@FormatWith(
 	GroupDefinitionException getWrongDefaultGroupSequenceProviderTypeException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass);
 
 	@Message(id = 56, value = "Method or constructor %1$s doesn't have a parameter with index %2$d.")
-	IllegalArgumentException getInvalidExecutableParameterIndexException(@FormatWith(ConstrainableFormatter.class) Callable callable, int index);
+	IllegalArgumentException getInvalidExecutableParameterIndexException(Callable callable, int index);
 
 	@Message(id = 59, value = "Unable to retrieve annotation parameter value.")
 	ValidationException getUnableToRetrieveAnnotationParameterValueException(@Cause Exception e);
 
 	@Message(id = 62, value = "Method or constructor %1$s has %2$s parameters, but the passed list of parameter meta data has a size of %3$s.")
-	IllegalArgumentException getInvalidLengthOfParameterMetaDataListException(@FormatWith(ConstrainableFormatter.class) Callable callable, int nbParameters, int listSize);
+	IllegalArgumentException getInvalidLengthOfParameterMetaDataListException(Callable callable, int nbParameters, int listSize);
 
 	@Message(id = 63, value = "Unable to instantiate %s.")
 	ValidationException getUnableToInstantiateException(@FormatWith(ClassObjectFormatter.class) Class<?> clazz, @Cause Exception e);
@@ -464,11 +463,11 @@ ConstraintDeclarationException getMultipleGroupConversionsForSameSourceException
 
 	@Message(id = 131,
 			value = "A method return value must not be marked for cascaded validation more than once in a class hierarchy, but the following two methods are marked as such: %s, %s.")
-	ConstraintDeclarationException getMethodReturnValueMustNotBeMarkedMoreThanOnceForCascadedValidationException(@FormatWith(ConstrainableFormatter.class) Callable executable1, @FormatWith(ConstrainableFormatter.class) Callable executable2);
+	ConstraintDeclarationException getMethodReturnValueMustNotBeMarkedMoreThanOnceForCascadedValidationException(Callable executable1, Callable executable2);
 
 	@Message(id = 132,
 			value = "Void methods must not be constrained or marked for cascaded validation, but method %s is.")
-	ConstraintDeclarationException getVoidMethodsMustNotBeConstrainedException(@FormatWith(ConstrainableFormatter.class) Callable callable);
+	ConstraintDeclarationException getVoidMethodsMustNotBeConstrainedException(Callable callable);
 
 	@Message(id = 133, value = "%1$s does not contain a constructor with the parameter types %2$s.")
 	ValidationException getBeanDoesNotContainConstructorException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass,
@@ -503,7 +502,7 @@ ConstraintDeclarationException getImplicitConstraintTargetInAmbiguousConfigurati
 	@Message(id = 142,
 			value = "Cross parameter constraint %1$s is illegally placed on a parameterless method or constructor '%2$s'.")
 	ConstraintDeclarationException getCrossParameterConstraintOnMethodWithoutParametersException(
-			@FormatWith(ClassObjectFormatter.class) Class<? extends Annotation> constraint, @FormatWith(ConstrainableFormatter.class) Constrainable executable);
+			@FormatWith(ClassObjectFormatter.class) Class<? extends Annotation> constraint, Constrainable executable);
 
 	@Message(id = 143,
 			value = "Cross parameter constraint %1$s is illegally placed on class level.")
@@ -512,7 +511,7 @@ ConstraintDeclarationException getCrossParameterConstraintOnMethodWithoutParamet
 	@Message(id = 144,
 			value = "Cross parameter constraint %1$s is illegally placed on field '%2$s'.")
 	ConstraintDeclarationException getCrossParameterConstraintOnFieldException(@FormatWith(ClassObjectFormatter.class) Class<? extends Annotation> constraint,
-			@FormatWith(ConstrainableFormatter.class) Constrainable field);
+			Constrainable field);
 
 	@Message(id = 146,
 			value = "No parameter nodes may be added since path %s doesn't refer to a cross-parameter constraint.")
@@ -538,11 +537,11 @@ UnexpectedTypeException getMultipleValidatorsForSameTypeException(@FormatWith(Cl
 
 	@Message(id = 151,
 			value = "A method overriding another method must not redefine the parameter constraint configuration, but method %2$s redefines the configuration of %1$s.")
-	ConstraintDeclarationException getParameterConfigurationAlteredInSubTypeException(@FormatWith(ConstrainableFormatter.class) Callable superMethod, @FormatWith(ConstrainableFormatter.class) Callable subMethod);
+	ConstraintDeclarationException getParameterConfigurationAlteredInSubTypeException(Callable superMethod, Callable subMethod);
 
 	@Message(id = 152,
 			value = "Two methods defined in parallel types must not declare parameter constraints, if they are overridden by the same method, but methods %s and %s both define parameter constraints.")
-	ConstraintDeclarationException getParameterConstraintsDefinedInMethodsFromParallelTypesException(@FormatWith(ConstrainableFormatter.class) Callable method1, @FormatWith(ConstrainableFormatter.class) Callable method2);
+	ConstraintDeclarationException getParameterConstraintsDefinedInMethodsFromParallelTypesException(Callable method1, Callable method2);
 
 	@Message(id = 153,
 			value = "The constraint %1$s used ConstraintTarget#%2$s but is not specified on a method or constructor.")
@@ -584,7 +583,7 @@ ConstraintDefinitionException getValidatorForCrossParameterConstraintMustEitherV
 
 	@Message(id = 161,
 			value = "Two methods defined in parallel types must not define group conversions for a cascaded method return value, if they are overridden by the same method, but methods %s and %s both define parameter constraints.")
-	ConstraintDeclarationException getMethodsFromParallelTypesMustNotDefineGroupConversionsForCascadedReturnValueException(@FormatWith(ConstrainableFormatter.class) Callable method1, @FormatWith(ConstrainableFormatter.class) Callable method2);
+	ConstraintDeclarationException getMethodsFromParallelTypesMustNotDefineGroupConversionsForCascadedReturnValueException(Callable method1, Callable method2);
 
 	@Message(id = 162,
 			value = "The validated type %1$s does not specify the constructor/method: %2$s")
@@ -632,19 +631,19 @@ ConstraintDefinitionException getValidatorForCrossParameterConstraintMustEitherV
 
 	@Message(id = 174,
 			value = "Parameter %3$s of method or constructor %2$s of type %1$s is configured more than once via the programmatic constraint declaration API.")
-	ValidationException getParameterHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, @FormatWith(ConstrainableFormatter.class) Callable callable, int parameterIndex);
+	ValidationException getParameterHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, Callable callable, int parameterIndex);
 
 	@Message(id = 175,
 			value = "The return value of method or constructor %2$s of type %1$s is configured more than once via the programmatic constraint declaration API.")
-	ValidationException getReturnValueHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, @FormatWith(ConstrainableFormatter.class) Callable callable);
+	ValidationException getReturnValueHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, Callable callable);
 
 	@Message(id = 176,
 			value = "Constructor %2$s of type %1$s is configured more than once via the programmatic constraint declaration API.")
 	ValidationException getConstructorHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, String constructor);
 
 	@Message(id = 177,
 			value = "Cross-parameter constraints for the method or constructor %2$s of type %1$s are declared more than once via the programmatic constraint declaration API.")
-	ValidationException getCrossParameterElementHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, @FormatWith(ConstrainableFormatter.class) Callable callable);
+	ValidationException getCrossParameterElementHasAlreadyBeConfiguredViaProgrammaticApiException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, Callable callable);
 
 	@Message(id = 178, value = "Multiplier cannot be negative: %d.")
 	IllegalArgumentException getMultiplierCannotBeNegativeException(int multiplier);
@@ -717,7 +716,7 @@ ConstraintDeclarationException getInconsistentValueUnwrappingConfigurationBetwee
 	ValueExtractorDefinitionException getValueExtractorDeclaresExtractedValueMultipleTimesException(@FormatWith(ClassObjectFormatter.class) Class<?> extractorType);
 
 	@Message(id = 205, value = "Invalid unwrapping configuration for constraint %2$s on %1$s. You can only define one of 'Unwrapping.Skip' or 'Unwrapping.Unwrap'.")
-	ConstraintDeclarationException getInvalidUnwrappingConfigurationForConstraintException(@FormatWith(ConstrainableFormatter.class) Constrainable constrainable, @FormatWith(ClassObjectFormatter.class) Class<? extends Annotation> constraint);
+	ConstraintDeclarationException getInvalidUnwrappingConfigurationForConstraintException(Constrainable constrainable, @FormatWith(ClassObjectFormatter.class) Class<? extends Annotation> constraint);
 
 	@Message(id = 206, value = "Unable to instantiate value extractor class %s.")
 	ValidationException getUnableToInstantiateValueExtractorClassException(String valueExtractorClassName, @Cause ValidationException e);