INT-4114: Add missed <poller> to XSDs

JIRA: https://jira.spring.io/browse/INT-4114

Author: artembilan

spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-5.1.xsd

@@ -651,6 +651,11 @@ Only files matching this regular expression will be picked up by this adapter.
     </xsd:element>
 
     <xsd:complexType name="transformerType">
+		<xsd:choice minOccurs="0" maxOccurs="2">
+			<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
+			<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
+						 minOccurs="0" maxOccurs="1" />
+		</xsd:choice>
         <xsd:attribute name="id" type="xsd:string">
             <xsd:annotation>
 				<xsd:documentation>

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests-context.xml

@@ -13,14 +13,18 @@
 			http://www.springframework.org/schema/integration/file
 			http://www.springframework.org/schema/integration/file/spring-integration-file.xsd">
 
-	<si:channel id="input"/>
+	<si:channel id="input">
+		<si:queue/>
+	</si:channel>
 
 	<si:channel id="output"/>
 
 	<file:file-to-string-transformer id="transformer"
 			input-channel="input"
 			delete-files="${files.delete}"
-			output-channel="output"/>
+			output-channel="output">
+		<si:poller fixed-delay="100"/>
+	</file:file-to-string-transformer>
 
 	<context:property-placeholder location="org/springframework/integration/file/config/fileToStringTransformerParserTests.properties"/>
 

spring-integration-file/src/test/java/org/springframework/integration/file/config/FileToStringTransformerParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -24,23 +24,26 @@
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.file.transformer.FileToStringTransformer;
 import org.springframework.integration.transformer.MessageTransformingHandler;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
  * @author Gary Russell
+ * @author Artem Bilan
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
+@DirtiesContext
 public class FileToStringTransformerParserTests {
 
 	@Autowired
 	@Qualifier("transformer")
-	EventDrivenConsumer endpoint;
+	PollingConsumer endpoint;
 
 	@Test
 	public void checkDeleteFilesValue() {

spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-5.1.xsd

@@ -1387,6 +1387,7 @@
 								</xsd:documentation>
 							</xsd:annotation>
 						</xsd:element>
+						<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
 					</xsd:choice>
 					<xsd:attribute name="default-overwrite">
 						<xsd:annotation>

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests-context.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:integration="http://www.springframework.org/schema/integration"
+	xmlns:int="http://www.springframework.org/schema/integration"
 	xmlns:jms="http://www.springframework.org/schema/integration/jms"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
@@ -10,9 +10,14 @@
 			http://www.springframework.org/schema/integration/jms
 			http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd">
 
+	<int:channel id="valueTestInput">
+		<int:queue/>
+	</int:channel>
+
 	<jms:header-enricher input-channel="valueTestInput" output-channel="output">
 		<jms:reply-to ref="testDestination"/>
 		<jms:correlation-id value="ABC"/>
+		<int:poller fixed-delay="100"/>
 	</jms:header-enricher>
 
 	<jms:header-enricher input-channel="expressionTestInput" output-channel="output">
@@ -21,8 +26,8 @@
 
 	<bean id="testDestination" class="org.springframework.integration.jms.StubDestination"/>
 
-	<integration:channel id="output">
-		<integration:queue capacity="1"/>
-	</integration:channel>
+	<int:channel id="output">
+		<int:queue capacity="1"/>
+	</int:channel>
 
 </beans>

spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -39,6 +39,7 @@
  * @author Mark Fisher
  * @author Oleg Zhurakousky
  * @author Gary Russell
+ * @author Artem Bilan
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
@@ -59,19 +60,19 @@ public class JmsHeaderEnricherTests {
 
 	@Test // INT-804
 	public void verifyReplyToValue() throws Exception {
-		valueTestInput.send(new GenericMessage<String>("test"));
-		Message<?> result = output.receive(0);
-		assertEquals(testDestination, result.getHeaders().get(JmsHeaders.REPLY_TO));
+		this.valueTestInput.send(new GenericMessage<>("test"));
+		Message<?> result = output.receive(10_000);
+		assertEquals(this.testDestination, result.getHeaders().get(JmsHeaders.REPLY_TO));
 		StubTextMessage jmsMessage = new StubTextMessage();
 		DefaultJmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
 		headerMapper.fromHeaders(result.getHeaders(), jmsMessage);
-		assertEquals(testDestination, jmsMessage.getJMSReplyTo());
+		assertEquals(this.testDestination, jmsMessage.getJMSReplyTo());
 	}
 
 	@Test
 	public void verifyCorrelationIdValue() throws Exception {
-		valueTestInput.send(new GenericMessage<String>("test"));
-		Message<?> result = output.receive(0);
+		this.valueTestInput.send(new GenericMessage<>("test"));
+		Message<?> result = output.receive(10_000);
 		assertEquals("ABC", result.getHeaders().get(JmsHeaders.CORRELATION_ID));
 		StubTextMessage jmsMessage = new StubTextMessage();
 		DefaultJmsHeaderMapper headerMapper = new DefaultJmsHeaderMapper();
@@ -81,7 +82,7 @@ public void verifyCorrelationIdValue() throws Exception {
 
 	@Test // see INT-1122 and INT-1123
 	public void verifyCorrelationIdExpression() throws Exception {
-		expressionTestInput.send(new GenericMessage<String>("test"));
+		this.expressionTestInput.send(new GenericMessage<>("test"));
 		Message<?> result = output.receive(0);
 		assertEquals(123, result.getHeaders().get(JmsHeaders.CORRELATION_ID));
 		StubTextMessage jmsMessage = new StubTextMessage();

spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-5.1.xsd

@@ -298,6 +298,9 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="transformerType">
+					<xsd:sequence>
+						<xsd:element ref="integration:poller" minOccurs="0"/>
+					</xsd:sequence>
 					<xsd:attribute name="charset" type="xsd:string"/>
 				</xsd:extension>
 			</xsd:complexContent>
@@ -314,7 +317,7 @@
 			</xsd:annotation>
 			<xsd:complexContent>
 				<xsd:extension base="transformerType">
-					<xsd:choice minOccurs="1" maxOccurs="unbounded">
+					<xsd:choice maxOccurs="unbounded">
 						<xsd:element name="subject" type="headerType"/>
 						<xsd:element name="to" type="headerType"/>
 						<xsd:element name="cc" type="headerType"/>
@@ -324,6 +327,7 @@
 						<xsd:element name="content-type" type="headerType"/>
 						<xsd:element name="attachment-filename" type="headerType"/>
 						<xsd:element name="multipart-mode" type="headerType"/>
+						<xsd:element ref="integration:poller" minOccurs="0"/>
 					</xsd:choice>
 					<xsd:attribute name="default-overwrite">
 						<xsd:annotation>

spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests-context.xml

@@ -2,8 +2,11 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration/mail"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
+			 xmlns:int="http://www.springframework.org/schema/integration"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
 			http://www.springframework.org/schema/beans/spring-beans.xsd
+			http://www.springframework.org/schema/integration
+			http://www.springframework.org/schema/integration/spring-integration.xsd
 			http://www.springframework.org/schema/integration/mail
 			http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">
 
@@ -18,7 +21,12 @@
 		<multipart-mode value="1"/>
 	</header-enricher>
 
+	<int:channel id="expressionsInput">
+		<int:queue />
+	</int:channel>
+
 	<header-enricher input-channel="expressionsInput">
+		<int:poller fixed-delay="100"/>
 		<to expression="payload + '.to'"/>
 		<cc expression="payload + '.cc'"/>
 		<bcc expression="payload + '.bcc'"/>

spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -30,14 +30,17 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.support.GenericMessage;
+import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
+ * @author Artem Bilan
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
+@DirtiesContext
 public class MailHeaderEnricherTests {
 
 	@Autowired
@@ -51,8 +54,8 @@ public class MailHeaderEnricherTests {
 	@Test
 	public void literalValues() {
 		MessagingTemplate template = new MessagingTemplate();
-		template.setDefaultDestination(literalValuesInput);
-		Message<?> result = template.sendAndReceive(new GenericMessage<String>("test"));
+		template.setDefaultDestination(this.literalValuesInput);
+		Message<?> result = template.sendAndReceive(new GenericMessage<>("test"));
 		Map<String, Object> headers = result.getHeaders();
 		assertEquals("test.to", headers.get(MailHeaders.TO));
 		assertEquals("test.cc", headers.get(MailHeaders.CC));
@@ -67,8 +70,8 @@ public void literalValues() {
 	@Test
 	public void expressions() {
 		MessagingTemplate template = new MessagingTemplate();
-		template.setDefaultDestination(expressionsInput);
-		Message<?> result = template.sendAndReceive(new GenericMessage<String>("foo"));
+		template.setDefaultDestination(this.expressionsInput);
+		Message<?> result = template.sendAndReceive(new GenericMessage<>("foo"));
 		Map<String, Object> headers = result.getHeaders();
 		assertEquals("foo.to", headers.get(MailHeaders.TO));
 		assertEquals("foo.cc", headers.get(MailHeaders.CC));

spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -22,7 +22,7 @@
 
 import javax.mail.internet.MimeMessage;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import org.springframework.beans.factory.BeanDefinitionStoreException;
@@ -38,47 +38,52 @@
  * @author Mark Fisher
  * @author Artem Bilan
  */
-public class MailToStringTransformerParserTests {
+class MailToStringTransformerParserTests {
 
 	@Test
-	public void topLevelTransformer() throws Exception {
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-				"mailToStringTransformerParserTests.xml",  this.getClass());
-		MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
-		PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
-		MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
-		Mockito.when(mimeMessage.getContent()).thenReturn("hello");
-		input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
-		Message<?> result = output.receive(0);
-		assertNotNull(result);
-		assertEquals("hello", result.getPayload());
-		Mockito.verify(mimeMessage).getContent();
+	void topLevelTransformer() throws Exception {
+		try (ClassPathXmlApplicationContext context =
+				new ClassPathXmlApplicationContext("mailToStringTransformerParserTests.xml", this.getClass());) {
+
+			MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
+			PollableChannel output =
+					(PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
+			MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
+			Mockito.when(mimeMessage.getContent()).thenReturn("hello");
+			input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
+			Message<?> result = output.receive(10_000);
+			assertNotNull(result);
+			assertEquals("hello", result.getPayload());
+			Mockito.verify(mimeMessage).getContent();
+		}
 	}
 
 	@Test
-	public void transformerWithinChain() throws Exception {
-		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
-				"mailToStringTransformerWithinChain.xml",  this.getClass());
-		MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
-		PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
-		MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
-		Mockito.when(mimeMessage.getContent()).thenReturn("foo");
-		input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
-		Message<?> result = output.receive(0);
-		assertNotNull(result);
-		assertEquals("FOO!!!", result.getPayload());
-		Mockito.verify(mimeMessage).getContent();
+	void transformerWithinChain() throws Exception {
+		try (ClassPathXmlApplicationContext context =
+				new ClassPathXmlApplicationContext("mailToStringTransformerWithinChain.xml", this.getClass());) {
+
+			MessageChannel input = new BeanFactoryChannelResolver(context).resolveDestination("input");
+			PollableChannel output =
+					(PollableChannel) new BeanFactoryChannelResolver(context).resolveDestination("output");
+			MimeMessage mimeMessage = Mockito.mock(MimeMessage.class);
+			Mockito.when(mimeMessage.getContent()).thenReturn("foo");
+			input.send(new GenericMessage<javax.mail.Message>(mimeMessage));
+			Message<?> result = output.receive(0);
+			assertNotNull(result);
+			assertEquals("FOO!!!", result.getPayload());
+			Mockito.verify(mimeMessage).getContent();
+		}
 	}
 
-	@Test(expected = BeanDefinitionStoreException.class)
-	public void topLevelTransformerMissingInput() {
+	@Test
+	void topLevelTransformerMissingInput() {
 		try {
 			new ClassPathXmlApplicationContext("mailToStringTransformerWithoutInputChannel.xml", this.getClass())
 					.close();
 		}
 		catch (BeanDefinitionStoreException e) {
 			assertTrue(e.getMessage().contains("input-channel"));
-			throw e;
 		}
 	}