From 818387f0a4dd499cc9fb102aef628709ae16d02f Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Mon, 18 Apr 2016 21:04:20 -0400
Subject: [PATCH] INT-3982: Fix XSD declaration ambiguity

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

Also fix some sporadic, timing issues in tests
---
 .../config/spring-integration-4.3.xsd         |  2 +-
 .../ConnectionFactoryShutDownTests.java       |  3 ++-
 ...atewayWithSpelIntegrationTests-context.xml |  8 +++----
 ...tboundGatewayWithSpelIntegrationTests.java | 21 +++++++------------
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
index 4ea91ea4c9..d3296c7ba6 100644
--- a/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
+++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/spring-integration-4.3.xsd
@@ -923,7 +923,7 @@
 						</xsd:choice>
 					</xsd:sequence>
 					<xsd:sequence>
-						<xsd:choice minOccurs="0" maxOccurs="1" >
+						<xsd:choice>
 							<xsd:element name="expression" type="innerExpressionType"/>
 							<xsd:any namespace="##other"/>
 						</xsd:choice>
diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java
index 97947f5575..d4873c76e4 100644
--- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java
+++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java
@@ -72,7 +72,8 @@ public class ConnectionFactoryShutDownTests {
 		watch.start();
 		factory.stop();
 		watch.stop();
-		assertTrue("Expected < 1000, was:" + watch.getLastTaskTimeMillis(), watch.getLastTaskTimeMillis() < 1000);
+		assertTrue("Expected < 10000, was:" + watch.getLastTaskTimeMillis(), watch.getLastTaskTimeMillis() < 10000);
 		assertTrue(latch1.await(10, TimeUnit.SECONDS));
 	}
+
 }
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml
index 505a928902..b8b97f3ad3 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests-context.xml
@@ -42,11 +42,9 @@
 		<int-jdbc:returning-resultset name="out" row-mapper="org.springframework.integration.jdbc.storedproc.UserMapper" />
 	</int-jdbc:stored-proc-outbound-gateway>
 
-	<int:channel id="outputChannel"/>
-
-	<int:service-activator id="consumerEndpoint" input-channel="outputChannel" ref="consumer" />
-
-	<bean id="consumer" class="org.springframework.integration.jdbc.StoredProcOutboundGatewayWithSpelIntegrationTests$Consumer"/>
+	<int:channel id="outputChannel">
+		<int:queue/>
+	</int:channel>
 
 	<int:logging-channel-adapter channel="errorChannel" log-full-message="true"/>
 
diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java
index 0094f8bdfc..b5b1d686d7 100644
--- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java
+++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java
@@ -23,9 +23,7 @@ import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.CallableStatement;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -71,13 +69,13 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests {
 	@Autowired
 	private AbstractApplicationContext context;
 
-	@Autowired
-	private Consumer consumer;
-
 	@Autowired
 	@Qualifier("startChannel")
 	MessageChannel channel;
 
+	@Autowired
+	PollableChannel outputChannel;
+
 	@Autowired
 	@Qualifier("startErrorsChannel")
 	PollableChannel startErrorsChannel;
@@ -111,13 +109,8 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests {
 		channel.send(user1Message);
 		channel.send(user2Message);
 
-		List<Message<Collection<User>>> received = new ArrayList<Message<Collection<User>>>();
-
-		received.add(consumer.poll(2000));
-
-		Assert.assertEquals(Integer.valueOf(1), Integer.valueOf(received.size()));
-
-		Message<Collection<User>> message = received.get(0);
+		@SuppressWarnings("unchecked")
+		Message<Collection<User>> message = (Message<Collection<User>>) this.outputChannel.receive(10000);
 
 		context.stop();
 		assertNotNull(message);
@@ -141,7 +134,7 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests {
 
 		this.channel.send(user1Message);
 
-		Message<?> receive = this.startErrorsChannel.receive(1000);
+		Message<?> receive = this.startErrorsChannel.receive(10000);
 		assertNotNull(receive);
 		assertThat(receive, instanceOf(ErrorMessage.class));
 
@@ -163,7 +156,7 @@ public class StoredProcOutboundGatewayWithSpelIntegrationTests {
 		this.jdbcTemplate.update("INSERT INTO json_message VALUES (?,?)", messageId, jsonMessage);
 
 		this.getMessageChannel.send(new GenericMessage<String>(messageId));
-		Message<?> resultMessage = this.output2Channel.receive(1000);
+		Message<?> resultMessage = this.output2Channel.receive(10000);
 		assertNotNull(resultMessage);
 		Object resultPayload = resultMessage.getPayload();
 		assertTrue(resultPayload instanceof String);