HV-1363 Improve naming consistency

Author: gsmet

engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterMetaData.java

@@ -112,7 +112,7 @@ public static class Builder extends MetaDataBuilder {
 		private final ExecutableParameterNameProvider parameterNameProvider;
 		private final Type parameterType;
 		private final int parameterIndex;
-		private Callable executableForNameRetrieval;
+		private Callable callableForNameRetrieval;
 		private CascadingMetaDataBuilder cascadingMetaDataBuilder;
 
 		public Builder(Class<?> beanClass,
@@ -156,21 +156,21 @@ public void add(ConstrainedElement constrainedElement) {
 			// use this parent class parameter name instead of the more specific one.
 			// Worse case, we are consistent, best case parameters from parents are more meaningful.
 			// See HV-887 and the associated unit test
-			if ( executableForNameRetrieval == null ||
-					newConstrainedParameter.getCallable().getDeclaringClass().isAssignableFrom( executableForNameRetrieval.getDeclaringClass() ) ) {
-				executableForNameRetrieval = newConstrainedParameter.getCallable();
+			if ( callableForNameRetrieval == null ||
+					newConstrainedParameter.getCallable().getDeclaringClass().isAssignableFrom( callableForNameRetrieval.getDeclaringClass() ) ) {
+				callableForNameRetrieval = newConstrainedParameter.getCallable();
 			}
 		}
 
 		@Override
 		public ParameterMetaData build() {
 			return new ParameterMetaData(
 					parameterIndex,
-					executableForNameRetrieval.getParameterName( parameterNameProvider, parameterIndex ),
+					callableForNameRetrieval.getParameterName( parameterNameProvider, parameterIndex ),
 					parameterType,
 					adaptOriginsAndImplicitGroups( getDirectConstraints() ),
 					adaptOriginsAndImplicitGroups( getContainerElementConstraints() ),
-					cascadingMetaDataBuilder.build( valueExtractorManager, executableForNameRetrieval )
+					cascadingMetaDataBuilder.build( valueExtractorManager, callableForNameRetrieval )
 			);
 		}
 	}

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ConstraintLocation.java

@@ -47,16 +47,16 @@ static ConstraintLocation forTypeArgument(ConstraintLocation delegate, TypeVaria
 		return new TypeArgumentConstraintLocation( delegate, typeParameter, typeOfAnnotatedElement );
 	}
 
-	static ConstraintLocation forReturnValue(Callable executable) {
-		return new ReturnValueConstraintLocation( executable );
+	static ConstraintLocation forReturnValue(Callable callable) {
+		return new ReturnValueConstraintLocation( callable );
 	}
 
-	static ConstraintLocation forCrossParameter(Callable executable) {
-		return new CrossParameterConstraintLocation( executable );
+	static ConstraintLocation forCrossParameter(Callable callable) {
+		return new CrossParameterConstraintLocation( callable );
 	}
 
-	static ConstraintLocation forParameter(Callable executable, int index) {
-		return new ParameterConstraintLocation( executable, index );
+	static ConstraintLocation forParameter(Callable callable, int index) {
+		return new ParameterConstraintLocation( callable, index );
 	}
 
 	/**

engine/src/main/java/org/hibernate/validator/internal/metadata/location/ParameterConstraintLocation.java

@@ -22,24 +22,24 @@
  */
 public class ParameterConstraintLocation implements ConstraintLocation {
 
-	private final Callable executable;
+	private final Callable callable;
 	private final int index;
 	private final Type typeForValidatorResolution;
 
-	public ParameterConstraintLocation(Callable executable, int index) {
-		this.executable = executable;
+	public ParameterConstraintLocation(Callable callable, int index) {
+		this.callable = callable;
 		this.index = index;
-		this.typeForValidatorResolution = ReflectionHelper.boxedType( executable.getParameterGenericType( index ) );
+		this.typeForValidatorResolution = ReflectionHelper.boxedType( callable.getParameterGenericType( index ) );
 	}
 
 	@Override
 	public Class<?> getDeclaringClass() {
-		return executable.getDeclaringClass();
+		return callable.getDeclaringClass();
 	}
 
 	@Override
 	public Constrainable getMember() {
-		return executable;
+		return callable;
 	}
 
 	@Override
@@ -53,7 +53,7 @@ public int getIndex() {
 
 	@Override
 	public void appendTo(ExecutableParameterNameProvider parameterNameProvider, PathImpl path) {
-		path.addParameterNode( executable.getParameterName( parameterNameProvider, index ), index );
+		path.addParameterNode( callable.getParameterName( parameterNameProvider, index ), index );
 	}
 
 	@Override
@@ -63,14 +63,14 @@ public Object getValue(Object parent) {
 
 	@Override
 	public String toString() {
-		return "ParameterConstraintLocation [executable=" + executable + ", index=" + index + "]";
+		return "ParameterConstraintLocation [executable=" + callable + ", index=" + index + "]";
 	}
 
 	@Override
 	public int hashCode() {
 		final int prime = 31;
 		int result = 1;
-		result = prime * result + executable.hashCode();
+		result = prime * result + callable.hashCode();
 		result = prime * result + index;
 		return result;
 	}
@@ -87,7 +87,7 @@ public boolean equals(Object obj) {
 			return false;
 		}
 		ParameterConstraintLocation other = (ParameterConstraintLocation) obj;
-		if ( !executable.equals( other.executable ) ) {
+		if ( !callable.equals( other.callable ) ) {
 			return false;
 		}
 		if ( index != other.index ) {

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

@@ -463,7 +463,7 @@ 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(Callable executable1, Callable executable2);
+	ConstraintDeclarationException getMethodReturnValueMustNotBeMarkedMoreThanOnceForCascadedValidationException(Callable callable1, Callable callable2);
 
 	@Message(id = 132,
 			value = "Void methods must not be constrained or marked for cascaded validation, but method %s is.")