INT-3426: Add <r-h-a-c> for all outbound-c-a

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

Provide other fixes for XSD. E.g. not all adapter have had `<poller>`

spring-integration-mqtt/src/main/resources/org/springframework/integration/mqtt/config/xml/spring-integration-mqtt-4.1.xsd

@@ -80,9 +80,11 @@
 					</xsd:documentation>
 			</xsd:annotation>
 			<xsd:complexType>
-				<xsd:sequence>
+				<xsd:all>
 					<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1" />
-				</xsd:sequence>
+					<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
+								 minOccurs="0" maxOccurs="1" />
+				</xsd:all>
 				<xsd:attributeGroup ref="coreMqttComponentAttributes"/>
 				<xsd:attribute name="channel" type="xsd:string">
 					<xsd:annotation>

spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests-context.xml

@@ -11,15 +11,19 @@
 	<int:channel id="target"/>
 
 	<int-mqtt:outbound-channel-adapter id="withConverter"
-			client-id="foo"
-			url="tcp://localhost:1883"
-			auto-startup="false"
-			converter="myConverter"
-			client-factory="clientFactory"
-			default-topic="bar"
-			phase="25"
-			order="1"
-			channel="target" />
+									   client-id="foo"
+									   url="tcp://localhost:1883"
+									   auto-startup="false"
+									   converter="myConverter"
+									   client-factory="clientFactory"
+									   default-topic="bar"
+									   phase="25"
+									   order="1"
+									   channel="target">
+		<int-mqtt:request-handler-advice-chain>
+			<int:retry-advice/>
+		</int-mqtt:request-handler-advice-chain>
+	</int-mqtt:outbound-channel-adapter>
 
 	<int-mqtt:outbound-channel-adapter id="withDefaultConverter"
 			client-id="foo"

spring-integration-mqtt/src/test/java/org/springframework/integration/mqtt/config/xml/MqttOutboundChannelAdapterParserTests.java

@@ -13,37 +13,44 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.integration.mqtt.config.xml;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
+import org.hamcrest.Matchers;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.handler.advice.RequestHandlerRetryAdvice;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
 import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
 import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
 import org.springframework.integration.mqtt.support.MqttMessageConverter;
 import org.springframework.integration.test.util.TestUtils;
+import org.springframework.messaging.MessageHandler;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
  * @since 4.0
- *
  */
 @ContextConfiguration
 @RunWith(SpringJUnit4ClassRunner.class)
 public class MqttOutboundChannelAdapterParserTests {
 
+	@Autowired @Qualifier("withConverter")
+	private EventDrivenConsumer withConverterEndpoint;
+
 	@Autowired @Qualifier("withConverter.handler")
-	private MqttPahoMessageHandler withConverterHandler;
+	private MessageHandler withConverterHandler;
 
 	@Autowired @Qualifier("withDefaultConverter.handler")
 	private MqttPahoMessageHandler withDefaultConverterHandler;
@@ -55,7 +62,7 @@ public class MqttOutboundChannelAdapterParserTests {
 	private DefaultMqttPahoClientFactory clientFactory;
 
 	@Test
-	public void testWithConverter() {
+	public void testWithConverter() throws Exception {
 		assertEquals("tcp://localhost:1883", TestUtils.getPropertyValue(withConverterHandler, "url"));
 		assertFalse(TestUtils.getPropertyValue(withConverterHandler, "autoStartup", Boolean.class));
 		assertEquals(25, TestUtils.getPropertyValue(withConverterHandler, "phase"));
@@ -63,6 +70,15 @@ public class MqttOutboundChannelAdapterParserTests {
 		assertEquals("bar", TestUtils.getPropertyValue(withConverterHandler, "defaultTopic"));
 		assertSame(converter, TestUtils.getPropertyValue(withConverterHandler, "converter"));
 		assertSame(clientFactory, TestUtils.getPropertyValue(withConverterHandler, "clientFactory"));
+
+		Object handler = TestUtils.getPropertyValue(this.withConverterEndpoint, "handler");
+
+		assertTrue(AopUtils.isAopProxy(handler));
+
+		assertSame(((Advised) handler).getTargetSource().getTarget(), this.withConverterHandler);
+
+		assertThat(TestUtils.getPropertyValue(handler, "h.advised.advisors.first.item.advice"),
+				Matchers.instanceOf(RequestHandlerRetryAdvice.class));
 	}
 
 	@Test