INT-1881 added support for nesting processing beans in the 'header' element of header-enricher (e.g., bean, script etc.)

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

@@ -17,12 +17,14 @@
 package org.springframework.integration.config.xml;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
+import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.ManagedMap;
@@ -35,6 +37,7 @@ import org.springframework.util.xml.DomUtils;
  * Base support class for 'header-enricher' parsers.
  * 
  * @author Mark Fisher
+ * @author Oleg Zhurakousky
  * @since 2.0
  */
 public abstract class HeaderEnricherParserSupport extends AbstractTransformerParser {
@@ -113,18 +116,36 @@ public abstract class HeaderEnricherParserSupport extends AbstractTransformerPar
 					String ref = headerElement.getAttribute("ref");
 					String method = headerElement.getAttribute("method");
 					String expression = headerElement.getAttribute("expression");
-					Element expressionElement = DomUtils.getChildElementByTagName(headerElement, "expression");
-					if (StringUtils.hasText(expression) && expressionElement != null) {
-						parserContext.getReaderContext().error("The 'expression' attribute and sub-element are mutually exclusive", element);
-						return;
+		
+					List<Element> subElements = DomUtils.getChildElements(headerElement);
+					
+					BeanDefinition innerComponentDefinition = null;
+					Element expressionElement = null;
+					if (subElements != null && subElements.size() == 1) {
+						Element beanElement = subElements.get(0);
+						if ("expression".equals(beanElement.getNodeName())){
+							expressionElement = beanElement;
+							if (StringUtils.hasText(expression) && expressionElement != null) {
+								parserContext.getReaderContext().error("The 'expression' attribute and sub-element are mutually exclusive", element);
+								return;
+							}
+						} 
+						else if ("bean".equals(beanElement.getNodeName())){
+							innerComponentDefinition = parserContext.getDelegate().parseBeanDefinitionElement(beanElement).getBeanDefinition();
+						}
+						else {
+							innerComponentDefinition = parserContext.getDelegate().parseCustomElement(beanElement);
+						}
 					}
 					boolean isValue = StringUtils.hasText(value);
 					boolean isRef = StringUtils.hasText(ref);
 					boolean hasMethod = StringUtils.hasText(method);
 					boolean isExpression = StringUtils.hasText(expression) || expressionElement != null;
-					if (!(isValue ^ (isRef ^ isExpression))) {
+					boolean isCustomBean = innerComponentDefinition != null;
+					
+					if (!(isValue ^ (isRef ^ (isExpression ^ isCustomBean)))) {
 						parserContext.getReaderContext().error(
-								"Exactly one of the 'ref', 'value', or 'expression' attributes is required.", element);
+								"Exactly one of the 'ref', 'value', 'expression' or inner bean is required.", element);
 					}
 					BeanDefinitionBuilder valueProcessorBuilder = null;
 					if (isValue) {
@@ -157,6 +178,18 @@ public abstract class HeaderEnricherParserSupport extends AbstractTransformerPar
 						}
 						valueProcessorBuilder.addConstructorArgValue(headerType);
 					}
+					else if (isCustomBean){
+						valueProcessorBuilder = BeanDefinitionBuilder.genericBeanDefinition(
+								IntegrationNamespaceUtils.BASE_PACKAGE + ".transformer.HeaderEnricher$MethodInvokingHeaderValueMessageProcessor");
+						valueProcessorBuilder.addConstructorArgValue(innerComponentDefinition);
+						if (hasMethod){
+							valueProcessorBuilder.addConstructorArgValue(method);
+						} 
+						else {
+							valueProcessorBuilder.addConstructorArgValue(null);
+						}		
+						headers.put(headerName, valueProcessorBuilder.getBeanDefinition());
+					}
 					else {
 						if (StringUtils.hasText(headerElement.getAttribute("type"))) {
 							parserContext.getReaderContext().error(

spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java

@@ -59,6 +59,17 @@ public class HeaderEnricher implements Transformer {
 	public HeaderEnricher() {
 		this(null);
 	}
+	
+//	public HeaderEnricher(final MessageProcessor<?> messageProcessor) {
+//		HeaderValueMessageProcessor<?> hvProcessor = new AbstractHeaderValueMessageProcessor<Object>() {
+//
+//			public Object processMessage(Message<?> message) {
+//				// TODO Auto-generated method stub
+//				return messageProcessor.processMessage(message);
+//			}
+//		};
+//		//this(hvProcessor);
+//	}
 
 	/**
 	 * Create a HeaderEnricher with the given map of headers.

spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd

@@ -1557,9 +1557,10 @@ endpoint itself is a Polling Consumer for a channel with a queue.
 		</xsd:annotation>
 		<xsd:complexContent>
 			<xsd:extension base="referenceHeaderType">
-				<xsd:sequence minOccurs="0" maxOccurs="1">
+				<xsd:choice minOccurs="0" maxOccurs="1">
+					<xsd:any processContents="strict" namespace="##other"/>
 					<xsd:element name="expression" type="innerExpressionType" />
-				</xsd:sequence>
+				</xsd:choice>
 				<xsd:attribute name="value" type="xsd:string">
 					<xsd:annotation>
 						<xsd:documentation>