HV-1577 Move from JAXB to Stax for XML mappings

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/cfg/context/TypeConstraintMappingContextImpl.java

@@ -144,7 +144,7 @@ public MethodConstraintMappingContext method(String name, Class<?>... parameterT
 		Method method = run( GetDeclaredMethod.action( beanClass, name, parameterTypes ) );
 
 		if ( method == null || method.getDeclaringClass() != beanClass ) {
-			throw LOG.getBeanDoesNotContainMethodException( beanClass, name, Arrays.asList( parameterTypes ) );
+			throw LOG.getBeanDoesNotContainMethodException( beanClass, name, parameterTypes );
 		}
 
 		if ( configuredMembers.contains( method ) ) {
@@ -168,7 +168,7 @@ public ConstructorConstraintMappingContext constructor(Class<?>... parameterType
 		if ( constructor == null || constructor.getDeclaringClass() != beanClass ) {
 			throw LOG.getBeanDoesNotContainConstructorException(
 					beanClass,
-					Arrays.asList( parameterTypes )
+					parameterTypes
 			);
 		}
 

engine/src/main/java/org/hibernate/validator/internal/metadata/provider/XmlMetaDataProvider.java

@@ -20,7 +20,7 @@
 import org.hibernate.validator.internal.util.CollectionHelper;
 import org.hibernate.validator.internal.util.TypeResolutionHelper;
 import org.hibernate.validator.internal.util.stereotypes.Immutable;
-import org.hibernate.validator.internal.xml.MappingXmlParser;
+import org.hibernate.validator.internal.xml.mapping.MappingXmlParser;
 
 /**
  * A {@link MetaDataProvider} providing constraint related meta data based on

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

@@ -48,14 +48,15 @@
 import org.hibernate.validator.internal.engine.messageinterpolation.parser.MessageDescriptorFormatException;
 import org.hibernate.validator.internal.metadata.descriptor.ConstraintDescriptorImpl.ConstraintType;
 import org.hibernate.validator.internal.metadata.location.ConstraintLocation;
+import org.hibernate.validator.internal.util.logging.formatter.ArrayOfClassesObjectFormatter;
 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.DurationFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.ExecutableFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.ObjectArrayFormatter;
 import org.hibernate.validator.internal.util.logging.formatter.TypeFormatter;
-import org.hibernate.validator.internal.xml.ContainerElementTypePath;
+import org.hibernate.validator.internal.xml.mapping.ContainerElementTypePath;
 import org.hibernate.validator.spi.scripting.ScriptEvaluationException;
 import org.hibernate.validator.spi.scripting.ScriptEvaluatorFactory;
 import org.hibernate.validator.spi.scripting.ScriptEvaluatorNotFoundException;
@@ -379,7 +380,7 @@ RuntimeException getTryingToInstantiateAnnotationWithUnknownAttributesException(
 	ValidationException getIsNotAConstraintValidatorClassException(@FormatWith(ClassObjectFormatter.class) Class<?> validatorClass);
 
 	@Message(id = 103, value = "%s is configured at least twice in xml.")
-	ValidationException getBeanClassHasAlreadyBeConfiguredInXmlException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass);
+	ValidationException getBeanClassHasAlreadyBeenConfiguredInXmlException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass);
 
 	@Message(id = 104, value = "%1$s is defined twice in mapping xml for bean %2$s.")
 	ValidationException getIsDefinedTwiceInMappingXmlForBeanException(String name, @FormatWith(ClassObjectFormatter.class) Class<?> beanClass);
@@ -468,14 +469,14 @@ ConstraintDeclarationException getMultipleGroupConversionsForSameSourceException
 
 	@Message(id = 133, value = "%1$s does not contain a constructor with the parameter types %2$s.")
 	ValidationException getBeanDoesNotContainConstructorException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass,
-			@FormatWith(CollectionOfClassesObjectFormatter.class) List<Class<?>> parameterTypes);
+			@FormatWith(ArrayOfClassesObjectFormatter.class) Class<?>[] parameterTypes);
 
 	@Message(id = 134, value = "Unable to load parameter of type '%1$s' in %2$s.")
 	ValidationException getInvalidParameterTypeException(String type, @FormatWith(ClassObjectFormatter.class) Class<?> beanClass);
 
 	@Message(id = 135, value = "%1$s does not contain a method with the name '%2$s' and parameter types %3$s.")
 	ValidationException getBeanDoesNotContainMethodException(@FormatWith(ClassObjectFormatter.class) Class<?> beanClass, String methodName,
-			@FormatWith(CollectionOfClassesObjectFormatter.class) List<Class<?>> parameterTypes);
+			@FormatWith(ArrayOfClassesObjectFormatter.class) Class<?>[] parameterTypes);
 
 	@Message(id = 136, value = "The specified constraint annotation class %1$s cannot be loaded.")
 	ValidationException getUnableToLoadConstraintAnnotationClassException(String constraintAnnotationClassName, @Cause Exception e);

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

@@ -0,0 +1,32 @@
+/*
+ * Hibernate Validator, declare and validate application constraints
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package org.hibernate.validator.internal.util.logging.formatter;
+
+import java.util.Arrays;
+import java.util.stream.Collectors;
+
+/**
+ * Used with JBoss Logging to display array of class names in log messages.
+ *
+ * @author Guillaume Smet
+ * @author Marko Bekhta
+ */
+public class ArrayOfClassesObjectFormatter {
+
+	private final String stringRepresentation;
+
+	public ArrayOfClassesObjectFormatter(Class<?>[] classes) {
+		this.stringRepresentation = Arrays.stream( classes )
+				.map( c -> c.getName() )
+				.collect( Collectors.joining( ", " ) );
+	}
+
+	@Override
+	public String toString() {
+		return stringRepresentation;
+	}
+}

engine/src/main/java/org/hibernate/validator/internal/xml/ConstrainedExecutableBuilder.java

@@ -102,7 +102,7 @@ Set<ConstrainedExecutable> buildMethodConstrainedExecutable(List<MethodType> met
 				throw LOG.getBeanDoesNotContainMethodException(
 						beanClass,
 						methodName,
-						parameterTypes
+						parameterTypes.toArray( new Class[parameterTypes.size()] )
 				);
 			}
 
@@ -157,7 +157,7 @@ Set<ConstrainedExecutable> buildConstructorConstrainedExecutable(List<Constructo
 			if ( constructor == null ) {
 				throw LOG.getBeanDoesNotContainConstructorException(
 						beanClass,
-						constructorParameterTypes
+						constructorParameterTypes.toArray( new Class[constructorParameterTypes.size()] )
 				);
 			}
 			if ( alreadyProcessedConstructors.contains( constructor ) ) {