INT-3142 Allow Merging of HTTP Message Converters

INT-3142: A flag to retain default converters when the user has customized messageconverters for HttpRequestHandlingController, HttpInboundGateway

* Introduced a new flag in the base class of HttpRequHttpRequestHandlingController, HttpInboundGateway - registerDefaultConverters
* Introduced a new attribute "register-default-converters" for inbound-channel-adapter and inbound-gateway to indicate if the default HttpMessageConverter's need to be registered
* Http namespace parser related changes to set the new flag
* Added additional tests to test the flag and the namespace parser related changes

Changes per feedback from Artem - additional javadoc comments, cleaned up tests

Updated: Setting the register-default-converters by default to false now, for backward compatibility reasons
Changed adapter name per feedback from Artem

Changed adapter name per feedback from Artem

Changed attribute name from register-default-converters to merge-with-default-converters

INT-3142: Atomic operation for messageConverters

'What's New' polishing

Polishing

Fix a few comments, error messages, docs, whitespace.

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests-context.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/integration/http"
+<beans:beans
+	xmlns="http://www.springframework.org/schema/integration/http"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:si="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/http
-			http://www.springframework.org/schema/integration/http/spring-integration-http.xsd">
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/integration/http http://www.springframework.org/schema/integration/http/spring-integration-http.xsd
+		http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
 	<si:message-history/>
 
@@ -20,6 +20,18 @@
 
 	<inbound-channel-adapter id="postOnlyAdapter" channel="requests" supported-methods="POST"/>
 
+	<inbound-channel-adapter id="adapterWithCustomConverterWithDefaults" message-converters="customConverters"
+							channel="requests" supported-methods="POST" merge-with-default-converters="true"/>
+
+	<inbound-channel-adapter id="adapterWithCustomConverterNoDefaults" message-converters="customConverters"
+							channel="requests" supported-methods="POST" />
+
+	<inbound-channel-adapter id="adapterNoCustomConverterNoDefaults" channel="requests" supported-methods="POST" />
+
+	<util:list id="customConverters">
+		<beans:bean class="org.springframework.integration.http.converter.SerializingHttpMessageConverter"/>
+	</util:list>
+
 	<inbound-channel-adapter id="putOrDeleteAdapter" channel="requests" supported-methods="PUT, delete"/>
 
 	<inbound-channel-adapter id="inboundController" channel="requests" view-name="foo" error-code="oops"/>

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -16,6 +16,8 @@
 
 package org.springframework.integration.http.config;
 
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -25,7 +27,6 @@ import static org.junit.Assert.assertTrue;
 import java.io.ByteArrayOutputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -34,6 +35,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -65,6 +67,7 @@ import org.springframework.util.MultiValueMap;
  * @author Gunnar Hillert
  * @author Artem Bilan
  * @author Gary Russell
+ * @author Biju Kunjummen
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -79,6 +82,10 @@ public class HttpInboundChannelAdapterParserTests {
 	@Autowired
 	private HttpRequestHandlingMessagingGateway postOnlyAdapter;
 
+	@Autowired
+	@Qualifier("adapterWithCustomConverterWithDefaults")
+	private HttpRequestHandlingMessagingGateway adapterWithCustomConverterWithDefaults;
+
 	@Autowired
 	private HttpRequestHandlingMessagingGateway putOrDeleteAdapter;
 
@@ -96,6 +103,14 @@ public class HttpInboundChannelAdapterParserTests {
 	@Qualifier("/fname/{f}/lname/{l}")
 	private HttpRequestHandlingMessagingGateway inboundAdapterWithNameNoPath;
 
+	@Autowired
+	@Qualifier("adapterWithCustomConverterNoDefaults")
+	private HttpRequestHandlingMessagingGateway adapterWithCustomConverterNoDefaults;
+
+	@Autowired
+	@Qualifier("adapterNoCustomConverterNoDefaults")
+	private HttpRequestHandlingMessagingGateway adapterNoCustomConverterNoDefaults;
+
 	@Autowired
 	private HttpRequestHandlingController inboundController;
 
@@ -259,11 +274,7 @@ public class HttpInboundChannelAdapterParserTests {
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
-		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
-		converters.add(new SerializingHttpMessageConverter());
-		postOnlyAdapter.setMessageConverters(converters);
-
-		postOnlyAdapter.handleRequest(request, response);
+		adapterWithCustomConverterWithDefaults.handleRequest(request, response);
 		assertEquals(HttpServletResponse.SC_OK, response.getStatus());
 		Message<?> message = requests.receive(0);
 		assertNotNull(message);
@@ -271,6 +282,7 @@ public class HttpInboundChannelAdapterParserTests {
 		assertEquals("testObject", ((TestObject) message.getPayload()).text);
 	}
 
+
 	@Test
 	@SuppressWarnings("unchecked")
 	public void putOrDeleteMethodsSupported() throws Exception {
@@ -300,6 +312,32 @@ public class HttpInboundChannelAdapterParserTests {
 		assertSame(autoChannel, TestUtils.getPropertyValue(autoChannelAdapter, "requestChannel"));
 	}
 
+	@Test
+	public void testInboundAdapterWithMessageConverterDefaults() {
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters = TestUtils.getPropertyValue(adapterWithCustomConverterWithDefaults, "messageConverters", List.class);
+		assertTrue("There should be more than 1 message converter. The customized one and the defaults.", messageConverters.size() > 1);
+
+		//First converter should be the customized one
+		assertThat(messageConverters.get(0), instanceOf(SerializingHttpMessageConverter.class));
+	}
+
+	@Test
+	public void testInboundAdapterWithNoMessageConverterDefaults() {
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters = TestUtils.getPropertyValue(adapterWithCustomConverterNoDefaults, "messageConverters", List.class);
+		//First converter should be the customized one
+		assertThat(messageConverters.get(0), instanceOf(SerializingHttpMessageConverter.class));
+		assertTrue("There should be only the customized messageconverter registered.", messageConverters.size() == 1);
+	}
+
+	@Test
+	public void testInboundAdapterWithNoMessageConverterNoDefaults() {
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters = TestUtils.getPropertyValue(adapterNoCustomConverterNoDefaults, "messageConverters", List.class);
+		assertTrue("There should be more than 1 message converter. The defaults.", messageConverters.size() > 1);
+	}
+
 	@SuppressWarnings("serial")
 	private static class TestObject implements Serializable {
 

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests-context.xml

@@ -26,6 +26,28 @@
 		reply-timeout="4567"
 		error-channel="errorChannel"/>
 
+	<inbound-gateway id="inboundGatewayWithOneCustomConverter"
+		request-channel="requests"
+		reply-channel="responses"
+		message-converters="customConverters"/>
+
+	<inbound-gateway id="inboundGatewayNoDefaultConverters"
+		request-channel="requests"
+		reply-channel="responses"
+		message-converters="customConverters"
+		merge-with-default-converters="false"/>
+
+	<inbound-gateway id="inboundGatewayWithCustomAndDefaultConverters"
+		request-channel="requests"
+		reply-channel="responses"
+		message-converters="customConverters"
+		merge-with-default-converters="true"/>
+
+	<util:list id="customConverters">
+		<beans:bean class="org.springframework.integration.http.converter.SerializingHttpMessageConverter"/>
+	</util:list>
+
+
 	<inbound-gateway id="inboundController" request-channel="requests" reply-channel="responses" view-name="foo" error-code="oops"/>
 	
 	<inbound-gateway id="inboundControllerViewExp"
@@ -37,15 +59,14 @@
 	<inbound-gateway id="withMappedHeaders" request-channel="requests"
 								mapped-response-headers="abc, xyz"
 								mapped-request-headers="foo,bar"/>
-								
+
 	<inbound-gateway id="withMappedHeadersAndConverter" request-channel="requests"
 								mapped-response-headers="abc, xyz, person"
 								mapped-request-headers="foo,bar"/>
-				
-				
+
 	<si:converter ref="personConverter"/>
-				
+
 	<beans:bean id="personConverter" class="org.springframework.integration.http.config.HttpInboundGatewayParserTests.PersonConverter"/>
-	
+
 
 </beans:beans>

spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -17,8 +17,10 @@
 package org.springframework.integration.http.config;
 
 import static org.hamcrest.CoreMatchers.any;
+import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -34,6 +36,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -64,6 +67,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
  * @author Oleg Zhurakousky
  * @author Gary Russell
  * @author Gunnar Hillert
+ * @author Biju Kunjummen
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration
@@ -73,6 +77,18 @@ public class HttpInboundGatewayParserTests {
 	@Qualifier("inboundGateway")
 	private HttpRequestHandlingMessagingGateway gateway;
 
+	@Autowired
+	@Qualifier("inboundGatewayWithOneCustomConverter")
+	private HttpRequestHandlingMessagingGateway gatewayWithOneCustomConverter;
+
+	@Autowired
+	@Qualifier("inboundGatewayNoDefaultConverters")
+	private HttpRequestHandlingMessagingGateway gatewayNoDefaultConverters;
+
+	@Autowired
+	@Qualifier("inboundGatewayWithCustomAndDefaultConverters")
+	private HttpRequestHandlingMessagingGateway gatewayWithCustomAndDefaultConverters;
+
 	@Autowired
 	@Qualifier("withMappedHeaders")
 	private HttpRequestHandlingMessagingGateway withMappedHeaders;
@@ -105,6 +121,14 @@ public class HttpInboundGatewayParserTests {
 				gateway, "messagingTemplate", MessagingTemplate.class);
 		assertEquals(Long.valueOf(1234), TestUtils.getPropertyValue(messagingTemplate, "sendTimeout"));
 		assertEquals(Long.valueOf(4567), TestUtils.getPropertyValue(messagingTemplate, "receiveTimeout"));
+
+		boolean registerDefaultConverters = TestUtils.getPropertyValue(gateway,"mergeWithDefaultConverters", Boolean.class);
+		assertFalse("By default the register-default-converters flag should be false", registerDefaultConverters);
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters = TestUtils.getPropertyValue(gateway,"messageConverters", List.class);
+
+		assertTrue("The default converters should have been registered, given there are no custom converters",
+				messageConverters.size() > 0);
 	}
 
 	@Test(timeout=1000) @DirtiesContext
@@ -119,6 +143,7 @@ public class HttpInboundGatewayParserTests {
 		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
 		converters.add(new SerializingHttpMessageConverter());
 		gateway.setMessageConverters(converters);
+		gateway.afterPropertiesSet();
 
 		gateway.handleRequest(request, response);
 		assertThat(response.getStatus(), is(HttpServletResponse.SC_OK));
@@ -200,6 +225,40 @@ public class HttpInboundGatewayParserTests {
 		assertEquals("Oleg", personHeaders.get(0));
 	}
 
+	@Test
+	public void testInboundGatewayWithMessageConverterDefaults() {
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters =
+			TestUtils.getPropertyValue(gatewayWithOneCustomConverter, "messageConverters", List.class);
+		assertThat("There should be only 1 message converter, by default register-default-converters is off",
+				messageConverters.size(), is(1));
+
+		//The converter should be the customized one
+		assertThat(messageConverters.get(0), instanceOf(SerializingHttpMessageConverter.class));
+	}
+
+	@Test
+	public void testInboundGatewayWithNoMessageConverterDefaults() {
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters = TestUtils.getPropertyValue(gatewayNoDefaultConverters, "messageConverters", List.class);
+		//First converter should be the customized one
+		assertThat(messageConverters.get(0), instanceOf(SerializingHttpMessageConverter.class));
+
+		assertThat("There should be only 1 message converter, the register-default-converters is false",
+				messageConverters.size(), is(1));
+	}
+
+	@Test
+	public void testInboundGatewayWithCustomAndDefaultMessageConverters() {
+		@SuppressWarnings("unchecked")
+		List<HttpMessageConverter<?>> messageConverters = TestUtils.getPropertyValue(gatewayWithCustomAndDefaultConverters, "messageConverters", List.class);
+		//First converter should be the customized one
+		assertThat(messageConverters.get(0), instanceOf(SerializingHttpMessageConverter.class));
+
+		assertTrue("There should be more than one converter",
+				messageConverters.size() > 1);
+	}
+
 	public static class Person{
 		private String name;
 

spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java

@@ -51,6 +51,7 @@ import org.springframework.web.servlet.View;
  * @author Mark Fisher
  * @author Gary Russell
  * @author Gunnar Hillert
+ * @author Biju Kunjummen
  * @since 2.0
  */
 public class HttpRequestHandlingControllerTests {
@@ -62,6 +63,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setBeanFactory(mock(BeanFactory.class));
 		controller.setRequestChannel(requestChannel);
 		controller.setViewName("foo");
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("hello".getBytes());
@@ -87,6 +89,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setRequestChannel(requestChannel);
 		Expression viewExpression = new SpelExpressionParser().parseExpression("'baz'");
 		controller.setViewExpression(viewExpression);
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("hello".getBytes());
@@ -118,6 +121,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setBeanFactory(mock(BeanFactory.class));
 		controller.setRequestChannel(requestChannel);
 		controller.setViewName("foo");
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 
@@ -151,6 +155,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setRequestChannel(requestChannel);
 		Expression viewExpression = new SpelExpressionParser().parseExpression("headers['bar']");
 		controller.setViewExpression(viewExpression);
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("hello".getBytes());
@@ -181,6 +186,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setRequestChannel(requestChannel);
 		Expression viewExpression = new SpelExpressionParser().parseExpression("headers['bar']");
 		controller.setViewExpression(viewExpression);
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("hello".getBytes());
@@ -209,6 +215,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setRequestChannel(requestChannel);
 		controller.setViewName("foo");
 		controller.setReplyKey("myReply");
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("howdy".getBytes());
@@ -241,6 +248,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setRequestChannel(requestChannel);
 		controller.setViewName("foo");
 		controller.setExtractReplyPayload(false);
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("abc".getBytes());
@@ -270,6 +278,7 @@ public class HttpRequestHandlingControllerTests {
 		HttpRequestHandlingController controller = new HttpRequestHandlingController(false);
 		controller.setBeanFactory(mock(BeanFactory.class));
 		controller.setRequestChannel(requestChannel);
+		controller.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("hello".getBytes());
@@ -308,6 +317,7 @@ public class HttpRequestHandlingControllerTests {
 		controller.setBeanFactory(mock(BeanFactory.class));
 		controller.setRequestChannel(requestChannel);
 		controller.setViewName("foo");
+		controller.afterPropertiesSet();
 		final MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.setContent("hello".getBytes());

spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java

@@ -55,6 +55,7 @@ import org.springframework.util.SerializationUtils;
  * @author Gary Russell
  * @author Gunnar Hillert
  * @author Artem Bilan
+ * @author Biju Kunjummen
  * @since 2.0
  */
 public class HttpRequestHandlingMessagingGatewayTests {
@@ -66,6 +67,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(false);
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.setRequestChannel(requestChannel);
+		gateway.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("GET");
 		request.setParameter("foo", "bar");
@@ -86,6 +88,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.setRequestPayloadType(String.class);
 		gateway.setRequestChannel(requestChannel);
+		gateway.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 
@@ -115,6 +118,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.setRequestPayloadType(String.class);
 		gateway.setRequestChannel(requestChannel);
+		gateway.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 		request.addHeader("Accept", "x-application/octet-stream");
@@ -142,6 +146,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.setRequestPayloadType(String.class);
 		gateway.setRequestChannel(requestChannel);
+		gateway.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.setMethod("POST");
 
@@ -170,6 +175,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		gateway.setRequestChannel(requestChannel);
 		gateway.setConvertExceptions(true);
 		gateway.setMessageConverters(Arrays.<HttpMessageConverter<?>>asList(new TestHttpMessageConverter()));
+		gateway.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest();
 		request.addHeader("Accept", "application/x-java-serialized-object");
 		request.setMethod("GET");
@@ -185,6 +191,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		HttpRequestHandlingMessagingGateway gateway = new HttpRequestHandlingMessagingGateway(false);
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.setRequestChannel(channel);
+		gateway.afterPropertiesSet();
 		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/test");
 		request.setParameter("foo", "123");
 		request.addParameter("bar", "456");
@@ -217,6 +224,7 @@ public class HttpRequestHandlingMessagingGatewayTests {
 		List<HttpMessageConverter<?>> converters = new ArrayList<HttpMessageConverter<?>>();
 		converters.add(new SerializingHttpMessageConverter());
 		gateway.setMessageConverters(converters);
+		gateway.afterPropertiesSet();
 
 		MockHttpServletRequest request = new MockHttpServletRequest("POST", "/test");
 

spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java

@@ -40,6 +40,7 @@ import org.springframework.mock.web.MockHttpServletResponse;
  * @author Gary Russell
  * @author Gunnar Hillert
  * @author Gary Russell
+ * @author Biju Kunjummen
  */
 public class HttpRequestHandlingMessagingGatewayWithPathMappingTests {
 
@@ -70,6 +71,7 @@ public class HttpRequestHandlingMessagingGatewayWithPathMappingTests {
 		gateway.setBeanFactory(mock(BeanFactory.class));
 		gateway.setPath("/fname/{f}/lname/{l}");
 		gateway.setRequestChannel(echoChannel);
+		gateway.afterPropertiesSet();
 
 		MockHttpServletResponse response = new MockHttpServletResponse();
 
@@ -102,6 +104,7 @@ public class HttpRequestHandlingMessagingGatewayWithPathMappingTests {
 		gateway.setPath("/fname/{f}/lname/{l}");
 		gateway.setRequestChannel(echoChannel);
 		gateway.setPayloadExpression(PARSER.parseExpression("#pathVariables.f"));
+		gateway.afterPropertiesSet();
 
 		Object result =  gateway.doHandleRequest(request, response);
 		assertTrue(result instanceof Message);
@@ -134,6 +137,7 @@ public class HttpRequestHandlingMessagingGatewayWithPathMappingTests {
 		gateway.setPath("/fname/{f}/lname/{l}");
 		gateway.setRequestChannel(echoChannel);
 		gateway.setPayloadExpression(PARSER.parseExpression("#pathVariables"));
+		gateway.afterPropertiesSet();
 
 		Object result =  gateway.doHandleRequest(request, response);
 		assertTrue(result instanceof Message);