HV-638 Aligning names of model types. Actual model elements end with …

…*MetaData and implement one or more of the facet interfaces.

engine/src/main/java/org/hibernate/validator/internal/engine/ValidatorImpl.java

@@ -977,7 +977,7 @@ private <T> int validateParametersForGroup(MethodValidationContext<T> validation
 			// 3. validate cascaded parameter if required
 			ValueContext<Object[], ?> cascadingValueContext = ValueContext.getLocalExecutionContext(
 					parameterValues,
-					methodMetaData.getValidatableParameters(),
+					methodMetaData.getParameterListMetaData(),
 					PathImpl.createPathForExecutable( executable )
 			);
 			cascadingValueContext.setCurrentGroup( oneGroup );
@@ -1108,7 +1108,7 @@ private <T, V> int validateReturnValueForGroup(MethodValidationContext<T> valida
 
 				ValueContext<V, Object> cascadingvalueContext = ValueContext.getLocalExecutionContext(
 						value,
-						executableMetaData.getReturnValueValidatable(),
+						executableMetaData.getReturnValueMetaData(),
 						PathImpl.createPathForExecutable( executable )
 				);
 				cascadingvalueContext.setCurrentGroup( oneGroup );

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

@@ -387,7 +387,7 @@ public Iterable<MetaConstraint<?>> getCrossParameterConstraints() {
 		return crossParameterConstraints;
 	}
 
-	public Validatable getValidatableParameters() {
+	public ParameterListMetaData getParameterListMetaData() {
 
 		Set<ParameterMetaData> cascadedParameters = newHashSet();
 
@@ -397,11 +397,11 @@ public Validatable getValidatableParameters() {
 			}
 		}
 
-		return new ValidatableParameters( cascadedParameters );
+		return new ParameterListMetaData( cascadedParameters );
 	}
 
-	public ValidatableReturnValue getReturnValueValidatable() {
-		return new ValidatableReturnValue( returnValueGroupConversions );
+	public ReturnValueMetaData getReturnValueMetaData() {
+		return new ReturnValueMetaData( returnValueGroupConversions );
 	}
 
 	@Override

engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ValidatableParameters.java → engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ParameterListMetaData.java

@@ -19,15 +19,16 @@
 import static org.hibernate.validator.internal.util.CollectionHelper.newHashSet;
 
 /**
- * A {@link Validatable} representing the arguments of a method or constructor.
+ * Represents the constraint related meta data of the arguments of a method or
+ * constructor.
  *
  * @author Gunnar Morling
  */
-public class ValidatableParameters implements Validatable {
+public class ParameterListMetaData implements Validatable {
 
 	private final Iterable<Cascadable> cascadables;
 
-	public ValidatableParameters(Iterable<? extends Cascadable> cascadables) {
+	public ParameterListMetaData(Iterable<? extends Cascadable> cascadables) {
 		this.cascadables = newHashSet( cascadables );
 	}
 

engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ValidatableReturnValue.java → engine/src/main/java/org/hibernate/validator/internal/metadata/aggregated/ReturnValueMetaData.java

@@ -21,12 +21,12 @@
 import java.util.Map;
 
 /**
- * A {@link Validatable} representing the return value of a method or
- * constructor.
+ * Represents the constraint related meta data of the return value of a method
+ * or constructor.
  *
  * @author Gunnar Morling
  */
-public class ValidatableReturnValue implements Validatable {
+public class ReturnValueMetaData implements Validatable {
 
 	//TODO HV-571: The spec currently says "In the return value case, the name of the node is null".
 	//But maybe a reserved name like this is actually better. Need to discuss with EG.
@@ -35,7 +35,7 @@ public class ValidatableReturnValue implements Validatable {
 
 	private final Map<Class<?>, Class<?>> groupConversions;
 
-	public ValidatableReturnValue(Map<Class<?>, Class<?>> groupConversions) {
+	public ReturnValueMetaData(Map<Class<?>, Class<?>> groupConversions) {
 		this.groupConversions = groupConversions;
 	}
 

engine/src/test/java/org/hibernate/validator/test/internal/metadata/aggregated/ExecutableMetaDataTest.java

@@ -188,7 +188,7 @@ public void locallyDefinedGroupConversion() throws Exception {
 		ExecutableMetaData methodMetaData = beanMetaData.getMetaDataFor( ExecutableElement.forMethod( method ) );
 
 		assertThat(
-				methodMetaData.getReturnValueValidatable()
+				methodMetaData.getReturnValueMetaData()
 						.getCascadables()
 						.iterator()
 						.next()