From 36cabb7f3c05bedef042f337435c99a3445734ed Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@gopivotal.com>
Date: Wed, 30 Jul 2014 18:04:46 +0300
Subject: [PATCH] INT-2634: Test for gateway's `Map` parameter

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

The Map entries with non-String keys are now skipped just with WARN message,
instead of `IllegalArgumentException` as it was before
---
 .../gateway/GatewayInterfaceTests.java        | 53 +++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java
index 52c3413ae6..c8e0440aa4 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java
@@ -29,34 +29,54 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import org.hamcrest.Matchers;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mockito;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.annotation.BridgeTo;
 import org.springframework.integration.annotation.Gateway;
 import org.springframework.integration.annotation.Header;
+import org.springframework.integration.annotation.IntegrationComponentScan;
+import org.springframework.integration.annotation.MessagingGateway;
+import org.springframework.integration.annotation.Payload;
 import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.config.EnableIntegration;
 import org.springframework.integration.support.MessageBuilder;
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessagingException;
 import org.springframework.messaging.PollableChannel;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Oleg Zhurakousky
  * @author Gunnar Hillert
  * @author Gary Russell
  */
+@ContextConfiguration(classes = GatewayInterfaceTests.TestConfig.class)
+@RunWith(SpringJUnit4ClassRunner.class)
+@DirtiesContext
 public class GatewayInterfaceTests {
 
+	@Autowired
+	private Int2634Gateway int2634Gateway;
+
 	@Test
 	public void testWithServiceSuperclassAnnotatedMethod() throws Exception {
 		ConfigurableApplicationContext ac = new ClassPathXmlApplicationContext("GatewayInterfaceTests-context.xml", this.getClass());
@@ -296,6 +316,15 @@ public class GatewayInterfaceTests {
 		ac.close();
 	}
 
+	@Test
+	public void testInt2634() {
+		Map<Object, Object> param = Collections.<Object, Object>singletonMap(1, 1);
+		Object result = this.int2634Gateway.test2(param);
+		assertEquals(param, result);
+
+		result = this.int2634Gateway.test1(param);
+		assertEquals(param, result);
+	}
 
 
 	public interface Foo {
@@ -333,4 +362,28 @@ public class GatewayInterfaceTests {
 		}
 
 	}
+
+	@Configuration
+	@EnableIntegration
+	@IntegrationComponentScan
+	public static class TestConfig {
+
+		@Bean
+		@BridgeTo
+		public MessageChannel gatewayChannel() {
+			return new DirectChannel();
+		}
+	}
+
+	@MessagingGateway
+	public interface Int2634Gateway {
+
+		@Gateway(requestChannel = "gatewayChannel", payloadExpression = "#args[0]")
+		Object test1(Map<Object, ?> map);
+
+		@Gateway(requestChannel = "gatewayChannel")
+		Object test2(@Payload Map<Object, ?> map);
+
+	}
+
 }