Allow XML components injection

**Cherry-pick to 5.0.x & 4.3.x**

* Polishing after rebase
* Copyright to 2019

* Rebase and update according upstream deps

Author: artembilan

build.gradle

@@ -139,7 +139,7 @@ subprojects { subproject ->
 		springSecurityVersion = '5.1.2.RELEASE'
 		springRetryVersion = '1.2.2.RELEASE'
 		springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.1.4.RELEASE'
-		springWsVersion = '3.0.4.RELEASE'
+		springWsVersion = '3.0.5.RELEASE'
 		tomcatVersion = "9.0.12"
 		xstreamVersion = '1.4.11.1'
 	}

spring-integration-xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,6 +33,8 @@
 import org.xml.sax.InputSource;
 
 import org.springframework.messaging.MessagingException;
+import org.springframework.util.Assert;
+import org.springframework.xml.DocumentBuilderFactoryUtils;
 
 /**
  * Default implementation of {@link XmlPayloadConverter}. Supports
@@ -48,11 +50,12 @@ public class DefaultXmlPayloadConverter implements XmlPayloadConverter {
 
 
 	public DefaultXmlPayloadConverter() {
-		this.documentBuilderFactory = DocumentBuilderFactory.newInstance();
+		this(DocumentBuilderFactoryUtils.newInstance());
 		this.documentBuilderFactory.setNamespaceAware(true);
 	}
 
 	public DefaultXmlPayloadConverter(DocumentBuilderFactory documentBuilderFactory) {
+		Assert.notNull(documentBuilderFactory, "'documentBuilderFactory' must not be null.");
 		this.documentBuilderFactory = documentBuilderFactory;
 	}
 
@@ -115,7 +118,7 @@ protected Document nodeToDocument(Node node) {
 
 	@Override
 	public Node convertToNode(Object object) {
-		Node node = null;
+		Node node;
 		if (object instanceof Node) {
 			node = (Node) object;
 		}
@@ -130,7 +133,6 @@ else if (object instanceof DOMSource) {
 
 	@Override
 	public Source convertToSource(Object object) {
-		Source source = null;
 		if (object instanceof Source) {
 			return (Source) object;
 		}

spring-integration-xml/src/main/java/org/springframework/integration/xml/config/XPathHeaderEnricherParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,6 +34,7 @@
  *
  * @author Mark Fisher
  * @author Artem Bilan
+ *
  * @since 2.0
  */
 public class XPathHeaderEnricherParser extends AbstractTransformerParser {
@@ -45,15 +46,16 @@ protected final String getTransformerClassName() {
 
 	@Override
 	protected void parseTransformer(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
-		ManagedMap<String, Object> headers = new ManagedMap<String, Object>();
-		this.processHeaders(element, headers, parserContext);
+		ManagedMap<String, Object> headers = new ManagedMap<>();
+		processHeaders(element, headers, parserContext);
 		builder.addConstructorArgValue(headers);
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "default-overwrite");
 		IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, "should-skip-nulls");
 	}
 
 	protected void processHeaders(Element element, ManagedMap<String, Object> headers, ParserContext parserContext) {
 		Object source = parserContext.extractSource(element);
+		String converter = element.getAttribute("converter");
 		NodeList childNodes = element.getChildNodes();
 		for (int i = 0; i < childNodes.getLength(); i++) {
 			Node node = childNodes.item(i);
@@ -62,21 +64,26 @@ protected void processHeaders(Element element, ManagedMap<String, Object> header
 				String elementName = node.getLocalName();
 				if ("header".equals(elementName)) {
 					BeanDefinitionBuilder builder =
-							BeanDefinitionBuilder.genericBeanDefinition(XPathExpressionEvaluatingHeaderValueMessageProcessor.class);
+							BeanDefinitionBuilder.genericBeanDefinition(
+									XPathExpressionEvaluatingHeaderValueMessageProcessor.class);
 					String expressionString = headerElement.getAttribute("xpath-expression");
 					String expressionRef = headerElement.getAttribute("xpath-expression-ref");
 					boolean isExpressionString = StringUtils.hasText(expressionString);
 					boolean isExpressionRef = StringUtils.hasText(expressionRef);
-					if (!(isExpressionString ^ isExpressionRef)) {
+					if (isExpressionString == isExpressionRef) {
 						parserContext.getReaderContext().error(
-								"Exactly one of the 'xpath-expression' or 'xpath-expression-ref' attributes is required.", source);
+								"Exactly one of the 'xpath-expression' " +
+										"or 'xpath-expression-ref' attributes is required.", source);
 					}
 					if (isExpressionString) {
 						builder.addConstructorArgValue(expressionString);
 					}
 					else {
 						builder.addConstructorArgReference(expressionRef);
 					}
+					if (StringUtils.hasText(converter)) {
+						builder.addConstructorArgReference(converter);
+					}
 					IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, headerElement, "evaluation-type");
 					IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, headerElement, "overwrite");
 					IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, headerElement, "header-type");

spring-integration-xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2010 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,23 +23,26 @@
 import javax.xml.transform.dom.DOMResult;
 
 import org.springframework.messaging.MessagingException;
+import org.springframework.util.Assert;
+import org.springframework.xml.DocumentBuilderFactoryUtils;
 
 /**
  * @author Jonas Partner
+ * @author Artem Bilan
  */
 public class DomResultFactory implements ResultFactory {
 
 	private final DocumentBuilderFactory documentBuilderFactory;
 
 
-	public DomResultFactory(DocumentBuilderFactory documentBuilderFactory) {
-		this.documentBuilderFactory = documentBuilderFactory;
+	public DomResultFactory() {
+		this(DocumentBuilderFactoryUtils.newInstance());
+		this.documentBuilderFactory.setNamespaceAware(true);
 	}
 
-	public DomResultFactory() {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-		this.documentBuilderFactory = factory;
+	public DomResultFactory(DocumentBuilderFactory documentBuilderFactory) {
+		Assert.notNull(documentBuilderFactory, "'documentBuilderFactory' must not be null.");
+		this.documentBuilderFactory = documentBuilderFactory;
 	}
 
 

spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java

@@ -41,6 +41,8 @@
  * @author Oleg Zhurakousky
  * @author Gary Russell
  * @author Liujiong
+ * @author Artem Bilan
+ *
  * @since 2.0
  */
 public class XmlValidatingMessageSelector implements MessageSelector {
@@ -63,44 +65,42 @@ public String getUrl() {
 
 	}
 
-	private final Log logger = LogFactory.getLog(this.getClass());
+	private final Log logger = LogFactory.getLog(getClass());
 
 	private final XmlValidator xmlValidator;
 
-	private volatile boolean throwExceptionOnRejection;
+	private boolean throwExceptionOnRejection;
 
-	private volatile XmlPayloadConverter converter = new DefaultXmlPayloadConverter();
-
-
-	public XmlValidatingMessageSelector(XmlValidator xmlValidator) {
-		Assert.notNull(xmlValidator, "XmlValidator must not be null");
-		this.xmlValidator = xmlValidator;
-	}
+	private XmlPayloadConverter converter = new DefaultXmlPayloadConverter();
 
 
 	/**
 	 * Creates a selector with a default {@link XmlValidator}. The validator will be initialized with
 	 * the provided 'schema' location {@link Resource} and 'schemaType'. The valid options for schema
 	 * type are {@link XmlValidatorFactory#SCHEMA_W3C_XML} or {@link XmlValidatorFactory#SCHEMA_RELAX_NG}.
 	 * If no 'schemaType' is provided it will default to {@link XmlValidatorFactory#SCHEMA_W3C_XML};
-	 *
 	 * @param schema The schema.
-	 * @param schemaTypeArg The schema type.
-	 *
+	 * @param schemaType The schema type.
 	 * @throws IOException if the XmlValidatorFactory fails to create a validator
 	 */
-	public XmlValidatingMessageSelector(Resource schema, SchemaType schemaTypeArg) throws IOException {
-		SchemaType schemaType = schemaTypeArg;
-		Assert.notNull(schema, "You must provide XML schema location to perform validation");
-		if (schemaType == null) {
-			schemaType = SchemaType.XML_SCHEMA;
-		}
-		this.xmlValidator = XmlValidatorFactory.createValidator(schema, schemaType.getUrl());
+	public XmlValidatingMessageSelector(Resource schema, SchemaType schemaType) throws IOException {
+		this(XmlValidatorFactory.createValidator(schema,
+				schemaType == null
+						? SchemaType.XML_SCHEMA.getUrl()
+						: schemaType.getUrl()));
+	}
+
+	public XmlValidatingMessageSelector(XmlValidator xmlValidator) {
+		Assert.notNull(xmlValidator, "XmlValidator must not be null");
+		this.xmlValidator = xmlValidator;
 	}
 
+
 	public XmlValidatingMessageSelector(Resource schema, String schemaType) throws IOException {
-		this(schema, StringUtils.isEmpty(schemaType) ? null :
-				SchemaType.valueOf(schemaType.toUpperCase().replaceFirst("-", "_")));
+		this(schema,
+				StringUtils.isEmpty(schemaType)
+						? null
+						: SchemaType.valueOf(schemaType.toUpperCase().replaceFirst("-", "_")));
 	}
 
 
@@ -131,10 +131,12 @@ public boolean accept(Message<?> message) {
 		if (!validationSuccess) {
 			if (this.throwExceptionOnRejection) {
 				throw new MessageRejectedException(message, "Message was rejected due to XML Validation errors",
-						new AggregatedXmlMessageValidationException(
-								Arrays.<Throwable>asList(validationExceptions)));
+						new AggregatedXmlMessageValidationException(Arrays.asList(validationExceptions)));
+			}
+			else if (this.logger.isInfoEnabled()) {
+				this.logger.info("Message was rejected due to XML Validation errors",
+						new AggregatedXmlMessageValidationException(Arrays.asList(validationExceptions)));
 			}
-			this.logger.debug("Message was rejected due to XML Validation errors");
 		}
 		return validationSuccess;
 	}

spring-integration-xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,26 +29,29 @@
 import org.xml.sax.InputSource;
 
 import org.springframework.messaging.MessagingException;
+import org.springframework.util.Assert;
+import org.springframework.xml.DocumentBuilderFactoryUtils;
 
 /**
  * {@link SourceFactory} implementation which supports creation of a {@link DOMSource}
  * from a {@link Document}, {@link File} or {@link String} payload.
  *
  * @author Jonas Partner
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class DomSourceFactory implements SourceFactory {
 
 	private final DocumentBuilderFactory documentBuilderFactory;
 
 
 	public DomSourceFactory() {
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(true);
-		this.documentBuilderFactory = factory;
+		this(DocumentBuilderFactoryUtils.newInstance());
+		this.documentBuilderFactory.setNamespaceAware(true);
 	}
 
 	public DomSourceFactory(DocumentBuilderFactory documentBuilderFactory) {
+		Assert.notNull(documentBuilderFactory, "'documentBuilderFactory' must not be null.");
 		this.documentBuilderFactory = documentBuilderFactory;
 	}
 
@@ -87,7 +90,7 @@ private DOMSource createDomSourceForString(String s) {
 
 	private DOMSource createDomSourceForFile(File file) {
 		try {
-			Document document = this.getNewDocumentBuilder().parse(file);
+			Document document = getNewDocumentBuilder().parse(file);
 			return new DOMSource(document.getDocumentElement());
 		}
 		catch (Exception e) {

spring-integration-xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,27 +27,31 @@
 import org.w3c.dom.Document;
 
 import org.springframework.messaging.MessagingException;
+import org.springframework.util.Assert;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.xml.transform.StringResult;
 import org.springframework.xml.transform.StringSource;
+import org.springframework.xml.transform.TransformerFactoryUtils;
 
 /**
  * {@link SourceFactory} implementation which supports creation of a {@link StringSource}
  * from a {@link Document}, {@link File} or {@link String} payload
  *
  * @author Jonas Partner
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 public class StringSourceFactory implements SourceFactory {
 
 	private final TransformerFactory transformerFactory;
 
 
 	public StringSourceFactory() {
-		this(TransformerFactory.newInstance());
+		this(TransformerFactoryUtils.newInstance());
 	}
 
 	public StringSourceFactory(TransformerFactory transformerFactory) {
+		Assert.notNull(transformerFactory, "'transformerFactory' must not be null.");
 		this.transformerFactory = transformerFactory;
 	}