From 6e8353a6e2922ced671e4eca4268dcf45d47817a Mon Sep 17 00:00:00 2001
From: John Blum <jblum@gopivotal.com>
Date: Fri, 15 Aug 2014 16:27:15 -0700
Subject: [PATCH] Implements JIRA task SGF-269 removing the validation logic
 and restriction on creating concurrent, parallel GatewaySenders in GemFire,
 which is supported in GemFire 8 and above.

---
 .../gemfire/wan/GatewaySenderFactoryBean.java |  2 -
 .../wan/GatewaySenderFactoryBeanTest.java     | 46 +++++++++----------
 2 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
index e39c463a..e3ab8e06 100644
--- a/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBean.java
@@ -117,8 +117,6 @@ public class GatewaySenderFactoryBean extends AbstractWANComponentFactoryBean<Ga
 		}
 
 		if (dispatcherThreads != null) {
-			Assert.isTrue(isSerialGatewaySender(),
-				"The number of Dispatcher Threads cannot be specified with a Parallel Gateway Sender Queue.");
 			gatewaySenderFactory.setDispatcherThreads(dispatcherThreads);
 		}
 
diff --git a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
index 779f9618..0ead98d5 100644
--- a/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/wan/GatewaySenderFactoryBeanTest.java
@@ -107,6 +107,28 @@ public class GatewaySenderFactoryBeanTest {
 		}
 	}
 
+	@Test
+	public void testConcurrentParallelGatewaySender() throws Exception {
+		GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g0", 69);
+
+		GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
+			createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
+
+		factoryBean.setName("g0");
+		factoryBean.setRemoteDistributedSystemId(69);
+		factoryBean.setParallel(true);
+		factoryBean.setDispatcherThreads(8);
+		factoryBean.doInit();
+
+		verifyExpectations(factoryBean, mockGatewaySenderFactory);
+
+		GatewaySender gatewaySender = factoryBean.getObject();
+
+		assertNotNull(gatewaySender);
+		assertEquals("g0", gatewaySender.getId());
+		assertEquals(69, gatewaySender.getRemoteDSId());
+	}
+
 	@Test
 	public void testParallelGatewaySender() throws Exception {
 		GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g1", 69);
@@ -149,30 +171,8 @@ public class GatewaySenderFactoryBeanTest {
 		}
 	}
 
-	@Test(expected = IllegalArgumentException.class)
-	public void testParallelGatewaySenderWithDispatcherThreads() {
-		GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g3", 69);
-
-		GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(
-			createMockCacheWithGatewayInfrastructure(mockGatewaySenderFactory));
-
-		factoryBean.setName("g3");
-		factoryBean.setRemoteDistributedSystemId(69);
-		factoryBean.setParallel(true);
-		factoryBean.setDispatcherThreads(1);
-
-		try {
-			factoryBean.doInit();
-		}
-		catch (IllegalArgumentException expected) {
-			assertEquals("The number of Dispatcher Threads cannot be specified with a Parallel Gateway Sender Queue.",
-				expected.getMessage());
-			throw expected;
-		}
-	}
-
 	@Test
-	public void testSerialGatewaySenderWithDispatcherThreads() throws Exception {
+	public void testConcurrentSerialGatewaySender() throws Exception {
 		GatewaySenderFactory mockGatewaySenderFactory = createMockGatewaySenderFactory("g4", 21);
 
 		GatewaySenderFactoryBean factoryBean = new GatewaySenderFactoryBean(