From 67ab98c77ab1ee53f7104856cd9f383a55e2de75 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@vmware.com>
Date: Mon, 11 Apr 2011 17:13:49 -0400
Subject: [PATCH] INT-1858 removed requirememt for top-level gateway to have an
 ID attribute

---
 .../springframework/integration/config/xml/GatewayParser.java | 4 ++++
 .../integration/config/xml/gatewayParserTests.xml             | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java
index ad62582ba0..6047757720 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/GatewayParser.java
@@ -53,6 +53,10 @@ public class GatewayParser extends AbstractSimpleBeanDefinitionParser {
 	protected String getBeanClassName(Element element) {
 		return IntegrationNamespaceUtils.BASE_PACKAGE + ".gateway.GatewayProxyFactoryBean";
 	}
+	
+	protected boolean shouldGenerateIdAsFallback() {
+		return true;
+	}
 
 	@Override
 	protected boolean isEligibleAttribute(String attributeName) {
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
index c6b64624ae..3da01a05f4 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/gatewayParserTests.xml
@@ -29,5 +29,8 @@
 	         default-request-channel="requestChannel"
 	         default-reply-channel="replyChannel"
 	         default-reply-timeout="5000"/>
+	         
+	<!-- no assertions for this. The fact that this config does not result in error is sufficient -->
+	<gateway default-request-channel="nullChannel"/>
 
 </beans:beans>